April 2012 - openSUSE Commits - openSUSE Mailing Lists

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2012-04-23 09:15:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2012-04-12 09:40:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2012-04-23 09:15:35.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Apr 15 09:51:54 CEST 2012 - mhrusecky(a)suse.cz + +- migrated to MariaDB 5.5.23, see: + http://kb.askmonty.org/en/what-is-mariadb-55 + http://kb.askmonty.org/en/release-notes-mariadb-55-series + http://kb.askmonty.org/en/changelogs-mariadb-55-series + +------------------------------------------------------------------- Old: ---- mariadb-5.3.6.tar.bz2 New: ---- mariadb-5.5.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.RdzQn4/_old 2012-04-23 09:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RdzQn4/_new 2012-04-23 09:15:38.000000000 +0200 @@ -19,11 +19,11 @@ # Few definitions which will alter build %define prefered 0 -%define use_cmake 0 +%define use_cmake 1 %define cluster 0 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %define use_extra_provides 1 -%define extra_provides mariadb_53 +%define extra_provides mariadb_55 %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -34,9 +34,9 @@ Name: mariadb Summary: Server part of MariaDB -Version: 5.3.6 +Version: 5.5.23 Release: 1 -%define srv_vers 5.1.62 +%define srv_vers 5.5.23 License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org @@ -101,8 +101,8 @@ # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release Obsoletes: mysql-devel < %srv_vers -Requires: libmysqlclient16 = %version -Requires: libmysqlclient_r16 = %version +Requires: libmysqlclient18 = %version +Requires: libmysqlclient_r18 = %version Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel @@ -114,12 +114,12 @@ This package contains the development header files and libraries necessary to develop client applications for MariaDB. -%package -n libmysqld16 +%package -n libmysqld18 License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ -%description -n libmysqld16 +%description -n libmysqld18 This package contains the development header files and libraries for developing applications that embed the MariaDB. @@ -129,7 +129,7 @@ # the headers files are the shared Requires: libmysqlclient-devel = %version Requires: tcpd-devel -Requires: libmysqld16 = %version +Requires: libmysqld18 = %version Group: Development/Libraries/C and C++ %description -n libmysqld-devel @@ -137,21 +137,21 @@ for developing applications that embed the MariaDB. %endif -%package -n libmariadbclient16 +%package -n libmariadbclient18 Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other -%description -n libmariadbclient16 +%description -n libmariadbclient18 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. -%package -n libmariadbclient_r16 +%package -n libmariadbclient_r18 Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other -%description -n libmariadbclient_r16 +%description -n libmariadbclient_r18 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. @@ -410,13 +410,13 @@ # Various ldconfig post scripts # ####################################################################### -%post -n libmariadbclient16 -p /sbin/ldconfig +%post -n libmariadbclient18 -p /sbin/ldconfig -%postun -n libmariadbclient16 -p /sbin/ldconfig +%postun -n libmariadbclient18 -p /sbin/ldconfig -%post -n libmariadbclient_r16 -p /sbin/ldconfig +%post -n libmariadbclient_r18 -p /sbin/ldconfig -%postun -n libmariadbclient_r16 -p /sbin/ldconfig +%postun -n libmariadbclient_r18 -p /sbin/ldconfig %if 0%{cluster} > 1 @@ -484,7 +484,7 @@ %_libdir/libmysqld.so.* %endif -%files -n libmariadbclient16 +%files -n libmariadbclient18 %defattr(-, root, root) %{_libdir}/libmariadbclient.so.* @@ -495,7 +495,7 @@ %{_libdir}/libndbclient.so.* %endif -%files -n libmariadbclient_r16 +%files -n libmariadbclient_r18 %defattr(-, root, root) %{_libdir}/libmariadbclient_r.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.RdzQn4/_old 2012-04-23 09:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RdzQn4/_new 2012-04-23 09:15:38.000000000 +0200 @@ -1,2 +1,2 @@ -libmariadbclient16 -libmariadbclient_r16 +libmariadbclient18 +libmariadbclient_r18 ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mariadb-5.3.6.tar.bz2 -> mariadb-5.5.23.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-5.3.6.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-5.5.23.tar.bz2 differ: char 11, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch new/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Use lib_LIBRARIES instead of pkglib_LIBRARIES - -Make more sense and is more intuitive when compiling. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: libmysql/Makefile.shared -=================================================================== ---- libmysql/Makefile.shared.orig -+++ libmysql/Makefile.shared -@@ -27,7 +27,7 @@ pkgplugindir = $(pkglibdir)/plugin - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -Index: libmysqld/Makefile.am -=================================================================== ---- libmysqld/Makefile.am.orig -+++ libmysqld/Makefile.am -@@ -37,7 +37,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ \ - @ndbcluster_includes@ - --pkglib_LTLIBRARIES = libmysqld.la -+lib_LTLIBRARIES = libmysqld.la - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -818,6 +818,14 @@ AC_ARG_WITH(mysqld-user, - [ MYSQLD_USER=mysql ] - ) - AC_SUBST(MYSQLD_USER) -+AC_ARG_WITH(mysqld-group, -+ [ --with-mysqld-group=groupname -+ What group the mysqld daemon shall be run as.], -+ [ MYSQLD_GROUP=$withval ], -+ [ MYSQLD_GROUP=mysql ] -+ ) -+AC_SUBST(MYSQLD_GROUP) -+ - - # If we should allow LOAD DATA LOCAL - AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default) -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -189,6 +189,7 @@ SUFFIXES = .sh - -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ - -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ - -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -+ -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \ - -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ - -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ - -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -19,6 +19,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - -@@ -162,6 +163,7 @@ parse_arguments() { - --datadir=*|--data=*) DATADIR="$val" ;; - --pid-file=*) pid_file="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - --log-basename=*|--hostname=*|--loose-log-basename=*) - pid_file="$val.pid"; - err_log="$val.err"; -@@ -393,11 +395,17 @@ then - if test "$user" != "root" -o $SET_USER = 1 - then - USER_OPTION="--user=$user" -+ GROUP_OPTION="--group=$group" - fi - # Change the err log to the right user, if it is in use - if [ $want_syslog -eq 0 ]; then - touch "$err_log" -- chown $user "$err_log" -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $err_log -+ else -+ [ "$user" ] && chown $user $err_log -+ [ "$group" ] && chgrp $group $err_log -+ fi - fi - if test -n "$open_files" - then -@@ -420,7 +428,12 @@ then - echo "Fatal error Can't create database directory '$mysql_unix_port'" - exit 1 - fi -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir - fi - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -28,6 +28,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -66,6 +67,11 @@ Usage: $0 [OPTIONS] - user. You must be root to use this option. By default - mysqld runs using your current login name and files and - directories that it creates will be owned by you. -+ --group=group_name The login group to use for running mysqld. Files and -+ directories created by mysqld will be owned by this -+ group. You must be root to use this option. By default -+ mysqld runs using your current group and files and -+ directories that it creates will be owned by you. - - All other options are passed to the mysqld program - -@@ -113,11 +119,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; -- --user=*) - # Note that the user will be passed to mysqld so that it runs - # as 'user' (crucial e.g. if log-bin=/some_other_path/ - # where a chown of datadir won't help) -- user=`parse_arg "$arg"` ;; -+ --user=*) user=`parse_arg "$arg"` ;; -+ --group=*) group=`parse_arg "$arg"` ;; - --skip-name-resolve) ip_only=1 ;; - --verbose) verbose=1 ;; # Obsolete - --rpm) in_rpm=1 ;; -@@ -377,7 +383,12 @@ do - fi - if test -w / -a ! -z "$user" - then -- chown $user $dir -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - fi - done - -@@ -386,6 +397,11 @@ then - args="$args --user=$user" - fi - -+if test -n "$group" -+then -+ args="$args --group=$group" -+fi -+ - # When doing a "cross bootstrap" install, no reference to the current - # host should be added to the system tables. So we filter out any - # lines which contain the current host name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Moving SafeProcess to /usr/bin - -We prefer to have this script somewhere else, so we moved it out of -the mysql-test directory. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/lib/My/SafeProcess.pm -=================================================================== ---- mysql-test/lib/My/SafeProcess.pm.orig -+++ mysql-test/lib/My/SafeProcess.pm -@@ -103,17 +103,17 @@ sub find_bin { - if (IS_WIN32PERL or IS_CYGWIN) - { - # Use my_safe_process.exe -- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - - # Use my_safe_kill.exe -- $safe_kill= my_find_bin($bindir, "lib/My/SafeProcess", "my_safe_kill"); -+ $safe_kill= my_find_bin($bindir, "../../bin", "lib/My/SafeProcess", "my_safe_kill"); - } - else - { - # Use my_safe_process -- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch 2012-02-18 08:32:06.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins - -Making all storage plugins unversioned. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: storage/blackhole/Makefile.am -=================================================================== ---- storage/blackhole/Makefile.am.orig -+++ storage/blackhole/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h - - EXTRA_LTLIBRARIES = libblackhole.la ha_blackhole.la - pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ --ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) -+ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) - ha_blackhole_la_CXXFLAGS=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_SOURCES=ha_blackhole.cc - -Index: storage/archive/Makefile.am -=================================================================== ---- storage/archive/Makefile.am.orig -+++ storage/archive/Makefile.am -@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r - - EXTRA_LTLIBRARIES = libarchive.la ha_archive.la - pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ --ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_archive_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_SOURCES = ha_archive.cc azio.c -Index: storage/example/Makefile.am -=================================================================== ---- storage/example/Makefile.am.orig -+++ storage/example/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h - - EXTRA_LTLIBRARIES = libexample.la ha_example.la - pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ --ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - ha_example_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_SOURCES = ha_example.cc - -Index: storage/federated/Makefile.am -=================================================================== ---- storage/federated/Makefile.am.orig -+++ storage/federated/Makefile.am -@@ -32,7 +32,7 @@ noinst_HEADERS = ha_federated.h - - EXTRA_LTLIBRARIES = libfederated.la libfederated_embedded.la ha_federated.la - pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ --ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) \ -+ha_federated_la_LDFLAGS = -avoid-version -module -rpath $(pkgplugindir) \ - -L$(top_builddir)/libservices -lmysqlservices - ha_federated_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -Index: storage/innodb_plugin/Makefile.am -=================================================================== ---- storage/innodb_plugin/Makefile.am.orig -+++ storage/innodb_plugin/Makefile.am -@@ -330,7 +330,7 @@ libinnobase_la_CFLAGS= $(AM_CFLAGS) - EXTRA_LTLIBRARIES= libinnobase.la ha_innodb_plugin.la - pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ - --ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+ha_innodb_plugin_la_LDFLAGS= -avoid-version -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - ha_innodb_plugin_la_CXXFLAGS= -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_CFLAGS= -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES) -Index: plugin/auth/Makefile.am -=================================================================== ---- plugin/auth/Makefile.am.orig -+++ plugin/auth/Makefile.am -@@ -1,6 +1,6 @@ - pkgplugindir=$(pkglibdir)/plugin - --AM_LDFLAGS=-module -rpath $(pkgplugindir) -+AM_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) - AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -I$(top_srcdir)/include - - pkgplugin_LTLIBRARIES= dialog.la -Index: storage/federatedx/Makefile.am -=================================================================== ---- storage/federatedx/Makefile.am.orig -+++ storage/federatedx/Makefile.am -@@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat - - EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embedded.la ha_federatedx.la - pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ --ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) \ -+ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) \ - -L$(top_builddir)/libservices -lmysqlservices - ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - -Index: storage/sphinx/Makefile.am -=================================================================== ---- storage/sphinx/Makefile.am.orig -+++ storage/sphinx/Makefile.am -@@ -33,13 +33,13 @@ noinst_HEADERS = ha_sphinx.h - EXTRA_LTLIBRARIES = libsphinx.la ha_sphinx.la - pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la - --ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) \ -+ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \ - -L$(top_builddir)/libservices -lmysqlservices - ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_SOURCES = ha_sphinx.cc - --sphinx_la_LDFLAGS = -module -+sphinx_la_LDFLAGS = -module -avoid-version - sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) - sphinx_la_CFLAGS = $(AM_CFLAGS) - sphinx_la_SOURCES = snippets_udf.cc -Index: plugin/handler_socket/handlersocket/Makefile.am -=================================================================== ---- plugin/handler_socket/handlersocket/Makefile.am.orig -+++ plugin/handler_socket/handlersocket/Makefile.am -@@ -2,7 +2,7 @@ pkgplugindir = $(PLUGIN_DIR) - CXXFLAGS += -fimplicit-templates - noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp - pkgplugin_LTLIBRARIES = handlersocket.la --handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la -L$(top_builddir)/libservices -lmysqlservices -+handlersocket_la_LDFLAGS = -module -avoid-version ../libhsclient/libhsclient.la -L$(top_builddir)/libservices -lmysqlservices - handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -I$(srcdir)/../libhsclient - handlersocket_la_SOURCES = database.cpp handlersocket.cpp \ - hstcpsvr_worker.cpp hstcpsvr.cpp -Index: plugin/feedback/Makefile.am -=================================================================== ---- plugin/feedback/Makefile.am.orig -+++ plugin/feedback/Makefile.am -@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ - - EXTRA_LTLIBRARIES = feedback.la libfeedback.la - pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@ --feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+feedback_la_LDFLAGS = -avoid-version -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN - feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc -Index: plugin/auth_pam/Makefile.am -=================================================================== ---- plugin/auth_pam/Makefile.am.orig -+++ plugin/auth_pam/Makefile.am -@@ -4,7 +4,7 @@ pkgplugindir=$(pkglibdir)/plugin - AM_CPPFLAGS = -I$(top_srcdir)/include - - pkgplugin_LTLIBRARIES = @plugin_auth_pam_shared_target@ --auth_pam_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam -+auth_pam_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam - auth_pam_la_CFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN - auth_pam_la_SOURCES = auth_pam.c - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch new/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch 2011-12-07 17:24:30.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix building in different directory -BUGS: upstream#45616 - -Makes it possible to run compilation somewhere else then source code is. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -120,7 +120,7 @@ mysql_fix_privilege_tables.sql: mysql_sy - @echo "-- This file is automaticly generated from" > $@ - @echo "-- mysql_system_tables.sql & mysql_system_tables_fix.sql" >> $@ - @echo "" >> $@ -- @cat mysql_system_tables.sql mysql_system_tables_fix.sql >> $@ -+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ - - # - # Build mysql_fix_privilege_tables_sql.c from -@@ -133,7 +133,7 @@ mysql_fix_privilege_tables_sql.c: comp_s - sleep 2 - $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables \ -- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ -+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ - - - SUFFIXES = .sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch 2011-12-22 12:52:29.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,216 +0,0 @@ -PATCH-P0-HACK-SUSE: Fixing few compilation problems - -Mostly minor things. Mostly just to make compiler happy as it can't determine -that everything is ok. But few things might actually worth reporting as they -could be handled better (mostly the write calls). - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: client/readline.cc -=================================================================== ---- client/readline.cc.orig -+++ client/readline.cc -@@ -57,7 +57,7 @@ LINE_BUFFER *batch_readline_init(ulong m - char *batch_readline(LINE_BUFFER *line_buff) - { - char *pos; -- ulong out_length; -+ ulong out_length=0; - LINT_INIT(out_length); - - if (!(pos=intern_read_line(line_buff, &out_length))) -Index: storage/innodb_plugin/ut/ut0ut.c -=================================================================== ---- storage/innodb_plugin/ut/ut0ut.c.orig -+++ storage/innodb_plugin/ut/ut0ut.c -@@ -553,7 +553,9 @@ ut_print_namel( - trx ? trx->mysql_thd : NULL, - table_id); - -- fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /**********************************************************************//** -@@ -574,7 +576,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/ndb/src/common/util/ndb_init.c -=================================================================== ---- storage/ndb/src/common/util/ndb_init.c.orig -+++ storage/ndb/src/common/util/ndb_init.c -@@ -31,7 +31,7 @@ ndb_init() - { - if (my_init()) { - const char* err = "my_init() failed - exit\n"; -- write(2, err, strlen(err)); -+ fprintf(stderr, err, strlen(err)); - exit(1); - } - ndb_init_internal(); -Index: sql/log.cc -=================================================================== ---- sql/log.cc.orig -+++ sql/log.cc -@@ -1936,7 +1936,7 @@ static void setup_windows_event_source() - - static int find_uniq_filename(char *name) - { -- long number; -+ long number=0; - uint i; - char buff[FN_REFLEN]; - struct st_my_dir *dir_info; -Index: sql/filesort.cc -=================================================================== ---- sql/filesort.cc.orig -+++ sql/filesort.cc -@@ -435,16 +435,20 @@ static void dbug_print_record(TABLE *tab - Field *field= *pfield; - - if (field->is_null()) -- fwrite("NULL", sizeof(char), 4, DBUG_FILE); -+ if(fwrite("NULL", sizeof(char), 4, DBUG_FILE) != sizeof(char) * 4) -+ break; - - if (field->type() == MYSQL_TYPE_BIT) - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); - -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE) != -+ sizeof(char) * tmp.length()) -+ break; - if (pfield[1]) -- fwrite(", ", sizeof(char), 2, DBUG_FILE); -+ if(fwrite(", ", sizeof(char), 2, DBUG_FILE) != sizeof(char) * 2) -+ break; - } - fprintf(DBUG_FILE, ")"); - if (print_rowid) -Index: sql/opt_range.cc -=================================================================== ---- sql/opt_range.cc.orig -+++ sql/opt_range.cc -@@ -13668,7 +13668,8 @@ print_key(KEY_PART *key_part, const ucha - { - if (*key) - { -- fwrite("NULL",sizeof(char),4,DBUG_FILE); -+ if(fwrite("NULL",sizeof(char),4,DBUG_FILE)!=4*sizeof(char)) -+ break; - continue; - } - key++; // Skip null byte -@@ -13679,7 +13680,8 @@ print_key(KEY_PART *key_part, const ucha - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE)!=sizeof(char)*tmp.length()) -+ break; - if (key+store_length < key_end) - fputc('/',DBUG_FILE); - } -Index: sql/debug_sync.cc -=================================================================== ---- sql/debug_sync.cc.orig -+++ sql/debug_sync.cc -@@ -1722,6 +1722,7 @@ static void debug_sync_execute(THD *thd, - LINT_INIT(old_proc_info); - - action->execute--; -+ old_proc_info = NULL; - - /* - If we will be going to wait, set proc_info for the PROCESSLIST table. -Index: storage/xtradb/ut/ut0ut.c -=================================================================== ---- storage/xtradb/ut/ut0ut.c.orig -+++ storage/xtradb/ut/ut0ut.c -@@ -552,8 +552,9 @@ ut_print_namel( - name, namelen, - trx ? trx->mysql_thd : NULL, - table_id); -- -- (void) fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /**********************************************************************//** -@@ -574,7 +575,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- (void) fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/maria/ma_open.c -=================================================================== ---- storage/maria/ma_open.c.orig -+++ storage/maria/ma_open.c -@@ -1847,7 +1847,6 @@ void _ma_set_index_pagecache_callbacks(P - int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, - File file_to_dup __attribute__((unused))) - { -- char *data_name= share->data_file_name.str; - char real_data_name[FN_REFLEN]; - - if (org_name) -@@ -1861,12 +1860,11 @@ int _ma_open_datafile(MARIA_HA *info, MA - my_errno= HA_WRONG_CREATE_OPTION; - return 1; - } -- data_name= real_data_name; - } - } - - info->dfile.file= share->bitmap.file.file= -- my_open(data_name, share->mode | O_SHARE, MYF(MY_WME)); -+ my_open(real_data_name, share->mode | O_SHARE, MYF(MY_WME)); - return info->dfile.file >= 0 ? 0 : 1; - } - -Index: storage/maria/ha_maria.cc -=================================================================== ---- storage/maria/ha_maria.cc.orig -+++ storage/maria/ha_maria.cc -@@ -2980,7 +2980,7 @@ int ha_maria::create(const char *name, r - HA_CREATE_INFO *ha_create_info) - { - int error; -- uint create_flags= 0, record_count, i; -+ uint create_flags= 0, record_count=0, i; - char buff[FN_REFLEN]; - MARIA_KEYDEF *keydef; - MARIA_COLUMNDEF *recinfo; -Index: storage/pbxt/src/discover_xt.cc -=================================================================== ---- storage/pbxt/src/discover_xt.cc.orig -+++ storage/pbxt/src/discover_xt.cc -@@ -1337,8 +1337,8 @@ static bool mysql_create_table_no_lock(T - char path[FN_REFLEN]; - uint path_length; - const char *alias; -- uint db_options, key_count; -- KEY *key_info_buffer; -+ uint db_options, key_count=0; -+ KEY *key_info_buffer=NULL; - handler *file; - bool error= TRUE; - DBUG_ENTER("mysql_create_table_no_lock"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch 2011-12-22 10:51:32.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Tests in $(datadir) - -By default tests would get installed to /usr and as we want it LSB compilant, -we install them into /usr/share. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/Makefile.am -=================================================================== ---- mysql-test/Makefile.am.orig -+++ mysql-test/Makefile.am -@@ -17,7 +17,7 @@ - - ## Process this file with automake to create Makefile.in - --testroot = $(prefix) -+testroot = $(datadir) - testdir = $(testroot)/mysql-test - - test_SCRIPTS = mtr \ -Index: mysql-test/lib/My/SafeProcess/Makefile.am -=================================================================== ---- mysql-test/lib/My/SafeProcess/Makefile.am.orig -+++ mysql-test/lib/My/SafeProcess/Makefile.am -@@ -14,7 +14,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --testroot = $(prefix) -+testroot = $(datadir) - safedir = $(testroot)/mysql-test/lib/My/SafeProcess - #nobase_bin_PROGRAMS = ... - safe_PROGRAMS = my_safe_process diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch 2011-12-22 12:00:17.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Fixing readline check - -HIST_ENTRY symbol is not defined in main include, but in history.h for -readline. At least in new readline. - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: config/ac-macros/readline.m4 -=================================================================== ---- config/ac-macros/readline.m4.orig -+++ config/ac-macros/readline.m4 -@@ -4,6 +4,7 @@ AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_ - [ - #include "stdio.h" - #include "readline/readline.h" -+ #include "readline/history.h" - ], - [ - HIST_ENTRY entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch new/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch 2012-02-27 22:40:26.000000000 +0100 @@ -0,0 +1,148 @@ +PATCH-P0-FEATURE-UPSTREAM: Adds group option + +This patch let's you specify not only user to use but also group that MySQL +should use. + +Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> + +Index: scripts/mysqld_safe.sh +=================================================================== +--- scripts/mysqld_safe.sh.orig ++++ scripts/mysqld_safe.sh +@@ -23,6 +23,7 @@ logging=init + want_syslog=0 + syslog_tag= + user='@MYSQLD_USER@' ++group='@MYSQLD_GROUP@' + pid_file= + err_log= + +@@ -176,6 +177,7 @@ parse_arguments() { + --pid-file=*) pid_file="$val" ;; + --plugin-dir=*) PLUGIN_DIR="$val" ;; + --user=*) user="$val"; SET_USER=1 ;; ++ --group=*) group="$val"; SET_USER=1 ;; + --log-basename=*|--hostname=*|--loose-log-basename=*) + pid_file="$val.pid"; + err_log="$val.err"; +@@ -567,11 +569,17 @@ then + if test "$user" != "root" -o $SET_USER = 1 + then + USER_OPTION="--user=$user" ++ GROUP_OPTION="--group=$group" + fi + # Change the err log to the right user, if it is in use + if [ $want_syslog -eq 0 ]; then + touch "$err_log" +- chown $user "$err_log" ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $err_log ++ else ++ [ "$user" ] && chown $user $err_log ++ [ "$group" ] && chgrp $group $err_log ++ fi + fi + if test -n "$open_files" + then +@@ -594,7 +602,12 @@ then + echo "Fatal error Can't create database directory '$mysql_unix_port'" + exit 1 + fi +- chown $user $mysql_unix_port_dir ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $mysql_unix_port_dir ++ else ++ [ "$user" ] && chown $user $mysql_unix_port_dir ++ [ "$group" ] && chgrp $group $mysql_unix_port_dir ++ fi + chmod 755 $mysql_unix_port_dir + fi + +Index: scripts/mysql_install_db.sh +=================================================================== +--- scripts/mysql_install_db.sh.orig ++++ scripts/mysql_install_db.sh +@@ -30,6 +30,7 @@ args="" + defaults="" + mysqld_opt="" + user="" ++group="" + + force=0 + in_rpm=0 +@@ -72,6 +73,11 @@ Usage: $0 [OPTIONS] + user. You must be root to use this option. By default + mysqld runs using your current login name and files and + directories that it creates will be owned by you. ++ --group=group_name The login group to use for running mysqld. Files and ++ directories created by mysqld will be owned by this ++ group. You must be root to use this option. By default ++ mysqld runs using your current group and files and ++ directories that it creates will be owned by you. + + All other options are passed to the mysqld program + +@@ -119,11 +125,11 @@ parse_arguments() + --builddir=*) builddir=`parse_arg "$arg"` ;; + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; +- --user=*) + # Note that the user will be passed to mysqld so that it runs + # as 'user' (crucial e.g. if log-bin=/some_other_path/ + # where a chown of datadir won't help) +- user=`parse_arg "$arg"` ;; ++ --user=*) user=`parse_arg "$arg"` ;; ++ --group=*) group=`parse_arg "$arg"` ;; + --skip-name-resolve) ip_only=1 ;; + --verbose) verbose=1 ;; # Obsolete + --rpm) in_rpm=1 ;; +@@ -383,7 +389,12 @@ do + fi + if test -n "$user" + then +- chown $user $dir ++ if test -z "$group" ++ then ++ chown $user $dir ++ else ++ chown $user:$group $dir ++ fi + if test $? -ne 0 + then + echo "Cannot change ownership of the database directories to the '$user'" +@@ -398,6 +409,11 @@ then + args="$args --user=$user" + fi + ++if test -n "$group" ++then ++ args="$args --group=$group" ++fi ++ + # When doing a "cross bootstrap" install, no reference to the current + # host should be added to the system tables. So we filter out any + # lines which contain the current host name. +Index: scripts/CMakeLists.txt +=================================================================== +--- scripts/CMakeLists.txt.orig ++++ scripts/CMakeLists.txt +@@ -137,6 +137,7 @@ ENDIF() + + SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") ++SET(MYSQLD_GROUP "mysql") + + # Required for mysqlbug until autotools are deprecated, once done remove these + # and expand default cmake variables +Index: support-files/CMakeLists.txt +=================================================================== +--- support-files/CMakeLists.txt.orig ++++ support-files/CMakeLists.txt +@@ -28,6 +28,7 @@ ELSE() + SET(CFLAGS ${CMAKE_C_FLAGS}) + SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) + SET(MYSQLD_USER "mysql") ++ SET(MYSQLD_GROUP "mysql") + SET(ini_file_extension "cnf") + SET(HOSTNAME "hostname") + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Adds shebangs - -Shebangs were missing at various places, so we are adding them. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -diff -Naru mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh ---- mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100 -+++ mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh 2009-02-24 17:57:42.000000000 +0100 -@@ -1,3 +1,4 @@ -+#!/bin/sh - d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789" - test -d "$d" || mkdir "$d" - rm -f "$d"/* -diff -Naru mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh ---- mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100 -+++ mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-24 17:58:12.000000000 +0100 -@@ -1,3 +1,4 @@ -+#!/bin/sh - # This test requires a non-lowercase tmpdir directory on a case-sensitive - # filesystem. - -diff -Naru mysql-5.1.31-bak/sql-bench/graph-compare-results.sh mysql-5.1.31/sql-bench/graph-compare-results.sh ---- mysql-5.1.31-bak/sql-bench/graph-compare-results.sh 2009-02-23 17:18:49.000000000 +0100 -+++ mysql-5.1.31/sql-bench/graph-compare-results.sh 2009-02-24 18:00:16.000000000 +0100 -@@ -1,3 +1,4 @@ -+#/usr/bin/perl - #### - #### Hello ... this is a heavily hacked script by Luuk - #### instead of printing the result it makes a nice gif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Add lib64 dir to the library path - -On x86_64 systems openssl library is installed into /usr/lib64 directory and -MySQL couldn't find as it was searching only in /usr/lib. We can add it quite -safelly even on i586 as this directory wouldn't exist on them so no harm done. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- config/ac-macros/ssl.m4 2009-04-10 14:05:07.000000000 +0200 -+++ config/ac-macros/ssl.m4 2009-04-10 14:15:15.000000000 +0200 -@@ -102,7 +102,7 @@ - # - # Try to link with openSSL libs in <location> - # -- openssl_libs="-L$location/lib/ -lssl -lcrypto" -+ openssl_libs="-L$location/lib -L$location/lib64 -lssl -lcrypto" - MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) - - if test "$mysql_ssl_found" == "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Better handling of memcpy -BUGS: upstream#19975 - -Standard memcpy should behave better then self made one. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysys/mf_keycache.c -=================================================================== ---- mysys/mf_keycache.c.orig -+++ mysys/mf_keycache.c -@@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach - #endif - - /* Copy data from the cache buffer */ -- if (!(read_length & 511)) -- bmove512(buff, block->buffer+offset, read_length); -- else -- memcpy(buff, block->buffer+offset, (size_t) read_length); -+ memcpy(buff, block->buffer+offset, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -2857,10 +2854,7 @@ int key_cache_insert(KEY_CACHE *keycache - #endif - - /* Copy data from buff */ -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -3164,10 +3158,7 @@ int key_cache_write(KEY_CACHE *keycache, - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_unlock(&keycache->cache_lock); - #endif -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Incompatible types in ssl - -Sometimes argument of this function can be const and function doesn't change -the variable so there is no reason not to make that argument const; - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: vio/viosslfactories.c -=================================================================== ---- vio/viosslfactories.c.orig -+++ vio/viosslfactories.c -@@ -198,7 +198,7 @@ static void check_ssl_init() - static struct st_VioSSLFd * - new_VioSSLFd(const char *key_file, const char *cert_file, - const char *ca_file, const char *ca_path, -- const char *cipher, SSL_METHOD *method, -+ const char *cipher, const SSL_METHOD *method, - enum enum_ssl_init_error* error) - { - DH *dh; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch 2011-10-11 12:25:33.000000000 +0200 @@ -0,0 +1,29 @@ +PATCH-P0-FEATURE-SUSE: Moving SafeProcess to /usr/bin + +We prefer to have this script somewhere else, so we moved it out of +the mysql-test directory. + +Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> + +Index: mysql-test/lib/My/SafeProcess.pm +=================================================================== +--- mysql-test/lib/My/SafeProcess.pm.orig ++++ mysql-test/lib/My/SafeProcess.pm +@@ -102,7 +102,7 @@ sub find_bin { + if (IS_WIN32PERL or IS_CYGWIN) + { + # Use my_safe_process.exe +- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], ++ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + push(@safe_process_cmd, $exe); + +@@ -112,7 +112,7 @@ sub find_bin { + else + { + # Use my_safe_process +- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], ++ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + push(@safe_process_cmd, $exe); + } ++++++ series ++++++ --- /var/tmp/diff_new_pack.RdzQn4/_old 2012-04-23 09:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RdzQn4/_new 2012-04-23 09:15:38.000000000 +0200 @@ -1,21 +1,11 @@ -mysql-community-server-5.1.31-shebang.patch -mariadb-5.3.2-scripts-paths.patch -mysql-community-server-5.1.33-ssl-lib64-macro.patch -mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch -mariadb-5.2.6-group.patch mysql-community-server-5.1.45-multi-configuration.patch -mariadb-5.2.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch -mariadb-5.3.3-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch -mariadb-5.3.2-plugins-avoid-version.patch mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch -mariadb-5.2.4-libmysql-no-pkglibdir.patch -mysql-community-server-5.1.53-ssl-compilation-fix.patch -mariadb-5.3.3-compilation-fix.patch -mariadb-5.3.3-readline-includes.patch +mysql-community-server-5.5.6-safe-process-in-bin.patch +mariadb-5.5.20-group.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2012-04-23 09:15:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc", Maintainer is "JSlaby(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2012-04-17 07:46:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2012-04-23 09:15:32.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 20 13:53:41 UTC 2012 - fcrozat(a)suse.com + +- Add various fixes to opensuse template : + + create /etc/hostname as symlink to /etc/HOSTNAME + (lxc-clone fix) + + fix inadequate space in lxc.mount config (lxc-clone fix) + + disable network in container if not configured + + configure network scripts properly +- Add lxc-snapshot-btrfs-lvm.patch: backport snapshot support, + using btrfs or lvm2. +- Add lxc-opensuse-tmpfs.patch: ensure container shutting down is + correctly detected by LXC. + +------------------------------------------------------------------- New: ---- lxc-opensuse-tmpfs.patch lxc-snapshot-btrfs-lvm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.ay8tMH/_old 2012-04-23 09:15:33.000000000 +0200 +++ /var/tmp/diff_new_pack.ay8tMH/_new 2012-04-23 09:15:33.000000000 +0200 @@ -26,11 +26,15 @@ Source: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz Source1: README.SUSE Source2: lxc-createconfig.in -# PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 +# PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 and various fixes Patch0: lxc-opensuse-12.1.patch # PATCH-FIX-UPSTREAM lxc-checkconfig-kernel-3.patch bnc#720845 fcrozat(a)suse.com -- correctly detect kernel 3.x Patch1: lxc-checkconfig-kernel-3.patch Patch2: Accurately-detect-whether-a-system-supports-clone_children.patch +# PATCH-FIX-UPSTREAM lxc-snapshot-btrfs-lvm.patch fcrozat(a)suse.com -- backport support for btrfs and lvm based snapshots (git) +Patch3: lxc-snapshot-btrfs-lvm.patch +# PATCH-FIX-UPSTREAM lxc-opensuse-tmpfs.patch fcrozat(a)suse.com -- fix shutdown in openSUSE container +Patch4: lxc-opensuse-tmpfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils BuildRequires: libcap-devel @@ -41,6 +45,7 @@ BuildRequires: linux-kernel-headers %endif Requires: /sbin/setcap +Requires: rsync # needed to create openSUSE containers using template Recommends: build @@ -69,6 +74,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %configure --disable-examples ++++++ lxc-opensuse-12.1.patch ++++++ --- /var/tmp/diff_new_pack.ay8tMH/_old 2012-04-23 09:15:33.000000000 +0200 +++ /var/tmp/diff_new_pack.ay8tMH/_new 2012-04-23 09:15:33.000000000 +0200 @@ -138,21 +138,45 @@ 1.7.7 -From 5649fb6c0e372f03621d1fd0f50ecd72fd021563 Mon Sep 17 00:00:00 2001 +From 594d9ba1043bdbc3bb0bded71e19a6ed3e724e4d Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> -Date: Wed, 4 Jan 2012 15:11:55 +0100 -Subject: [PATCH 2/2] templates: fix openSUSE 12.1 template creation on x86 - platform +Date: Wed, 18 Apr 2012 17:17:18 +0200 +Subject: [PATCH] various fixes for openSUSE template: - create /etc/hostname + as symlink to /etc/HOSTNAME (lxc-clone fix) - fix + inadequate space in lxc.mount config (lxc-clone fix) - fix + openSUSE 12.1 template creation on x86 platform - disable + network in container if not configured - configure network + scripts properly --- - templates/lxc-opensuse.in | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) + templates/lxc-opensuse.in | 34 +++++++++++++++++++++++++++++----- + 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in -index d30147d..d62e5f3 100644 +index 120b2c7..4342150 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in -@@ -156,10 +156,11 @@ download_opensuse() +@@ -34,8 +34,8 @@ configure_opensuse() + + # set network as static, but everything is done by LXC outside the container + cat <<EOF > $rootfs/etc/sysconfig/network/ifcfg-eth0 +-STARTMODE='auto' +-BOOTPROTO='static' ++STARTMODE='manual' ++BOOTPROTO='none' + EOF + + # set default route +@@ -71,6 +71,8 @@ EOF + cat <<EOF > $rootfs/etc/HOSTNAME + $hostname + EOF ++ # ensure /etc/hostname is available too ++ ln -s -f HOSTNAME $rootfs/etc/hostname + + # do not use hostname from HOSTNAME variable + cat <<EOF >> $rootfs/etc/sysconfig/cron +@@ -156,10 +158,11 @@ download_opensuse() cat > $cache/partial-$arch-packages/opensuse.conf << EOF Preinstall: aaa_base bash coreutils diffutils Preinstall: filesystem fillup glibc grep insserv libacl1 libattr1 @@ -165,7 +189,7 @@ RunScripts: aaa_base -@@ -169,9 +170,21 @@ Support: lxc +@@ -169,9 +172,21 @@ Support: lxc Prefer: sysvinit-init Ignore: patterns-openSUSE-base:patterns-openSUSE-yast2_install_wf @@ -188,6 +212,30 @@ chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/distribution/$DISTRO/repo/oss repo-oss chroot $cache/partial-$arch /usr/bin/zypper --quiet --non-interactive ar http://download.opensuse.org/update/$DISTRO/ update chroot $cache/partial-$arch rpm -e patterns-openSUSE-base +@@ -254,13 +269,22 @@ copy_configuration() + rootfs=$2 + name=$3 + ++# only disable network if no network configuration was passed ++grep -q lxc.network.type $path/config ++network_not_configured=$? ++if [ $network_not_configured -eq 1 ]; then ++ cat <<EOF >> $path/config ++lxc.network.type = empty ++EOF ++fi ++ + cat <<EOF >> $path/config + lxc.utsname = $name + + lxc.tty = 4 + lxc.pts = 1024 + lxc.rootfs = $rootfs +-lxc.mount = $path/fstab ++lxc.mount = $path/fstab + + lxc.cgroup.devices.deny = a + # /dev/null and zero -- 1.7.7 ++++++ lxc-opensuse-tmpfs.patch ++++++ >From d088de50c551f4941ae24b536057fc57915ee7d7 Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat(a)suse.com> Date: Fri, 20 Apr 2012 14:36:53 +0200 Subject: [PATCH] shutdown fixes for openSUSE container - mount /run on tmpfs outside container - replace /var/run bind mount on /run by a symlink --- templates/lxc-opensuse.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in index 0946f95..076fe4f 100644 --- a/templates/lxc-opensuse.in +++ b/templates/lxc-opensuse.in @@ -201,6 +201,10 @@ EOF # create mtab symlink rm -f $cache/partial-$arch/etc/mtab ln -sf /proc/self/mounts $cache/partial-$arch/etc/mtab + +# ensure /var/run and /run are symlinked + rm -fr $cache/partial-$arch/var/run + ln -s -f ../run $cache/partial-$arch/var/run if [ $? -ne 0 ]; then echo "Failed to download the rootfs, aborting." return 1 @@ -307,6 +311,7 @@ EOF cat <<EOF > $path/fstab proc $rootfs/proc proc nodev,noexec,nosuid 0 0 sysfs $rootfs/sys sysfs defaults 0 0 +tmpfs $rootfs/run tmpfs mode=0755,nodev,nosuid 0 0 EOF if [ $? -ne 0 ]; then -- 1.7.7 ++++++ lxc-snapshot-btrfs-lvm.patch ++++++ ++++ 1289 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2012-04-23 09:15:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2012-04-12 13:25:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-04-23 09:15:21.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 19 09:14:12 UTC 2012 - gber(a)opensuse.org + +- update to version 1.2.2 + - fix wrapper path in AppArmor profile (broken since 1.1.1) + - add show-manual-login and allow-guest options to + lightdm-set-defaults + - add missing regression test script +- dropped lightdm-use-pkglibexecdir.patch which has been + incorporated upstream + +------------------------------------------------------------------- Old: ---- lightdm-1.2.0.tar.gz lightdm-use-pkglibexecdir.patch New: ---- lightdm-1.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.FYOyuL/_old 2012-04-23 09:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.FYOyuL/_new 2012-04-23 09:15:23.000000000 +0200 @@ -23,7 +23,7 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 1.2.0 +Version: 1.2.2 Release: 0 Summary: Lightweight, Cross-desktop Display Manager License: GPL-3.0+ @@ -34,8 +34,6 @@ Source2: %{name}-autologin.pamd Source3: X11-displaymanagers-%{name} Source100: %{name}-rpmlintrc -# PATCH-FEATURE-OPENSUSE lightdm-use-pkglibexecdir.patch gber(a)opensuse.org -- Use pkglibexecdir instead of libexecdir for helper binaries/scripts -Patch0: lightdm-use-pkglibexecdir.patch # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch gber(a)opensuse.org -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager Patch1: lightdm-sysconfig-support.patch # PATCH-FEATURE-OPENSUSE lightdm-xauthlocalhostname-support.patch gber(a)opensuse.org -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes @@ -117,13 +115,11 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch4 -p1 %patch5 -p1 %patch7 -p1 -#rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp %build ./autogen.sh ++++++ lightdm-1.2.0.tar.gz -> lightdm-1.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/INSTALL new/lightdm-1.2.2/INSTALL --- old/lightdm-1.2.0/INSTALL 2012-01-17 07:49:04.000000000 +0100 +++ new/lightdm-1.2.2/INSTALL 2012-04-19 01:39:27.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/Makefile.in new/lightdm-1.2.2/Makefile.in --- old/lightdm-1.2.0/Makefile.in 2012-04-04 08:51:11.000000000 +0200 +++ new/lightdm-1.2.2/Makefile.in 2012-04-19 02:45:22.000000000 +0200 @@ -40,8 +40,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing + compile config.guess config.sub depcomp install-sh ltmain.sh \ + missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/NEWS new/lightdm-1.2.2/NEWS --- old/lightdm-1.2.0/NEWS 2012-04-05 09:07:05.000000000 +0200 +++ new/lightdm-1.2.2/NEWS 2012-04-19 02:45:06.000000000 +0200 @@ -1,3 +1,12 @@ +Overview of changes in lightdm 1.2.2 + + * Add missing regression test script + +Overview of changes in lightdm 1.2.1 + + * Fix wrapper path in AppArmor profile (broken since 1.1.1) + * Add show-manual-login and allow-guest options to lightdm-set-defaults + Overview of changes in lightdm 1.2.0 * Backup .xsession-errors on login diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/TODO new/lightdm-1.2.2/TODO --- old/lightdm-1.2.0/TODO 2012-02-29 10:57:24.000000000 +0100 +++ new/lightdm-1.2.2/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -LightDM crashes when quitting after have XDMCP connection in PAMSession? -Stop being able to log into users on other seats -Add VNC support -Test XDMCP client seat -Per seat guest enable -Close FDs on starting session (but keep greeter pipe open) -Merge tests .script and .config -Rename XAuthorization to XAuthority? And merge in authentication? -Failsafe X and exponential backoff? -GET ALL HINTS WORKING -Always load dmrc from cache -Make liblightdm-qt use AccountsService -Fix XDM-AUTHENTICATION-KEY decode, add regression test - -*** -Fix guest accounts being created but the session doesn't start -Add tests to check guest accounts are being created and destroyed - -add regression test to check XDG_SESSION_COOKIE is set \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/config.guess new/lightdm-1.2.2/config.guess --- old/lightdm-1.2.0/config.guess 2012-02-15 10:00:36.000000000 +0100 +++ new/lightdm-1.2.2/config.guess 2012-04-19 01:39:26.000000000 +0200 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/config.sub new/lightdm-1.2.2/config.sub --- old/lightdm-1.2.0/config.sub 2012-02-15 10:00:36.000000000 +0100 +++ new/lightdm-1.2.2/config.sub 2012-04-19 01:39:26.000000000 +0200 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/configure new/lightdm-1.2.2/configure --- old/lightdm-1.2.0/configure 2012-04-04 08:51:12.000000000 +0200 +++ new/lightdm-1.2.2/configure 2012-04-19 02:45:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for lightdm 1.2.0. +# Generated by GNU Autoconf 2.68 for lightdm 1.2.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='lightdm' PACKAGE_TARNAME='lightdm' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='lightdm 1.2.0' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='lightdm 1.2.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1433,7 +1433,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lightdm 1.2.0 to adapt to many kinds of systems. +\`configure' configures lightdm 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1503,7 +1503,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lightdm 1.2.0:";; + short | recursive ) echo "Configuration of lightdm 1.2.2:";; esac cat <<\_ACEOF @@ -1667,7 +1667,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lightdm configure 1.2.0 +lightdm configure 1.2.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2153,7 +2153,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lightdm $as_me 1.2.0, which was +It was created by lightdm $as_me 1.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2971,7 +2971,7 @@ # Define the identity of the package. PACKAGE='lightdm' - VERSION='1.2.0' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -18766,7 +18766,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lightdm $as_me 1.2.0, which was +This file was extended by lightdm $as_me 1.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18832,7 +18832,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lightdm config.status 1.2.0 +lightdm config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/configure.ac new/lightdm-1.2.2/configure.ac --- old/lightdm-1.2.0/configure.ac 2012-04-04 08:50:53.000000000 +0200 +++ new/lightdm-1.2.2/configure.ac 2012-04-19 02:44:45.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.2.0) +AC_INIT(lightdm, 1.2.2) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/data/Makefile.am new/lightdm-1.2.2/data/Makefile.am --- old/lightdm-1.2.0/data/Makefile.am 2011-12-09 02:51:23.000000000 +0100 +++ new/lightdm-1.2.2/data/Makefile.am 2012-04-19 01:33:26.000000000 +0200 @@ -12,7 +12,7 @@ install-data-hook: install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ + sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \ > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session dist_man1_MANS = lightdm.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/data/Makefile.in new/lightdm-1.2.2/data/Makefile.in --- old/lightdm-1.2.0/data/Makefile.in 2012-04-04 08:51:10.000000000 +0200 +++ new/lightdm-1.2.2/data/Makefile.in 2012-04-19 02:45:21.000000000 +0200 @@ -763,7 +763,7 @@ install-data-hook: install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ + sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \ > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/data/guest-session.apparmor new/lightdm-1.2.2/data/guest-session.apparmor --- old/lightdm-1.2.0/data/guest-session.apparmor 2011-12-09 02:51:23.000000000 +0100 +++ new/lightdm-1.2.2/data/guest-session.apparmor 2012-04-19 01:33:26.000000000 +0200 @@ -4,7 +4,7 @@ #include <tunables/global> -LIBEXECDIR/lightdm-guest-session-wrapper { +PKGLIBEXECDIR/lightdm-guest-session-wrapper { #include <abstractions/authentication> #include <abstractions/nameservice> #include <abstractions/wutmp> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/doc/html/lightdm-gobject-1-Greeter-Interface.html new/lightdm-1.2.2/doc/html/lightdm-gobject-1-Greeter-Interface.html --- old/lightdm-1.2.0/doc/html/lightdm-gobject-1-Greeter-Interface.html 2012-04-05 09:07:32.000000000 +0200 +++ new/lightdm-1.2.2/doc/html/lightdm-gobject-1-Greeter-Interface.html 2012-04-19 02:45:32.000000000 +0200 @@ -98,7 +98,7 @@ <div class="example"> -<a name="idp6889520"></a>Example 1. Example Greeter +<a name="idp6834256"></a>Example 1. Example Greeter <div class="example-contents"><pre class="programlisting"> int main () { @@ -342,7 +342,14 @@ <a name="lightdm-greeter-get-hide-users-hint"></a><h3>lightdm_greeter_get_hide_users_hint ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean">gboolean</a> lightdm_greeter_get_hide_users_hint (<code>LightDMGreeter *greeter</code>);</pre> -Check if user accounts should be shown. +Check if user accounts should be shown. If this is TRUE then the list of +accounts should be taken from LightDMUserList and displayed in the greeter +for the user to choose from. Note that this list can be empty and it is +recommended you show a method for the user to enter a username manually. + + +If this option is shown the greeter should only allow these users to be +chosen for login unless the manual login hint is set. <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/liblightdm-qt/usersmodel.cpp new/lightdm-1.2.2/liblightdm-qt/usersmodel.cpp --- old/lightdm-1.2.0/liblightdm-qt/usersmodel.cpp 2012-02-23 07:39:49.000000000 +0100 +++ new/lightdm-1.2.2/liblightdm-qt/usersmodel.cpp 2012-04-19 01:29:23.000000000 +0200 @@ -13,7 +13,7 @@ #include <QtCore/QString> #include <QtCore/QDebug> -#include <QtGui/QPixmap> +#include <QtGui/QIcon> #include <lightdm.h> @@ -218,7 +218,7 @@ case Qt::DisplayRole: return d->users[row].displayName(); case Qt::DecorationRole: - return QPixmap(d->users[row].image); + return QIcon(d->users[row].image); case UsersModel::NameRole: return d->users[row].name; case UsersModel::RealNameRole: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/utils/lightdm-set-defaults.c new/lightdm-1.2.2/utils/lightdm-set-defaults.c --- old/lightdm-1.2.0/utils/lightdm-set-defaults.c 2012-03-16 01:06:50.000000000 +0100 +++ new/lightdm-1.2.2/utils/lightdm-set-defaults.c 2012-04-19 01:34:28.000000000 +0200 @@ -24,6 +24,8 @@ #define GREETER_KEY_NAME "greeter-session" #define AUTOLOGIN_KEY_NAME "autologin-user" #define HIDE_USERS_KEY_NAME "greeter-hide-users" +#define MANUAL_LOGIN_KEY_NAME "greeter-show-manual-login" +#define ALLOW_GUEST_KEY_NAME "allow-guest" #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0') @@ -31,11 +33,15 @@ static gboolean keep_old = FALSE; static gboolean remove = FALSE; static gboolean hide_users = FALSE; -static gboolean show_users = FALSE; +static gboolean show_manual_login = FALSE; +static gboolean allow_guest = FALSE; static char *session = NULL; static char *greeter = NULL; static char *autologin = NULL; +static char *str_hide_users = NULL; +static char *str_show_manual_login = NULL; +static char *str_allow_guest = NULL; static GOptionEntry entries[] = { @@ -45,8 +51,9 @@ { "session", 's', 0, G_OPTION_ARG_STRING, &session, N_("Set default session"), NULL }, { "greeter", 'g', 0, G_OPTION_ARG_STRING, &greeter, N_("Set default greeter"), NULL }, { "autologin",'a', 0, G_OPTION_ARG_STRING, &autologin, N_("Set autologin user"), NULL }, - { "hide-users",'i', 0, G_OPTION_ARG_NONE, &hide_users, N_("Hide user list in greeter (exclusive to show-users)"), NULL }, - { "show-users",'w', 0, G_OPTION_ARG_NONE, &show_users, N_("Show user list in greeter (exclusive to hide-users)"), NULL }, + { "hide-users",'i', 0, G_OPTION_ARG_STRING, &str_hide_users, N_("Set greeter-hide-users to true or false"), NULL }, + { "show-manual-login",'m', 0, G_OPTION_ARG_STRING, &str_show_manual_login, N_("Set show-manual-login to true or false"), NULL }, + { "allow-guest",'l', 0, G_OPTION_ARG_STRING, &str_allow_guest, N_("Set allow-guest to true or false"), NULL }, { NULL } }; @@ -119,6 +126,25 @@ } int +str_to_bool(const gchar *str, gboolean *bool_out) +{ + if (IS_STRING_EMPTY(str)) { + return -1; + } + else if (strncasecmp(str, "true", 4)==0) { + *bool_out = TRUE; + return 0; + } + else if (strncasecmp(str, "false", 5)==0) { + *bool_out = FALSE; + return 0; + } + else { + return -2; + } +} + +int main (int argc, char *argv[]) { GOptionContext *context = NULL; @@ -149,12 +175,7 @@ g_error_free (error); return 1; } - if (show_users && hide_users) { - g_printerr (N_("show-users and hide-users are mutually exclusive\n")); - g_option_context_free (context); - return 1; - } - if (IS_STRING_EMPTY (session) && IS_STRING_EMPTY (greeter) && IS_STRING_EMPTY (autologin) && !show_users && !hide_users) { + if (IS_STRING_EMPTY (session) && IS_STRING_EMPTY (greeter) && IS_STRING_EMPTY (autologin) && IS_STRING_EMPTY(str_hide_users) && IS_STRING_EMPTY(str_show_manual_login) && IS_STRING_EMPTY(str_allow_guest)) { g_printerr (N_("Wrong usage of the command\n%s"), g_option_context_get_help (context, FALSE, NULL)); g_option_context_free (context); return 1; @@ -183,10 +204,35 @@ return_code = update_string (default_greeter, greeter, keep_old, remove, SEATDEFAULT_KEY_GROUP, GREETER_KEY_NAME, keyfile); if (!(IS_STRING_EMPTY (autologin)) && (return_code == 0)) return_code = update_string (default_autologin, autologin, keep_old, remove, SEATDEFAULT_KEY_GROUP, AUTOLOGIN_KEY_NAME, keyfile); - if ((show_users || hide_users) && (return_code == 0)) - return_code = update_boolean (hide_users, keep_old, SEATDEFAULT_KEY_GROUP, HIDE_USERS_KEY_NAME, keyfile); + if (!(IS_STRING_EMPTY(str_hide_users)) && (return_code == 0)) { + if (str_to_bool(str_hide_users, &hide_users) == 0) { + return_code = update_boolean (hide_users, keep_old, SEATDEFAULT_KEY_GROUP, HIDE_USERS_KEY_NAME, keyfile); + } + else { + g_printerr (N_("true and false are the only valid choices for hide-users\n")); + return 1; + } + } + if (!(IS_STRING_EMPTY(str_allow_guest)) && (return_code == 0)) { + if (str_to_bool(str_allow_guest, &allow_guest) == 0) { + return_code = update_boolean (allow_guest, keep_old, SEATDEFAULT_KEY_GROUP, ALLOW_GUEST_KEY_NAME, keyfile); + } + else { + g_printerr (N_("true and false are the only valid choices for allow-guest\n")); + return 1; + } + } + if (!(IS_STRING_EMPTY(str_show_manual_login)) && (return_code == 0)) { + if (str_to_bool(str_show_manual_login, &show_manual_login) == 0) { + return_code = update_boolean (show_manual_login, keep_old, SEATDEFAULT_KEY_GROUP, MANUAL_LOGIN_KEY_NAME, keyfile); + } + else { + g_printerr (N_("true and false are the only valid choices for show-manual-login\n")); + return 1; + } + } - if(return_code == 0) { + if (return_code == 0) { s_data = g_key_file_to_data (keyfile, &size, &error); if (!s_data) { g_debug ("Can't convert data to string: %s", error->message); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmod for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2012-04-23 09:15:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2012-04-20 15:17:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-04-23 09:15:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 21 01:55:30 UTC 2012 - jengelh(a)medozas.de + +- Restore patch descriptions + (and use `quilt setup` for rediff in future) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod-so-version.diff ++++++ --- /var/tmp/diff_new_pack.KQA8J3/_old 2012-04-23 09:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.KQA8J3/_new 2012-04-23 09:15:21.000000000 +0200 @@ -1,7 +1,23 @@ -diff -ur kmod-7.orig/Makefile.am kmod-7/Makefile.am ---- kmod-7.orig/Makefile.am 2012-04-18 12:54:59.140122820 +0200 -+++ kmod-7/Makefile.am 2012-04-18 12:56:06.086310478 +0200 -@@ -33,10 +33,6 @@ +From: Jan Engelhardt <jengelh(a)medozas.de> +Upstream: this patch is too complex for upstream to handle + +Change the kmod Makefile from using -version-info to -version-number +to make it clear that the kmod project is not trying to subvert the +libtool "interface" number concept, but in fact does not do +libtool-style counting. + +References: <alpine.LNX.2.01.1202070049200.12889(a)frira.zrqbmnf.qr> +References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html + +--- + Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +Index: kmod-8/Makefile.am +=================================================================== +--- kmod-8.orig/Makefile.am ++++ kmod-8/Makefile.am +@@ -33,10 +33,6 @@ SED_PROCESS = \ %.pc: %.pc.in Makefile $(SED_PROCESS) @@ -12,7 +28,7 @@ noinst_LTLIBRARIES = libkmod/libkmod-util.la libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \ libkmod/libkmod-hash.h \ -@@ -65,7 +61,7 @@ +@@ -65,7 +61,7 @@ EXTRA_DIST += libkmod/libkmod.sym EXTRA_DIST += libkmod/COPYING libkmod/README libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-04-23 09:15:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-04-17 07:45:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-04-23 09:15:16.000000000 +0200 @@ -1,0 +2,93 @@ +Fri Apr 20 11:07:12 CEST 2012 - ms(a)suse.de + +- v5.02.24 released + +------------------------------------------------------------------- +Thu Apr 19 13:36:16 CEST 2012 - ms(a)suse.de + +- take package section type into account when processing + bootincluded packages. This means packages added as bootincluded + into the e.g image section gets added to the image section + in the boot image too. If the target description doesn't + provide the section the package will be added to the default + bootstrap section as before + +------------------------------------------------------------------- +Thu Apr 19 11:15:44 CEST 2012 - ms(a)suse.de + +- remove db4 package from the delete list in the RHEL + boot image descriptions + +------------------------------------------------------------------- +Thu Apr 19 11:14:51 CEST 2012 - ms(a)suse.de + +- fixed rpm package database rebuild check for RHEL/yum + this reverts commit: c3e4ac88562074d87cad21e96cfe3d6dde976e48 + +------------------------------------------------------------------- +Thu Apr 19 09:36:05 CEST 2012 - ms(a)suse.de + +- moved yum priority installation from the RHEL boot- into the + system image template and make it a bootincluded package. + That's because there are name differences like yum-priority + and yum-plugin-priority + +------------------------------------------------------------------- +Thu Apr 19 09:01:51 CEST 2012 - ms(a)suse.de + +- fixed rebuild of package database when yum is used + +------------------------------------------------------------------- +Wed Apr 18 17:43:54 CEST 2012 - ms(a)suse.de + +- arm: adapt JeOS description for beagle and fixed building in emulated environment + +------------------------------------------------------------------- +Tue Apr 17 16:53:21 CEST 2012 - ms(a)suse.de + +- really fixed boot.script setup according to (bnc #757489) + +------------------------------------------------------------------- +Tue Apr 17 15:55:30 CEST 2012 - ms(a)suse.de + +- arm: On other systems which supports a boot menu we add + the linux kernel and initrd with its file names. But on + arm systems there can only be one kernel because uboot + doesn't support a menu. Thus perl-bootloader also doesn't + support updating the uboot configuration and that's the + reason why we use the links created by mkinitrd to point + to the kernel and initrd in order to support kernel + updates (bnc #757489) + +------------------------------------------------------------------- +Mon Apr 16 15:21:42 CEST 2012 - ms(a)suse.de + +- s390: fixed recreateVTOCTable() to wait until the volume + group has settled before deactivating it in a LVM setup + +------------------------------------------------------------------- +Mon Apr 16 14:25:55 CEST 2012 - ms(a)suse.de + +- removed obsolete error console information + +------------------------------------------------------------------- +Mon Apr 16 12:42:54 CEST 2012 - ms(a)suse.de + +- kiwi creates a link with filesystem extension pointing to + the root filesystem image when created. The function + compressImage creates a .gz version of that root filesystem + image and therefore break the link. This fix enhances + compressImage() in a way that it receives the filesystem + information in order to repair the link + +------------------------------------------------------------------- +Mon Apr 16 11:49:51 CEST 2012 - ms(a)suse.de + +- added oem type to s390 JeOS image description + +------------------------------------------------------------------- +Mon Apr 16 11:41:03 CEST 2012 - ms(a)suse.de + +- update s390 SLE repo in JeOS template + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.iNohOc/_old 2012-04-23 09:15:17.000000000 +0200 +++ /var/tmp/diff_new_pack.iNohOc/_new 2012-04-23 09:15:17.000000000 +0200 @@ -22,7 +22,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.02.23 +Version: 5.02.24 Release: 0 # requirements to build packages BuildRequires: gcc-c++ ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/.revision 2012-04-20 13:43:32.000000000 +0200 @@ -1 +1 @@ -4bbb0941600b205a7d11bab3599e1641bbd85fd4 +9026edecdc726157659543b374e5dedf27015fad diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-04-16 10:34:46.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-04-20 13:43:37.000000000 +0200 @@ -42,7 +42,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.02.23"; + $data{Version} = "5.02.24"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2012-04-16 10:34:46.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2012-04-20 13:43:37.000000000 +0200 @@ -184,11 +184,16 @@ my %repos; my %strip; my %strip_default; - my @plist; - my @alist; - my @falistImage; - my @fplistImage; - my @fplistDelete; + my @bootstrap_plist; + my @image_plist; + my @bootstrap_alist; + my @image_alist; + my @bootstrap_falistImage; + my @image_falistImage; + my @bootstrap_fplistImage; + my @image_fplistImage; + my @bootstrap_fplistDelete; + my @image_fplistDelete; my @driverList; my %fixedBootInclude; my @node; @@ -317,37 +322,67 @@ next; } my $type = $element -> getAttribute ("type"); - if (($type eq "image") || ($type eq "bootstrap")) { - push (@plist,$element->getElementsByTagName ("package")); - push (@alist,$element->getElementsByTagName ("archive")); + if ($type eq "bootstrap") { + push (@bootstrap_plist,$element->getElementsByTagName ("package")); + push (@bootstrap_alist,$element->getElementsByTagName ("archive")); } + if ($type eq "image") { + push (@image_plist,$element->getElementsByTagName ("package")); + push (@image_alist,$element->getElementsByTagName ("archive")); + } + } - foreach my $element (@plist) { + foreach my $element (@bootstrap_plist) { my $package = $element -> getAttribute ("name"); my $bootinc = $element -> getAttribute ("bootinclude"); my $bootdel = $element -> getAttribute ("bootdelete"); my $include = 0; if ((defined $bootinc) && ("$bootinc" eq "true")) { - push (@fplistImage,$package); + push (@bootstrap_fplistImage,$package); $include++; } if ((defined $bootdel) && ("$bootdel" eq "true")) { - push (@fplistDelete,$package); + push (@bootstrap_fplistDelete,$package); $include--; } $fixedBootInclude{$package} = $include; } - foreach my $element (@alist) { + foreach my $element (@image_plist) { + my $package = $element -> getAttribute ("name"); + my $bootinc = $element -> getAttribute ("bootinclude"); + my $bootdel = $element -> getAttribute ("bootdelete"); + my $include = 0; + if ((defined $bootinc) && ("$bootinc" eq "true")) { + push (@image_fplistImage,$package); + $include++; + } + if ((defined $bootdel) && ("$bootdel" eq "true")) { + push (@image_fplistDelete,$package); + $include--; + } + $fixedBootInclude{$package} = $include; + } + foreach my $element (@bootstrap_alist) { + my $archive = $element -> getAttribute ("name"); + my $bootinc = $element -> getAttribute ("bootinclude"); + if ((defined $bootinc) && ("$bootinc" eq "true")) { + push (@bootstrap_falistImage,$archive); + } + } + foreach my $element (@image_alist) { my $archive = $element -> getAttribute ("name"); my $bootinc = $element -> getAttribute ("bootinclude"); if ((defined $bootinc) && ("$bootinc" eq "true")) { - push (@falistImage,$archive); + push (@image_falistImage,$archive); } } - $changeset{"fixedBootInclude"} = \%fixedBootInclude; - $changeset{"falistImage"} = \@falistImage; - $changeset{"fplistImage"} = \@fplistImage; - $changeset{"fplistDelete"} = \@fplistDelete; + $changeset{"fixedBootInclude"} = \%fixedBootInclude; + $changeset{"bootstrap_falistImage"} = \@bootstrap_falistImage; + $changeset{"image_falistImage"} = \@image_falistImage; + $changeset{"bootstrap_fplistImage"} = \@bootstrap_fplistImage; + $changeset{"image_fplistImage"} = \@image_fplistImage; + $changeset{"bootstrap_fplistDelete"} = \@bootstrap_fplistDelete; + $changeset{"image_fplistDelete"} = \@image_fplistDelete; #========================================== # Store OEM data #------------------------------------------ @@ -899,7 +934,7 @@ # Compress image using gzip #------------------------------------------ if (($type{compressed}) && ($type{compressed} eq 'true')) { - if (! $this -> compressImage ($name)) { + if (! $this -> compressImage ($name,'squashfs')) { return; } } @@ -1597,7 +1632,7 @@ #========================================== # compress RW extend #------------------------------------------ - if (! $this -> compressImage ($namerw)) { + if (! $this -> compressImage ($namerw,'ext2')) { return; } } @@ -3198,7 +3233,13 @@ #------------------------------------------ if (! defined $nozip) { if (($type{compressed}) && ($type{compressed} eq 'true')) { - if (! $this -> compressImage ($name)) { + my $rootfs; + if ($type{filesystem}) { + $rootfs = $type{filesystem}; + } else { + $rootfs = $type{type}; + } + if (! $this -> compressImage ($name,$rootfs)) { return; } } @@ -4070,9 +4111,10 @@ # compressImage #------------------------------------------ sub compressImage { - my $this = shift; - my $name = shift; - my $kiwi = $this->{kiwi}; + my $this = shift; + my $name = shift; + my $fstype = shift; + my $kiwi = $this->{kiwi}; #========================================== # Compress image using gzip #------------------------------------------ @@ -4087,6 +4129,14 @@ } $kiwi -> done(); $this -> updateMD5File ("$this->{imageDest}/$name.gz"); + #========================================== + # Relink filesystem link to comp image file + #------------------------------------------ + my $fslink = $this->{imageDest}."/".$name.".".$fstype; + if (-l $fslink) { + qxx ("rm -f $fslink 2>&1"); + qxx ("ln -vs $this->{imageDest}/$name.gz $fslink 2>&1"); + } return $name; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2012-04-16 10:34:46.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-04-20 13:43:37.000000000 +0200 @@ -278,7 +278,6 @@ Echo "$1" case "$what" in "reboot") - Echo "rebootException: error consoles at Alt-F3/F4" Echo "rebootException: reboot in 120 sec..."; sleep 120 /sbin/reboot -f -i >$nuldev ;; @@ -1462,8 +1461,23 @@ if test -z "$i";then continue fi - kernel=`echo $i | cut -f1 -d:` - initrd=`echo $i | cut -f2 -d:` + # /.../ + # On other systems which supports a boot menu we add + # the linux kernel and initrd with its file names + # like this: + # + # kernel=`echo $i | cut -f1 -d:` + # initrd=`echo $i | cut -f2 -d:` + # + # But on arm systems there can only be one kernel because + # uboot doesn't support a menu. Thus perl-bootloader also + # doesn't support updating the uboot configuration and + # that's the reason why we use the links created by + # mkinitrd to point to the kernel and initrd in order + # to support kernel updates + # ---- + kernel=uImage + initrd=initrd echo "setenv ramdisk $initrd" > $conf echo "setenv kernel $kernel" >> $conf echo "setenv initrd_high \"0xffffffff\"" >> $conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2012-04-20 13:43:37.000000000 +0200 @@ -998,6 +998,10 @@ return; } $kiwi -> done(); + } else { + $kiwi -> info ('Rebuild RPM package db...'); + $data = qxx ("@kchroot /bin/rpm --rebuilddb"); + $kiwi -> done(); } } $this->{channelList} = \@channelList; @@ -2535,10 +2539,10 @@ # cleanupRPMDatabase #------------------------------------------ sub cleanupRPMDatabase { - my $this = shift; - my $kiwi = $this->{kiwi}; - my @kchroot= @{$this->{kchroot}}; - my $root = $this->{root}; + my $this = shift; + my $kiwi = $this->{kiwi}; + my @kchroot = @{$this->{kchroot}}; + my $root = $this->{root}; my $data; my $code; #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2012-04-16 10:34:46.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2012-04-20 13:43:37.000000000 +0200 @@ -4741,35 +4741,39 @@ #========================================== # 4) merge/update packages #------------------------------------------ - if (@{$changeset->{fplistImage}}) { - $kiwi -> info ("Updating package(s):\n"); - my $fixedBootInclude = $changeset->{fixedBootInclude}; - my @fplistImage = @{$changeset->{fplistImage}}; - my @fplistDelete = @{$changeset->{fplistDelete}}; - foreach my $p (@fplistImage) { - $kiwi -> info ("--> $p\n"); - } - $this -> addPackages ( - "image",$fixedBootInclude,$packageNodeList,@fplistImage - ); - if (@fplistDelete) { + foreach my $section (("image","bootstrap")) { + if (@{$changeset->{$section."_fplistImage"}}) { + $kiwi -> info ("Updating package(s) [$section]:\n"); + my $fixedBootInclude = $changeset->{fixedBootInclude}; + my @fplistImage = @{$changeset->{$section."_fplistImage"}}; + my @fplistDelete = @{$changeset->{$section."_fplistDelete"}}; + foreach my $p (@fplistImage) { + $kiwi -> info ("--> $p\n"); + } $this -> addPackages ( - "delete",undef,$packageNodeList,@fplistDelete + $section,$fixedBootInclude,$packageNodeList,@fplistImage ); + if (@fplistDelete) { + $this -> addPackages ( + "delete",undef,$packageNodeList,@fplistDelete + ); + } } } #========================================== # 5) merge/update archives #------------------------------------------ - if (@{$changeset->{falistImage}}) { - $kiwi -> info ("Updating archive(s):\n"); - my @falistImage = @{$changeset->{falistImage}}; - foreach my $p (@falistImage) { - $kiwi -> info ("--> $p\n"); + foreach my $section (("image","bootstrap")) { + if (@{$changeset->{$section."_falistImage"}}) { + $kiwi -> info ("Updating archive(s) [$section]:\n"); + my @falistImage = @{$changeset->{$section."_falistImage"}}; + foreach my $p (@falistImage) { + $kiwi -> info ("--> $p\n"); + } + $this -> addArchives ( + $section,"bootinclude",$packageNodeList,@falistImage + ); } - $this -> addArchives ( - "image","bootinclude",$packageNodeList,@falistImage - ); } #========================================== # 6) merge/update machine attribs in type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml new/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml --- old/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -105,7 +105,6 @@ <package name="cpio"/> <package name="cracklib-dicts"/> <package name="cyrus-sasl"/> - <package name="db4"/> <package name="dbus-glib"/> <package name="diffutils"/> <package name="expat"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml --- old/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/rhel-06.0/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -71,7 +71,6 @@ <packages type="bootstrap"> <package name="basesystem"/> <package name="filesystem"/> - <package name="yum-plugin-priorities"/> </packages> <packages type="image"> <package name="bind-libs"/> @@ -108,7 +107,6 @@ <package name="cpio"/> <package name="cracklib-dicts"/> <package name="cyrus-sasl"/> - <package name="db4"/> <package name="dbus-glib"/> <package name="diffutils"/> <package name="expat"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml --- old/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-06.0/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -72,7 +72,6 @@ <packages type="bootstrap"> <package name="filesystem"/> <package name="basesystem"/> - <package name="yum-priorities"/> </packages> <packages type="image"> <package name="psmisc"/> @@ -111,7 +110,6 @@ <package name="binutils"/> <package name="cpio"/> <package name="cyrus-sasl"/> - <package name="db4"/> <package name="dbus-glib"/> <package name="diffutils"/> <package name="expat"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml new/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml --- old/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -102,7 +102,6 @@ <package name="cpio"/> <package name="cracklib-dicts"/> <package name="cyrus-sasl"/> - <package name="db4"/> <package name="dbus-glib"/> <package name="diffutils"/> <package name="expat"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml --- old/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-06.0/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -67,7 +67,6 @@ <packages type="bootstrap"> <package name="filesystem"/> <package name="basesystem"/> - <package name="yum-priorities"/> </packages> <packages type="image"> <package name="psmisc"/> @@ -104,7 +103,6 @@ <package name="binutils"/> <package name="cpio"/> <package name="cyrus-sasl"/> - <package name="db4"/> <package name="dbus-glib"/> <package name="diffutils"/> <package name="expat"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-repart new/kiwi/system/boot/s390/oemboot/suse-repart --- old/kiwi/system/boot/s390/oemboot/suse-repart 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-repart 2012-04-20 13:43:37.000000000 +0200 @@ -593,6 +593,10 @@ Echo "Recreate VTOC table [ $imageDiskDevice ]" if [ ! -z "$haveLVM" ];then #====================================== + # wait until volume group has settled + #-------------------------------------- + sleep 2 + #====================================== # close open device mappings #-------------------------------------- if [ "$haveLuks" = "yes" ];then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/armv7l/suse-Factory-JeOS/config.xml new/kiwi/template/armv7l/suse-Factory-JeOS/config.xml --- old/kiwi/template/armv7l/suse-Factory-JeOS/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/template/armv7l/suse-Factory-JeOS/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -11,6 +11,7 @@ <profiles> <profile name="pandaFlavour" description="Kernel/Tools setup for panda boards" import="true"/> <profile name="efikaFlavour" description="Kernel/Tools setup for efika boards"/> + <profile name="beagleFlavour" description="Kernel/Tools setup for beagle boards"/> </profiles> <preferences> <type image="tbz" primary="true"/> @@ -24,10 +25,7 @@ <boot-theme>openSUSE</boot-theme> </preferences> <preferences profiles="pandaFlavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-Factory" bootloader="uboot" bootkernel="omap4panda" kernelcmdline="kiwistderr=/dev/ttyO2 console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99 vram=16M"> - <systemdisk/> - </type> - <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory" bootloader="uboot" bootkernel="omap4panda" kernelcmdline="kiwistderr=/dev/ttyO2 console=ttyO2 ethaddr=f2:9e:1a:ca:d9:99 vram=16M"> + <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory" bootloader="uboot" bootkernel="omap4panda" kernelcmdline="console=ttyO2 vram=16M"> <systemdisk/> <oemconfig> <oem-swapsize>500</oem-swapsize> @@ -35,10 +33,15 @@ </type> </preferences> <preferences profiles="efikaFlavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-Factory" bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/ttymxc0 console=ttymxc0,115200 vram=16M"> + <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory" bootloader="uboot" bootkernel="imx51" kernelcmdline="console=ttymxc0,115200 vram=16M"> <systemdisk/> + <oemconfig> + <oem-swapsize>500</oem-swapsize> + </oemconfig> </type> - <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory" bootloader="uboot" bootkernel="imx51" kernelcmdline="kiwistderr=/dev/ttymxc0 console=ttymxc0,115200 vram=16M"> + </preferences> + <preferences profiles="beagleFlavour"> + <type image="oem" filesystem="ext3" boot="oemboot/suse-Factory" bootloader="uboot" bootkernel="omap3beagle" kernelcmdline="console=ttyO2 vram=16M"> <systemdisk/> <oemconfig> <oem-swapsize>500</oem-swapsize> @@ -58,7 +61,20 @@ <packages type="bootstrap" profiles="efikaFlavour"> <package name="kernel-imx51"/> </packages> + <packages type="bootstrap" profiles="beagleFlavour"> + <package name="kernel-omap2plus"/> + <package name="u-boot-omap3beagle"/> + <package name="x-loader-omap3beagle"/> + </packages> + + <strip type="tools"> + <file name="qemu-arm-binfmt"/> + <file name="qemu-arm"/> + </strip> <packages type="bootstrap"> + + <package name="qemu-linux-user-arm" bootinclude="true"/> + <package name="ifplugd"/> <package name="iputils"/> <package name="vim"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml --- old/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/template/ix86/rhel-06.0-JeOS/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -97,6 +97,7 @@ <rhelGroup name="Console internet tools"/> <package name="gfxboot-branding-upstream" bootinclude="true" bootdelete="true"/> <package name="redhat-logos" bootinclude="true" bootdelete="true"/> + <package name="yum-priorities" bootinclude="true"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/config.xml new/kiwi/template/s390/suse-SLE11-JeOS/config.xml --- old/kiwi/template/s390/suse-SLE11-JeOS/config.xml 2012-04-16 10:34:41.000000000 +0200 +++ new/kiwi/template/s390/suse-SLE11-JeOS/config.xml 2012-04-20 13:43:37.000000000 +0200 @@ -16,13 +16,19 @@ <timezone>Europe/Berlin</timezone> <hwclock>utc</hwclock> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" bootloader="zipl" primary="true"/> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" bootloader="zipl"> + <systemdisk/> + <oemconfig> + <oem-swapsize>512</oem-swapsize> + </oemconfig> + </type> <type image="pxe" filesystem="ext3" boot="netboot/suse-SLES11" bootloader="zipl"/> </preferences> <users group="root"> <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> </users> <repository type="yast2"> - <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> + <source path="http://download.suse.de/install/SLP/SLES-11-SP2-GM/%arch/DVD1/"/> </repository> <repository type="yast2"> <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdevelop4-plugins for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kdevelop4-plugins for openSUSE:Factory checked in at 2012-04-23 09:15:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdevelop4-plugins (Old) and /work/SRC/openSUSE:Factory/.kdevelop4-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdevelop4-plugins", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kdevelop4-plugins/kdevelop4-plugins.changes 2012-03-21 09:05:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdevelop4-plugins.new/kdevelop4-plugins.changes 2012-04-23 09:15:03.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 17 06:36:01 UTC 2012 - wstephenson(a)suse.com + +- Update to 1.3.1 + * PHP plugin fixes: + - properly report uses after instanceof operator + - take range into account when looking for redeclarations + - properly check context before accessing it + +------------------------------------------------------------------- Old: ---- kdevelop-php-1.3.0.tar.bz2 kdevelop-php-docs-1.3.0.tar.bz2 New: ---- kdevelop-php-1.3.1.tar.bz2 kdevelop-php-docs-1.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Yuwdv3/_old 2012-04-23 09:15:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Yuwdv3/_new 2012-04-23 09:15:04.000000000 +0200 @@ -15,10 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdevelop4-plugins -Version: 1.3.0 +Version: 1.3.1 Release: 0 -Summary: Additional plugins for Kdevelop4 Integrated Development Environment +Summary: Additional plugins for KDevelop4 Integrated Development Environment License: GPL-2.0+ Group: Development/Tools/IDE Url: http://www.kdevelop.org @@ -34,7 +35,7 @@ %kde4_runtime_requires %description -Additional plugins for Kdevelop4 Integrated Development Environment +Additional plugins for KDevelop4 Integrated Development Environment * PHP Language support, documentation, debugging (xdebug) ++++++ add-php-docs.diff ++++++ --- /var/tmp/diff_new_pack.Yuwdv3/_old 2012-04-23 09:15:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Yuwdv3/_new 2012-04-23 09:15:04.000000000 +0200 @@ -4,7 +4,7 @@ add_subdirectory(parser) add_subdirectory(duchain) add_subdirectory(completion) -+add_subdirectory(kdevelop-php-docs-1.3.0) ++add_subdirectory(kdevelop-php-docs-1.3.1) set(kdevphplanguagesupport_PART_SRCS phplanguagesupport.cpp ++++++ kdevelop-php-1.3.0.tar.bz2 -> kdevelop-php-1.3.1.tar.bz2 ++++++ ++++ 2204 lines of diff (skipped) ++++++ kdevelop-php-docs-1.3.0.tar.bz2 -> kdevelop-php-docs-1.3.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/CHANGELOG.1.3.0 new/kdevelop-php-docs-1.3.1/CHANGELOG.1.3.0 --- old/kdevelop-php-docs-1.3.0/CHANGELOG.1.3.0 2012-03-11 19:11:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/CHANGELOG.1.3.0 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -ChangeLog for php-docs v1.3.0 -============================= - -* Milian Wolff: set version to 1.3.0 and depend on kdevplatform 1.3.0 -* Milian Wolff: add gitignore file -* Milian Wolff: simplify release management, plugin version is now also set from the CMakeLists.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/CHANGELOG.1.3.1 new/kdevelop-php-docs-1.3.1/CHANGELOG.1.3.1 --- old/kdevelop-php-docs-1.3.0/CHANGELOG.1.3.1 1970-01-01 01:00:00.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/CHANGELOG.1.3.1 2012-04-13 22:02:31.000000000 +0200 @@ -0,0 +1,3 @@ +ChangeLog for php-docs v1.3.1 +============================= + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/CMakeLists.txt new/kdevelop-php-docs-1.3.1/CMakeLists.txt --- old/kdevelop-php-docs-1.3.0/CMakeLists.txt 2012-03-11 19:15:27.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/CMakeLists.txt 2012-04-13 22:06:05.000000000 +0200 @@ -2,7 +2,7 @@ set(KDEVPHPDOCS_VERSION_MAJOR 1) set(KDEVPHPDOCS_VERSION_MINOR 3) -set(KDEVPHPDOCS_VERSION_PATCH 0) +set(KDEVPHPDOCS_VERSION_PATCH 1) configure_file( "${phpdocs_SOURCE_DIR}/kdevphpdocsversion.h.cmake" "${phpdocs_BINARY_DIR}/kdevphpdocsversion.h" @ONLY ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/phpdocsplugin.cpp new/kdevelop-php-docs-1.3.1/phpdocsplugin.cpp --- old/kdevelop-php-docs-1.3.0/phpdocsplugin.cpp 2012-03-11 19:11:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/phpdocsplugin.cpp 2012-04-13 22:02:31.000000000 +0200 @@ -207,6 +207,12 @@ ICore::self()->documentationController()->showDocumentation(doc); } +void PhpDocsPlugin::addToHistory(const QUrl& url) +{ + KSharedPtr<IDocumentation> doc = documentationForUrl(url, url.toString()); + emit addHistory(doc); +} + KSharedPtr< IDocumentation > PhpDocsPlugin::documentationForUrl(const KUrl& url, const QString& name, const QByteArray& description) const { return KSharedPtr<IDocumentation>(new PhpDocumentation( url, name, description, const_cast<PhpDocsPlugin*>(this))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/phpdocsplugin.h new/kdevelop-php-docs-1.3.1/phpdocsplugin.h --- old/kdevelop-php-docs-1.3.0/phpdocsplugin.h 2012-03-11 19:11:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/phpdocsplugin.h 2012-04-13 22:02:31.000000000 +0200 @@ -45,6 +45,8 @@ virtual QString name() const; virtual KSharedPtr< KDevelop::IDocumentation > homePage() const; + void addToHistory(const QUrl& url); + signals: void addHistory( const KSharedPtr< KDevelop::IDocumentation >& doc ) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/phpdocumentation.h new/kdevelop-php-docs-1.3.1/phpdocumentation.h --- old/kdevelop-php-docs-1.3.0/phpdocumentation.h 2012-03-11 19:11:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/phpdocumentation.h 2012-04-13 22:02:31.000000000 +0200 @@ -30,7 +30,6 @@ class QWidget; class QStackedWidget; -class KHTMLPart; class PhpDocsPlugin; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/phpdocumentationwidget.cpp new/kdevelop-php-docs-1.3.1/phpdocumentationwidget.cpp --- old/kdevelop-php-docs-1.3.0/phpdocumentationwidget.cpp 2012-03-11 19:11:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/phpdocumentationwidget.cpp 2012-04-13 22:02:31.000000000 +0200 @@ -20,22 +20,25 @@ #include "phpdocumentationwidget.h" -#include <KHTMLPart> #include <QProgressBar> #include <QLabel> #include <QVBoxLayout> #include <QTemporaryFile> +#include <QTextStream> + +#include <KLocalizedString> +#include <KUrl> #include "phpdocsplugin.h" #include <documentation/standarddocumentationview.h> -QSharedPointer<QTemporaryFile> createStyleSheet() +QTemporaryFile* createStyleSheet(QObject* parent) { - QSharedPointer<QTemporaryFile> file(new QTemporaryFile); + QTemporaryFile* file = new QTemporaryFile(parent); bool ret = file->open(); Q_ASSERT(ret); - QTextStream ts(file.data()); + QTextStream ts(file); ts << QString( "#headnav,#headsearch,#footnav,#leftbar{display:none !important;}" "body{font-size:80% !important;}" "option,select{font-size:80% !important;}" @@ -44,12 +47,15 @@ return file; } -static QSharedPointer<QTemporaryFile> phpDocStyleSheet=createStyleSheet(); - -PhpDocumentationWidget::PhpDocumentationWidget(KDevelop::DocumentationFindWidget* find, const KUrl &url, PhpDocsPlugin* provider, QWidget* parent) - : QStackedWidget(parent), m_loading(new QWidget(this)) +PhpDocumentationWidget::PhpDocumentationWidget(KDevelop::DocumentationFindWidget* find, const KUrl &url, + PhpDocsPlugin* provider, QWidget* parent) +: QStackedWidget(parent) +, m_loading(new QWidget(this)) +, m_styleSheet(createStyleSheet(this)) +, m_provider(provider) { - m_part=new KDevelop::StandardDocumentationView(find, this); + m_part = new KDevelop::StandardDocumentationView(find, this); + m_part->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); addWidget(m_part); addWidget(m_loading); @@ -73,15 +79,21 @@ setCurrentWidget(m_loading); - connect(m_part, SIGNAL(linkClicked(QUrl)), provider, SLOT(loadUrl(QUrl))); + connect(m_part, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClicked(QUrl))); connect(m_part, SIGNAL(loadFinished(bool)), this, SLOT(documentLoaded()) ); m_part->load( url ); } +void PhpDocumentationWidget::linkClicked(const QUrl& url) +{ + m_part->load(url); + m_provider->addToHistory(url); +} + void PhpDocumentationWidget::documentLoaded() { - m_part->settings()->setUserStyleSheetUrl(KUrl(phpDocStyleSheet->fileName())); + m_part->settings()->setUserStyleSheetUrl(KUrl(m_styleSheet->fileName())); setCurrentWidget(m_part); removeWidget(m_loading); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/phpdocumentationwidget.h new/kdevelop-php-docs-1.3.1/phpdocumentationwidget.h --- old/kdevelop-php-docs-1.3.0/phpdocumentationwidget.h 2012-03-11 19:11:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/phpdocumentationwidget.h 2012-04-13 22:02:31.000000000 +0200 @@ -23,7 +23,9 @@ #include <QtGui/QStackedWidget> -#include <KUrl> +class QTemporaryFile; +class KUrl; +class QUrl; namespace KDevelop { class StandardDocumentationView; @@ -37,15 +39,19 @@ Q_OBJECT public: - explicit PhpDocumentationWidget(KDevelop::DocumentationFindWidget* find, const KUrl &url, PhpDocsPlugin* provider, QWidget* parent = 0); + explicit PhpDocumentationWidget(KDevelop::DocumentationFindWidget* find, const KUrl &url, + PhpDocsPlugin* provider, QWidget* parent = 0); private slots: /// used to inject some custom CSS to alter the remote php.net site void documentLoaded(); + void linkClicked(const QUrl& url); private: KDevelop::StandardDocumentationView* m_part; QWidget* m_loading; + QTemporaryFile* m_styleSheet; + PhpDocsPlugin* m_provider; }; #endif // PHPDOCUMENTATIONWIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/CMakeLists.txt new/kdevelop-php-docs-1.3.1/po/CMakeLists.txt --- old/kdevelop-php-docs-1.3.0/po/CMakeLists.txt 2012-03-11 19:15:27.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/CMakeLists.txt 2012-04-13 22:06:05.000000000 +0200 @@ -5,26 +5,26 @@ if (NOT GETTEXT_MSGFMT_EXECUTABLE) MESSAGE(FATAL_ERROR "Please install msgmerge binary") endif (NOT GETTEXT_MSGFMT_EXECUTABLE) -add_subdirectory(da) -add_subdirectory(pt) -add_subdirectory(nb) add_subdirectory(nds) -add_subdirectory(en_GB) add_subdirectory(zh_CN) -add_subdirectory(de) -add_subdirectory(ca) -add_subdirectory(ru) +add_subdirectory(pl) add_subdirectory(pt_BR) -add_subdirectory(it) -add_subdirectory(sk) -add_subdirectory(ca@valencia) -add_subdirectory(et) add_subdirectory(nl) add_subdirectory(es) -add_subdirectory(fr) -add_subdirectory(fi) -add_subdirectory(sv) -add_subdirectory(uk) -add_subdirectory(pl) +add_subdirectory(pt) +add_subdirectory(sk) add_subdirectory(zh_TW) +add_subdirectory(et) +add_subdirectory(it) add_subdirectory(gl) +add_subdirectory(ru) +add_subdirectory(ca) +add_subdirectory(sv) +add_subdirectory(de) +add_subdirectory(uk) +add_subdirectory(fr) +add_subdirectory(nb) +add_subdirectory(ca@valencia) +add_subdirectory(da) +add_subdirectory(fi) +add_subdirectory(en_GB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/ca/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/ca/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/ca/kdevphpdocs.po 2012-03-11 19:11:51.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/ca/kdevphpdocs.po 2012-04-13 22:02:57.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-02-25 22:49+0100\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" @@ -24,10 +24,6 @@ msgid "<lost declaration>" msgstr "<declaració perduda>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...s'està carregant la documentació..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -44,10 +40,14 @@ msgid "Maintainer" msgstr "Mantenidor" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentació PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...s'està carregant la documentació..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/ca(a)valencia/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/ca(a)valencia/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/ca(a)valencia/kdevphpdocs.po 2012-03-11 19:11:53.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/ca(a)valencia/kdevphpdocs.po 2012-04-13 22:02:59.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-02-25 22:49+0100\n" "Last-Translator: Josep Ma. Ferrer <txemaq(a)gmail.com>\n" "Language-Team: Catalan <kde-i18n-ca(a)kde.org>\n" @@ -24,10 +24,6 @@ msgid "<lost declaration>" msgstr "<declaració perduda>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...s'està carregant la documentació..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -44,10 +40,14 @@ msgid "Maintainer" msgstr "Mantenidor" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentació PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...s'està carregant la documentació..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/da/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/da/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/da/kdevphpdocs.po 2012-03-11 19:12:05.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/da/kdevphpdocs.po 2012-04-13 22:03:10.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-01-02 12:49+0100\n" "Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n" "Language-Team: Danish <dansk(a)dansk-gruppen.dk>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<tabt erklæring>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...indlæser dokumentation..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Vedligeholder" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-dokumentation" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...indlæser dokumentation..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/de/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/de/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/de/kdevphpdocs.po 2012-03-11 19:12:07.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/de/kdevphpdocs.po 2012-04-13 22:03:12.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-02-08 22:04+0100\n" "Last-Translator: Frederik Schwarzer <schwarzer(a)kde.org>\n" "Language-Team: German <kde-i18n-de(a)kde.org>\n" @@ -20,10 +20,6 @@ msgid "<lost declaration>" msgstr "<verlorene Deklaration>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "... Dokumentation wird geladen ..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -40,10 +36,14 @@ msgid "Maintainer" msgstr "Betreuer" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-Dokumentation" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "... Dokumentation wird geladen ..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/en_GB/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/en_GB/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/en_GB/kdevphpdocs.po 2012-03-11 19:12:12.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/en_GB/kdevphpdocs.po 2012-04-13 22:03:16.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-09-19 13:01+0100\n" "Last-Translator: Andrew Coles <andrew_coles(a)yahoo.co.uk>\n" "Language-Team: British English <kde-i18n-doc(a)kde.org>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<lost declaration>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...loading documentation..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "Maintainer" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP Documentation" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...loading documentation..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/es/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/es/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/es/kdevphpdocs.po 2012-03-11 19:12:17.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/es/kdevphpdocs.po 2012-04-13 22:03:20.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-11-25 18:59+0100\n" "Last-Translator: Eloy Cuadra <ecuadra(a)eloihr.net>\n" "Language-Team: Spanish <kde-l10n-es(a)kde.org>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<declaración perdida>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "cargando documentación..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "Encargado" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentación PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "cargando documentación..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/et/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/et/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/et/kdevphpdocs.po 2012-03-11 19:12:19.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/et/kdevphpdocs.po 2012-04-13 22:03:22.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-09-28 01:15+0300\n" "Last-Translator: Marek Laane <bald(a)smail.ee>\n" "Language-Team: Estonian <kde-et(a)linux.ee>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<kadunud deklaratsioon>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "... dokumentatsiooni laadimine..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "Hooldaja" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP dokumentatsioon" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "... dokumentatsiooni laadimine..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/fi/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/fi/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/fi/kdevphpdocs.po 2012-03-11 19:12:26.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/fi/kdevphpdocs.po 2012-04-13 22:03:29.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-11-12 20:25+0200\n" "Last-Translator: Lasse Liehu <lasse.liehu(a)gmail.com>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<esittely hukassa>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...ladataan dokumentaatiota..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "Ylläpitäjä" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-dokumentaatio" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...ladataan dokumentaatiota..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/fr/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/fr/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/fr/kdevphpdocs.po 2012-03-11 19:12:29.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/fr/kdevphpdocs.po 2012-04-13 22:03:31.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-09-20 18:37+0200\n" "Last-Translator: Joëlle Cornavin <jcornavin(a)laposte.net>\n" "Language-Team: French <>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<déclaration perdue>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...chargement de la documentation..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Mainteneur" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentation de PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...chargement de la documentation..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/gl/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/gl/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/gl/kdevphpdocs.po 2012-03-11 19:12:36.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/gl/kdevphpdocs.po 2012-04-13 22:03:37.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2012-02-16 00:26+0100\n" "Last-Translator: Xosé <xosecalvo(a)gmail.com>\n" "Language-Team: Galician <kde-i18n-doc(a)kde.org>\n" @@ -25,10 +25,6 @@ msgid "<lost declaration>" msgstr "<declaración perdida>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...estase a cargar a documentación..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -45,10 +41,14 @@ msgid "Maintainer" msgstr "Mantenedor" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentación de PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...estase a cargar a documentación..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/it/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/it/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/it/kdevphpdocs.po 2012-03-11 19:13:06.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/it/kdevphpdocs.po 2012-04-13 22:04:04.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-10-02 20:11+0200\n" "Last-Translator: Simone Solinas <ksolsim(a)gmail.com>\n" "Language-Team: Italian <kde-i18n-it(a)kde.org>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<lost declaration>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...caricamento documentazione..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "Responsabile" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentazione PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...caricamento documentazione..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/nb/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/nb/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/nb/kdevphpdocs.po 2012-03-11 19:13:45.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/nb/kdevphpdocs.po 2012-04-13 22:04:39.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-01-10 17:22+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-01-09 22:25+0100\n" "Last-Translator: Bjørn Steensrud <bjornst(a)skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb(a)lister.ping.uio.no>\n" @@ -23,30 +23,30 @@ msgid "<lost declaration>" msgstr "<mistet deklarasjon>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "… laster dokumentasjon …" - -#: phpdocsplugin.cpp:54 +#: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" -#: phpdocsplugin.cpp:55 +#: phpdocsplugin.cpp:56 msgid "Check PHP.net documentation" msgstr "Sjekk PHP.net-dokumentasjon" -#: phpdocsplugin.cpp:56 +#: phpdocsplugin.cpp:57 msgid "Milian Wolff" msgstr "Milian Wolff" -#: phpdocsplugin.cpp:57 +#: phpdocsplugin.cpp:58 msgid "Maintainer" msgstr "Vedlikeholder" -#: phpdocsplugin.cpp:222 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-dokumentasjon" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "… laster dokumentasjon …" + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/nds/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/nds/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/nds/kdevphpdocs.po 2012-03-11 19:13:48.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/nds/kdevphpdocs.po 2012-04-13 22:04:42.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-10-07 08:39+0200\n" "Last-Translator: Manfred Wiese <m.j.wiese(a)web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds(a)kde.org>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<wegkamen Deklaratschoon>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "... Dokmentatschoon warrt laadt..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Pleger" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-Dokmentatschoon" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "... Dokmentatschoon warrt laadt..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/nl/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/nl/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/nl/kdevphpdocs.po 2012-03-11 19:13:52.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/nl/kdevphpdocs.po 2012-04-13 22:04:46.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-11-26 10:37+0100\n" "Last-Translator: Freek de Kruijf <freekdekruijf(a)kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl(a)kde.org>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<verloren declaratie>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...laden van documentatie..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Onderhouder" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-documentatie" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...laden van documentatie..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/pl/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/pl/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/pl/kdevphpdocs.po 2012-03-11 19:14:06.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/pl/kdevphpdocs.po 2012-04-13 22:04:58.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-07-28 12:36+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<zagubiona deklaracja>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...wczytywanie dokumentacji..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Opiekun" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Dokumentacja PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...wczytywanie dokumentacji..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/pt/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/pt/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/pt/kdevphpdocs.po 2012-03-11 19:14:11.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/pt/kdevphpdocs.po 2012-04-13 22:05:02.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-09-18 11:01+0000\n" "Last-Translator: José Nuno Coelho Pires <zepires(a)gmail.com>\n" "Language-Team: Portuguese <kde-i18n-pt(a)kde.org>\n" @@ -18,10 +18,6 @@ msgid "<lost declaration>" msgstr "<declaração perdida>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...a carregar a documentação..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -38,10 +34,14 @@ msgid "Maintainer" msgstr "Manutenção" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentação de PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...a carregar a documentação..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/pt_BR/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/pt_BR/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/pt_BR/kdevphpdocs.po 2012-03-11 19:14:13.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/pt_BR/kdevphpdocs.po 2012-04-13 22:05:04.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-11-27 10:00-0300\n" "Last-Translator: Marcus Vinícius de Andrade Gama <marcus.gama(a)gmail.com>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br(a)kde.org>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<declaração perdida>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...carregando documentação..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Mantenedor" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Documentação de PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...carregando documentação..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/ru/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/ru/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/ru/kdevphpdocs.po 2012-03-11 19:14:18.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/ru/kdevphpdocs.po 2012-04-13 22:05:09.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-01-22 09:59+0300\n" "Last-Translator: Alexander Potashev <aspotashev(a)gmail.com>\n" "Language-Team: Russian <kde-russian(a)lists.kde.ru>\n" @@ -26,10 +26,6 @@ msgid "<lost declaration>" msgstr "" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "Загрузка документации..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -46,10 +42,14 @@ msgid "Maintainer" msgstr "Сопровождающий" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Документация PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "Загрузка документации..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/sk/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/sk/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/sk/kdevphpdocs.po 2012-03-11 19:14:27.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/sk/kdevphpdocs.po 2012-04-13 22:05:17.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kdevphpdocs\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2012-02-12 19:19+0100\n" "Last-Translator: Roman Paholík <wizzardsk(a)gmail.com>\n" "Language-Team: Slovak <kde-sk(a)linux.sk>\n" @@ -19,10 +19,6 @@ msgid "<lost declaration>" msgstr "<stratená deklarácia>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...načítavanie dokumentácie..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -39,10 +35,14 @@ msgid "Maintainer" msgstr "Správca" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Dokumentácia PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...načítavanie dokumentácie..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/sv/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/sv/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/sv/kdevphpdocs.po 2012-03-11 19:14:49.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/sv/kdevphpdocs.po 2012-04-13 22:05:32.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-09-18 21:20+0200\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall(a)comhem.se>\n" "Language-Team: Swedish <kde-i18n-doc(a)kde.org>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<förlorad deklaration>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "... läser in dokumentation ..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PHP-dokumentation" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "Underhåll" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP-dokumentation" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "... läser in dokumentation ..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/uk/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/uk/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/uk/kdevphpdocs.po 2012-03-11 19:15:08.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/uk/kdevphpdocs.po 2012-04-13 22:05:48.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2011-07-20 19:51+0300\n" "Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n" "Language-Team: Ukrainian <translation(a)linux.org.ua>\n" @@ -22,10 +22,6 @@ msgid "<lost declaration>" msgstr "<пропущене оголошення>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...завантаження документації..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "Документація з PHP" @@ -42,10 +38,14 @@ msgid "Maintainer" msgstr "Супровідник" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "Документація з PHP" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...завантаження документації..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/zh_CN/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/zh_CN/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/zh_CN/kdevphpdocs.po 2012-03-11 19:15:22.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/zh_CN/kdevphpdocs.po 2012-04-13 22:06:01.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-11-16 14:21+0800\n" "Last-Translator: Ni Hui <shuizhuyuanluo(a)126.com>\n" "Language-Team: Chinese Simplified <kde-china(a)kde.org>\n" @@ -21,10 +21,6 @@ msgid "<lost declaration>" msgstr "<缺少声明>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "...正在装入文档..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "PhpDocs" @@ -41,10 +37,14 @@ msgid "Maintainer" msgstr "维护者" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP 文档" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "...正在装入文档..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdevelop-php-docs-1.3.0/po/zh_TW/kdevphpdocs.po new/kdevelop-php-docs-1.3.1/po/zh_TW/kdevphpdocs.po --- old/kdevelop-php-docs-1.3.0/po/zh_TW/kdevphpdocs.po 2012-03-11 19:15:26.000000000 +0100 +++ new/kdevelop-php-docs-1.3.1/po/zh_TW/kdevphpdocs.po 2012-04-13 22:06:05.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-02-25 12:27+0100\n" +"POT-Creation-Date: 2012-03-31 14:05+0200\n" "PO-Revision-Date: 2010-10-29 09:05+0800\n" "Last-Translator: Franklin Weng <franklin(a)mail.everfocus.com.tw>\n" "Language-Team: Chinese Traditional <zh-l10n(a)linux.org.tw>\n" @@ -23,10 +23,6 @@ msgid "<lost declaration>" msgstr "<遺失的宣告>" -#: phpdocumentationwidget.cpp:67 -msgid "...loading documentation..." -msgstr "... 載入文件中 ..." - #: phpdocsplugin.cpp:55 msgid "PhpDocs" msgstr "Php 文件" @@ -43,10 +39,14 @@ msgid "Maintainer" msgstr "維護者" -#: phpdocsplugin.cpp:223 +#: phpdocsplugin.cpp:229 msgid "PHP Documentation" msgstr "PHP 文件" +#: phpdocumentationwidget.cpp:73 +msgid "...loading documentation..." +msgstr "... 載入文件中 ..." + #: rc.cpp:1 msgctxt "NAME OF TRANSLATORS" msgid "Your names" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2012-04-23 09:14:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2012-04-12 09:32:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2012-04-23 09:15:00.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 18 14:39:59 UTC 2012 - cornelis(a)solcon.nl + +- Add patch to increase fontsize in the detailsview of kaddressbook (kde#221963) + +------------------------------------------------------------------- New: ---- fix_fontsize_contactview.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.dyoyHh/_old 2012-04-23 09:15:03.000000000 +0200 +++ /var/tmp/diff_new_pack.dyoyHh/_new 2012-04-23 09:15:03.000000000 +0200 @@ -26,6 +26,8 @@ Source0: kdepimlibs-%{version}.tar.xz Patch0: 4_7_BRANCH.diff Patch1: disable-pth-build.diff +# fix for kde#221963 +Patch2: fix_fontsize_contactview.diff BuildRequires: boost-devel BuildRequires: cyrus-sasl-devel BuildRequires: fdupes @@ -54,6 +56,7 @@ %setup -q -n kdepimlibs-%{version} %patch0 -p1 %patch1 +%patch2 -p1 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1 ++++++ fix_fontsize_contactview.diff ++++++ --- kdepimlibs-4.8.2.orig/akonadi/contact/standardcontactformatter.cpp 2011-10-20 22:52:20.000000000 +0200 +++ kdepimlibs-4.8.2/akonadi/contact/standardcontactformatter.cpp 2012-04-18 15:53:55.991159065 +0200 @@ -59,8 +59,8 @@ QString rowFmtStr = QString::fromLatin1( "<tr>" - "<td align=\"right\" valign=\"top\" width=\"30%\">%1</td>\n" - "<td align=\"left\" valign=\"top\" width=\"70%\">%2</td>\n" + "<td align=\"right\" valign=\"top\" width=\"30%\">%1</td>\n" + "<td align=\"left\" valign=\"top\" width=\"70%\">%2</td>\n" "</tr>\n" ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs3 for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kdelibs3 for openSUSE:Factory checked in at 2012-04-23 09:14:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs3 (Old) and /work/SRC/openSUSE:Factory/.kdelibs3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs3/kdelibs3.changes 2012-04-12 09:31:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs3.new/kdelibs3.changes 2012-04-23 09:14:51.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 19 03:34:05 UTC 2012 - anixx(a)opensuse.org + +- revert the konq patch because it slows the operation down +- make tray icons standard 16px + +------------------------------------------------------------------- Old: ---- kdelibs-konq-changes-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.YeT5td/_old 2012-04-23 09:14:55.000000000 +0200 +++ /var/tmp/diff_new_pack.YeT5td/_new 2012-04-23 09:14:55.000000000 +0200 @@ -189,7 +189,6 @@ Patch220: kdelibs-fedora-3.5.x-CVE-2011-3365.patch Patch221: kdelibs-tarent-fix-webdav-utf8.diff Patch222: scalable-tray-icons.patch -Patch223: kdelibs-konq-changes-update.patch %description This package contains kdelibs, one of the basic packages of the K @@ -386,7 +385,6 @@ %patch220 -p1 %patch221 -p1 %patch222 -p1 -%patch223 -p1 tar xfvj %SOURCE12 # ++++++ scalable-tray-icons.patch ++++++ --- /var/tmp/diff_new_pack.YeT5td/_old 2012-04-23 09:14:55.000000000 +0200 +++ /var/tmp/diff_new_pack.YeT5td/_new 2012-04-23 09:14:55.000000000 +0200 @@ -1,13 +1,12 @@ diff -wruN kdelibs-3.5.10.orig/kdeui/ksystemtray.cpp kdelibs-3.5.10/kdeui/ksystemtray.cpp --- kdelibs-3.5.10.orig/kdeui/ksystemtray.cpp 2007-05-14 11:52:25.000000000 +0400 -+++ kdelibs-3.5.10/kdeui/ksystemtray.cpp 2012-02-26 21:38:08.846734704 +0400 -@@ -95,6 +95,7 @@ - } - setCaption( KGlobal::instance()->aboutData()->programName()); - setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); -+ setScaledContents(true); ++++ kdelibs-3.5.10/kdeui/ksystemtray.cpp 2012-04-14 10:00:21.934064954 +0400 +@@ -311,7 +311,7 @@ + { + KConfig *appCfg = kapp->config(); + KConfigGroupSaver configSaver(appCfg, "System Tray"); +- int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); ++ int iconWidth = appCfg->readNumEntry("systrayIconWidth", 16); + return instance->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); } - KSystemTray::~KSystemTray() - - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2012-04-23 09:14:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-openSUSE", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2012-02-17 12:00:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2012-04-23 09:14:49.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 17 17:43:22 UTC 2012 - ctrippe(a)opensuse.org + +- Install battery.png for sysinfo (bnc#683738) + +------------------------------------------------------------------- New: ---- install_battery_png.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.3sGlyy/_old 2012-04-23 09:14:51.000000000 +0200 +++ /var/tmp/diff_new_pack.3sGlyy/_new 2012-04-23 09:14:51.000000000 +0200 @@ -34,6 +34,7 @@ Patch2: noproxy.diff Patch3: kdebase4-openSUSE-bnc721114.patch Patch4: sysinfo-fixed-opengl-detecting.patch +Patch5: install_battery_png.diff BuildRequires: fdupes BuildRequires: hwinfo-devel BuildRequires: kdebase4-workspace-branding-upstream @@ -75,8 +76,8 @@ PreReq: %fillup_prereq Requires: kdebase4-workspace Requires: ksplashx-branding-openSUSE = %{version} -Requires: wallpaper-branding-openSUSE = %{version} Requires: susegreeter-branding-openSUSE = %{version} +Requires: wallpaper-branding-openSUSE = %{version} Supplements: packageand(kdebase4-workspace:branding-openSUSE) Provides: kdebase4-workspace-branding = %( echo `rpm -q --provides kdebase4-workspace-branding-upstream | grep 'kdebase4-workspace-branding =' | cut -d= -f2` ) Conflicts: otherproviders(kdebase4-workspace-branding) @@ -102,8 +103,8 @@ Group: System/GUI/KDE Requires: kio_sysinfo Supplements: packageand(kio_sysinfo:branding-openSUSE) -Provides: kio_sysinfo-branding = %{version} Provides: kde4-kio_sysinfo-branding-openSUSE = %{version} +Provides: kio_sysinfo-branding = %{version} Obsoletes: kde4-kio_sysinfo-branding-openSUSE < %{version} Conflicts: otherproviders(kio_sysinfo-branding) @@ -120,6 +121,7 @@ cd sysinfo tar xvf %{SOURCE3} %patch4 -p1 +%patch5 %build %cmake_kde4 -d build -- -DSYSINFO_DISTRO:STRING=SUSE ++++++ install_battery_png.diff ++++++ Index: kio_sysinfo/src/about/suse/CMakeLists.txt =================================================================== --- kio_sysinfo/src/about/suse/CMakeLists.txt (Revision 1287773) +++ kio_sysinfo/src/about/suse/CMakeLists.txt (Arbeitskopie) @@ -1,5 +1,6 @@ install( FILES images/background.png + images/battery.png images/dirs.png images/hdd.png images/inner-bcg.png -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kadu for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package kadu for openSUSE:Factory checked in at 2012-04-23 09:14:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kadu (Old) and /work/SRC/openSUSE:Factory/.kadu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kadu", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kadu/kadu.changes 2012-02-14 19:01:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kadu.new/kadu.changes 2012-04-23 09:14:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 18 13:46:43 UTC 2012 - fisiu(a)opensuse.org + +- Upstream update to 0.11.2, bugfix only. + +------------------------------------------------------------------- Old: ---- kadu-0.11.0.tar.bz2 New: ---- kadu-0.11.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kadu.spec ++++++ --- /var/tmp/diff_new_pack.pUCdcY/_old 2012-04-23 09:14:47.000000000 +0200 +++ /var/tmp/diff_new_pack.pUCdcY/_new 2012-04-23 09:14:47.000000000 +0200 @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define real %{name}-0.11.0 + +%define real %{name}-0.11.2 %define build_penguins 0 Name: kadu -Version: 0.11.0 +Version: 0.11.2 Release: 0 # Choosing GPL-3.0+ because of presence and usage of numerous GPL-3.0 files Summary: Gadu-Gadu and Jabber/XMPP protocol Instant Messenger @@ -70,7 +71,7 @@ BuildRequires: pkgconfig(sndfile) # runtime requires Requires: libgadu3 >= 1.11.0 -# sql_history needs qt4-sqlite to operate +# sql_history plugin needs qt4-sqlite to operate Requires: libqt4-sql-sqlite BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kadu-0.11.0.tar.bz2 -> kadu-0.11.2.tar.bz2 ++++++ ++++ 1724 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0