January 2007 - openSUSE Commits - openSUSE Mailing Lists

commit prelink
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package prelink checked in at Mon Jan 29 19:00:35 CET 2007. -------- --- prelink/prelink.changes 2007-01-18 13:47:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/prelink/prelink.changes 2007-01-29 18:29:50.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 29 18:13:33 CET 2007 - sbrabec(a)suse.cz + +- Changed references to /opt/gnome. +- Removed references to /opt/gnome2. +- Removed reference to not existing gnome-database-components. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prelink.spec ++++++ --- /var/tmp/diff_new_pack.j28208/_old 2007-01-29 19:00:29.000000000 +0100 +++ /var/tmp/diff_new_pack.j28208/_new 2007-01-29 19:00:29.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: gcc-c++ libelf Summary: An ELF Prelinking Utility Version: 0.3.10 -Release: 1 +Release: 2 Group: System/Base License: GNU General Public License (GPL) URL: ftp://people.redhat.com/jakub/prelink @@ -100,6 +100,10 @@ /var/adm/fillup-templates/sysconfig.%name %changelog -n prelink +* Mon Jan 29 2007 - sbrabec(a)suse.cz +- Changed references to /opt/gnome. +- Removed references to /opt/gnome2. +- Removed reference to not existing gnome-database-components. * Thu Jan 18 2007 - meissner(a)suse.de - upgraded to 0.3.10. - mostly MIPS stuff ++++++ prelink.conf ++++++ --- prelink/prelink.conf 2006-03-12 15:06:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/prelink/prelink.conf 2007-01-29 18:13:29.000000000 +0100 @@ -56,14 +56,13 @@ -b /usr/lib/locale # misc --b /opt/gnome/bin/epiphany-bin --b /opt/gnome/bin/galeon-bin +-b /usr/bin/epiphany-bin +-b /usr/bin/galeon-bin -b /usr/LIBDIR/gettext/gnu.gettext.DumpResource -b /usr/LIBDIR/gettext/gnu.gettext.GetURL --b /opt/gnome/bin/glade-2 --b /opt/gnome/LIBDIR/libgnomedb/gnome-database-components --b /opt/gnome/bin/gnome-database-properties --b /opt/gnome/bin/mergeant +-b /usr/bin/glade-2 +-b /usr/bin/gnome-database-properties +-b /usr/bin/mergeant -b /opt/mozilla/lib/mozilla-xremote-client -b /opt/mozilla/lib/mozilla-bin -b /opt/mozilla/lib/regchrome @@ -87,10 +86,6 @@ -l /opt/kde2/lib64 -l /opt/kde3/lib -l /opt/kde3/lib64 --l /opt/gnome/lib --l /opt/gnome/lib64 --l /opt/gnome2/lib --l /opt/gnome2/lib64 -l /bin -l /usr/bin -l /sbin @@ -101,10 +96,6 @@ -l /var/ftp/bin -l /opt/kde2/bin -l /opt/kde3/bin --l /opt/gnome/bin --l /opt/gnome2/bin --l /opt/gnome/sbin --l /opt/gnome2/sbin -l /opt/mozilla -l /opt/MozillaFirefox -l /opt/OpenOffice.org/program ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit man
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package man checked in at Mon Jan 29 19:00:23 CET 2007. -------- --- man/man.changes 2006-09-04 15:48:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/man/man.changes 2007-01-29 16:10:05.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 16:10:01 CET 2007 - sbrabec(a)suse.cz + +- Removed references to /opt/gnome. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man.spec ++++++ --- /var/tmp/diff_new_pack.A27159/_old 2007-01-29 19:00:17.000000000 +0100 +++ /var/tmp/diff_new_pack.A27159/_new 2007-01-29 19:00:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package man (Version 2.4.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,9 +12,9 @@ Name: man BuildRequires: flex groff libzio util-linux Version: 2.4.3 -Release: 7 +Release: 33 Summary: A Program for Displaying man Pages -License: GPL +License: GNU General Public License (GPL) Group: System/Base PreReq: fileutils fillup Provides: man_db @@ -145,6 +145,8 @@ /var/adm/fillup-templates/sysconfig.cron-man %changelog -n man +* Mon Jan 29 2007 - sbrabec(a)suse.cz +- Removed references to /opt/gnome. * Mon Sep 04 2006 - rguenther(a)suse.de - Remove unused sharutils dependency. * Mon Sep 04 2006 - rguenther(a)suse.de ++++++ man-db-2.4.3.dif ++++++ --- /var/tmp/diff_new_pack.A27159/_old 2007-01-29 19:00:17.000000000 +0100 +++ /var/tmp/diff_new_pack.A27159/_new 2007-01-29 19:00:17.000000000 +0100 @@ -1719,7 +1719,7 @@ =================================================================== --- src/man_db.conf.in.orig +++ src/man_db.conf.in -@@ -17,10 +17,17 @@ +@@ -17,10 +17,15 @@ # #MANDATORY_MANPATH /usr/src/pvm3/man # @@ -1731,14 +1731,12 @@ MANDATORY_MANPATH /usr/local/man +MANDATORY_MANPATH /usr/local/share/man +MANDATORY_MANPATH /opt/man -+MANDATORY_MANPATH /opt/gnome/man -+MANDATORY_MANPATH /opt/gnome/share/man +MANDATORY_MANPATH /opt/sniff/man +MANDATORY_MANPATH /opt/sniff/share/man #--------------------------------------------------------- # set up PATH to MANPATH mapping # ie. what man tree holds man pages for what binary directory. -@@ -37,9 +44,15 @@ MANPATH_MAP /usr/local/sbin /usr/local/ +@@ -37,9 +44,13 @@ MANPATH_MAP /usr/local/sbin /usr/local/ MANPATH_MAP /usr/local/sbin /usr/local/share/man MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man MANPATH_MAP /usr/bin/X11 /usr/X11R6/man @@ -1747,14 +1745,12 @@ +MANPATH_MAP /usr/openwin/bin /usr/openwin/man MANPATH_MAP /opt/bin /opt/man MANPATH_MAP /opt/sbin /opt/man -+## MANPATH_MAP /opt/gnome/bin /opt/gnome/man +MANPATH_MAP /opt/sniff/bin /opt/sniff/man -+MANPATH_MAP /opt/gnome/bin /opt/gnome/share/man +## MANPATH_MAP /opt/sniff/bin /opt/sniff/share/man #--------------------------------------------------------- # For a manpath element to be treated as a system manpath (as most of those # above should normally be), it must be mentioned below. Each line may have -@@ -64,12 +77,221 @@ MANPATH_MAP /opt/sbin /opt/man +@@ -64,12 +77,194 @@ MANPATH_MAP /opt/sbin /opt/man # # *MANPATH* -> *CATPATH* # @@ -1950,33 +1946,6 @@ +MANDB_MAP /opt/share/man/sr /var/cache/man/opt/sr +MANDB_MAP /opt/share/man/sv /var/cache/man/opt/sv +MANDB_MAP /opt/share/man /var/cache/man/opt -+# -+MANDB_MAP /opt/gnome/share/man/cs /var/cache/man/opt/cs -+MANDB_MAP /opt/gnome/share/man/cs_CZ /var/cache/man/opt/cs -+MANDB_MAP /opt/gnome/share/man/da /var/cache/man/opt/da -+MANDB_MAP /opt/gnome/share/man/de /var/cache/man/opt/de -+MANDB_MAP /opt/gnome/share/man/de_AT /var/cache/man/opt/de -+MANDB_MAP /opt/gnome/share/man/de_DE /var/cache/man/opt/de -+MANDB_MAP /opt/gnome/share/man/es /var/cache/man/opt/es -+MANDB_MAP /opt/gnome/share/man/es_ES /var/cache/man/opt/es -+MANDB_MAP /opt/gnome/share/man/fi /var/cache/man/opt/fi -+MANDB_MAP /opt/gnome/share/man/fr_FR /var/cache/man/opt/fr -+MANDB_MAP /opt/gnome/share/man/ga /var/cache/man/opt/ga -+MANDB_MAP /opt/gnome/share/man/is /var/cache/man/opt/is -+MANDB_MAP /opt/gnome/share/man/it /var/cache/man/opt/it -+MANDB_MAP /opt/gnome/share/man/ja /var/cache/man/opt/ja -+MANDB_MAP /opt/gnome/share/man/a_JP /var/cache/man/opt/ja -+MANDB_MAP /opt/gnome/share/man/ja_JP.eucJP /var/cache/man/opt/ja -+MANDB_MAP /opt/gnome/share/man/ko /var/cache/man/opt/ko -+MANDB_MAP /opt/gnome/share/man/nl /var/cache/man/opt/nl -+MANDB_MAP /opt/gnome/share/man/no /var/cache/man/opt/no -+MANDB_MAP /opt/gnome/share/man/pl /var/cache/man/opt/pl -+MANDB_MAP /opt/gnome/share/man/pt /var/cache/man/opt/pt -+MANDB_MAP /opt/gnome/share/man/pt_BR /var/cache/man/opt/pt -+MANDB_MAP /opt/gnome/share/man/ru /var/cache/man/opt/ru -+MANDB_MAP /opt/gnome/share/man/sr /var/cache/man/opt/sr -+MANDB_MAP /opt/gnome/share/man/sv /var/cache/man/opt/sv -+MANDB_MAP /opt/gnome/share/man /var/cache/man/opt # #--------------------------------------------------------- # Program definitions. These are commented out by default as the value ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings3
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package kdebindings3 checked in at Mon Jan 29 18:59:10 CET 2007. -------- --- KDE/kdebindings3/kdebindings3.changes 2007-01-25 13:56:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebindings3/kdebindings3.changes 2007-01-29 18:07:43.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 18:07:28 CET 2007 - dmueller(a)suse.de + +- remove hpi check for ppc (#223658) + +------------------------------------------------------------------- kdebindings3-java.changes: same change kdebindings3-javascript.changes: same change kdebindings3-python.changes: same change New: ---- admin-no-hpi.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings3-javascript.spec ++++++ --- /var/tmp/diff_new_pack.f21562/_old 2007-01-29 18:57:59.000000000 +0100 +++ /var/tmp/diff_new_pack.f21562/_new 2007-01-29 18:57:59.000000000 +0100 @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: JavaScript Bindings and Interpreter for KDE Version: 3.5.6 -Release: 2 +Release: 3 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +38,7 @@ Patch7: split-files.diff Patch8: kdebindings3-java.diff Patch9: kdebindings-3.5.1_ruby_non_site_dir.patch +Patch10: admin-no-hpi.diff %description Required libraries to write applications in Java for Qt and KDE. @@ -125,6 +126,8 @@ %endif . /etc/opt/kde3/common_options update_admin --no-unsermake +%patch10 +make -f admin/Makefile.common cvs %build . /etc/opt/kde3/common_options @@ -273,6 +276,8 @@ %endif %changelog -n kdebindings3-javascript +* Mon Jan 29 2007 - dmueller(a)suse.de +- remove hpi check for ppc (#223658) * Thu Jan 25 2007 - stbinner(a)suse.de - add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros * Tue Jan 16 2007 - stbinner(a)suse.de ++++++ kdebindings3-java.spec ++++++ --- /var/tmp/diff_new_pack.f21562/_old 2007-01-29 18:57:59.000000000 +0100 +++ /var/tmp/diff_new_pack.f21562/_new 2007-01-29 18:57:59.000000000 +0100 @@ -23,7 +23,7 @@ Group: Development/Libraries/Java Summary: Java Bindings for KDE Version: 3.5.6 -Release: 2 +Release: 3 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +38,7 @@ Patch7: split-files.diff Patch8: kdebindings3-java.diff Patch9: kdebindings-3.5.1_ruby_non_site_dir.patch +Patch10: admin-no-hpi.diff %description Needed libraries to write applications in Java for Qt and KDE. @@ -118,6 +119,8 @@ %endif . /etc/opt/kde3/common_options update_admin --no-unsermake +%patch10 +make -f admin/Makefile.common cvs %build . /etc/opt/kde3/common_options @@ -266,6 +269,8 @@ %endif %changelog -n kdebindings3-java +* Mon Jan 29 2007 - dmueller(a)suse.de +- remove hpi check for ppc (#223658) * Thu Jan 25 2007 - stbinner(a)suse.de - add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros * Tue Jan 16 2007 - stbinner(a)suse.de ++++++ kdebindings3-python.spec ++++++ --- /var/tmp/diff_new_pack.f21562/_old 2007-01-29 18:57:59.000000000 +0100 +++ /var/tmp/diff_new_pack.f21562/_new 2007-01-29 18:57:59.000000000 +0100 @@ -23,7 +23,7 @@ Group: Development/Libraries/Python Summary: Python Bindings for KDE Version: 3.5.6 -Release: 2 +Release: 3 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) python-qt = %{version} Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +38,7 @@ Patch7: split-files.diff Patch8: kdebindings3-java.diff Patch9: kdebindings-3.5.1_ruby_non_site_dir.patch +Patch10: admin-no-hpi.diff %description Needed libraries for writing applications in Python for Qt and KDE. @@ -118,6 +119,8 @@ %endif . /etc/opt/kde3/common_options update_admin --no-unsermake +%patch10 +make -f admin/Makefile.common cvs %build . /etc/opt/kde3/common_options @@ -266,6 +269,8 @@ %endif %changelog -n kdebindings3-python +* Mon Jan 29 2007 - dmueller(a)suse.de +- remove hpi check for ppc (#223658) * Thu Jan 25 2007 - stbinner(a)suse.de - add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros * Tue Jan 16 2007 - stbinner(a)suse.de ++++++ kdebindings3.spec ++++++ --- /var/tmp/diff_new_pack.f21562/_old 2007-01-29 18:57:59.000000000 +0100 +++ /var/tmp/diff_new_pack.f21562/_new 2007-01-29 18:57:59.000000000 +0100 @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: Bindings for Qt and KDE Libraries Version: 3.5.6 -Release: 2 +Release: 3 Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Url: http://www.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,6 +38,7 @@ Patch7: split-files.diff Patch8: kdebindings3-java.diff Patch9: kdebindings-3.5.1_ruby_non_site_dir.patch +Patch10: admin-no-hpi.diff %description This package contains generator applications for creating bindings for @@ -132,6 +133,8 @@ %endif . /etc/opt/kde3/common_options update_admin --no-unsermake +%patch10 +make -f admin/Makefile.common cvs %build . /etc/opt/kde3/common_options @@ -280,6 +283,8 @@ %endif %changelog -n kdebindings3 +* Mon Jan 29 2007 - dmueller(a)suse.de +- remove hpi check for ppc (#223658) * Thu Jan 25 2007 - stbinner(a)suse.de - add 3_5_BRANCH.diff to fix build against Python 2.4 on old distros * Tue Jan 16 2007 - stbinner(a)suse.de ++++++ admin-no-hpi.diff ++++++ Index: admin/acinclude.m4.in =================================================================== --- admin/acinclude.m4.in (revision 628197) +++ admin/acinclude.m4.in (working copy) @@ -5176,7 +5176,6 @@ if test "x$ac_java_dir" = "xno"; then kde_java_includedir=no kde_java_libjvmdir=no kde_java_libgcjdir=no - kde_java_libhpidir=no else if test "x$ac_java_dir" = "x"; then @@ -5262,8 +5261,6 @@ if test "x$kde_java_bindir" != "xno"; th kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` dnl Look for libgcj.so kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1` - dnl Look for libhpi.so and avoid green threads - kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1` dnl Now check everything's fine under there dnl the include dir is our flag for having the JDK @@ -5312,14 +5309,6 @@ if test "x$kde_java_bindir" != "xno"; th AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.]) fi - dnl not needed for gcj compile - - if test "x$kde_java_libgcjdir" = "x"; then - if test ! -r "$kde_java_libhpidir/libhpi.so"; then - AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.]) - fi - fi - if test -n "$jni_includes"; then dnl Check for JNI version AC_LANG_SAVE @@ -5356,8 +5345,8 @@ if test "x$kde_java_bindir" != "xno"; th JAVAH=$kde_java_bindir/javah JAR=$kde_java_bindir/jar AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) - if test "x$kde_java_libgcjdir" = "x"; then - JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" + if test "x$kde_java_libgcjdir" = "x"; then + JVMLIBS="-L$kde_java_libjvmdir -ljvm" else JVMLIBS="-L$kde_java_libgcjdir -lgcj" fi ++++++ kdebindings3.spec.in ++++++ --- KDE/kdebindings3/kdebindings3.spec.in 2007-01-25 13:55:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebindings3/kdebindings3.spec.in 2007-01-29 18:06:08.000000000 +0100 @@ -39,6 +39,7 @@ Patch7: split-files.diff Patch8: kdebindings3-java.diff Patch9: kdebindings-3.5.1_ruby_non_site_dir.patch +Patch10: admin-no-hpi.diff %description base @@ -112,6 +113,8 @@ . /etc/opt/kde3/common_options update_admin --no-unsermake +%patch10 +make -f admin/Makefile.common cvs %build . /etc/opt/kde3/common_options ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-panel
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package gnome-panel checked in at Mon Jan 29 18:57:46 CET 2007. -------- --- GNOME/gnome-panel/gnome-panel.changes 2007-01-18 12:21:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2007-01-29 18:03:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 18:03:40 CET 2007 - sbrabec(a)suse.cz + +- Removed remaining references to /opt/gnome. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.Q18828/_old 2007-01-29 18:57:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Q18828/_new 2007-01-29 18:57:27.000000000 +0100 @@ -15,7 +15,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/GUI/GNOME Version: 2.16.1 -Release: 44 +Release: 45 Summary: The GNOME 2.x Desktop Panel Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.16/%{name}-%{version}.t… URL: http://www.gnome.org @@ -401,6 +401,8 @@ %{_datadir}/gtk-doc/html/* %changelog -n gnome-panel +* Mon Jan 29 2007 - sbrabec(a)suse.cz +- Removed remaining references to /opt/gnome. * Thu Jan 18 2007 - sbrabec(a)suse.cz - Consistent -extras package split (#235986). * Wed Jan 17 2007 - sbrabec(a)suse.cz ++++++ gnome-panel-clock-change-date.diff ++++++ --- /var/tmp/diff_new_pack.Q18828/_old 2007-01-29 18:57:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Q18828/_new 2007-01-29 18:57:27.000000000 +0100 @@ -5,7 +5,7 @@ <owner>clock-applet</owner> <type>string</type> - <default> </default> -+ <default>/opt/gnome/bin/gnomesu /sbin/yast2 timezone</default> ++ <default>/usr/bin/gnomesu /sbin/yast2 timezone</default> <locale name="C"> <short>Time configuration tool</short> <long> ++++++ gnome-panel-layout.patch ++++++ --- /var/tmp/diff_new_pack.Q18828/_old 2007-01-29 18:57:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Q18828/_new 2007-01-29 18:57:28.000000000 +0100 @@ -212,7 +212,7 @@ <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key> <value> - <string>evolution.desktop</string> -+ <string>/opt/gnome/share/applications/evolution-email.desktop</string> ++ <string>/usr/share/applications/evolution-email.desktop</string> </value> </entry> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-netstatus
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package gnome-netstatus checked in at Mon Jan 29 18:57:20 CET 2007. -------- --- GNOME/gnome-netstatus/gnome-netstatus.changes 2006-12-19 16:55:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-netstatus/gnome-netstatus.changes 2007-01-29 18:02:04.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 18:01:59 CET 2007 - sbrabec(a)suse.cz + +- Removed remaining references to /opt/gnome. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-netstatus.spec ++++++ --- /var/tmp/diff_new_pack.R17829/_old 2007-01-29 18:57:12.000000000 +0100 +++ /var/tmp/diff_new_pack.R17829/_new 2007-01-29 18:57:12.000000000 +0100 @@ -13,7 +13,7 @@ Name: gnome-netstatus BuildRequires: docbook-xsl-stylesheets gnome-common gnome-doc-utils-devel gnome-panel-devel gnutls-devel intltool libgnomeprintui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files Version: 2.12.0 -Release: 59 +Release: 60 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: GNU General Public License (GPL) @@ -81,6 +81,8 @@ %{_prefix}/lib/gnome-panel/* %changelog -n gnome-netstatus +* Mon Jan 29 2007 - sbrabec(a)suse.cz +- Removed remaining references to /opt/gnome. * Tue Dec 19 2006 - sbrabec(a)suse.cz - Prefix changed to /usr. - Spec file cleanup. ++++++ gnome-netstatus-default-configure.diff ++++++ --- /var/tmp/diff_new_pack.R17829/_old 2007-01-29 18:57:12.000000000 +0100 +++ /var/tmp/diff_new_pack.R17829/_new 2007-01-29 18:57:12.000000000 +0100 @@ -6,7 +6,7 @@ <owner>netstatus-applet</owner> <type>string</type> - <default></default> -+ <default>/opt/gnome/bin/gnomesu /sbin/yast2 network</default> ++ <default>/usr/bin/gnomesu /sbin/yast2 network</default> <locale name="C"> <short>Network configuration tool</short> <long> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evms
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package evms checked in at Mon Jan 29 18:57:07 CET 2007. -------- --- evms/evms.changes 2007-01-17 20:42:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/evms/evms.changes 2007-01-29 18:29:00.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 29 10:28:10 MST 2007 - cgao(a)novell.com + +- Add more processing in boot.evms #237117 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evms.spec ++++++ --- /var/tmp/diff_new_pack.H16956/_old 2007-01-29 18:57:00.000000000 +0100 +++ /var/tmp/diff_new_pack.H16956/_new 2007-01-29 18:57:01.000000000 +0100 @@ -21,7 +21,7 @@ %endif Autoreqprov: on Version: 2.5.5 -Release: 86 +Release: 87 Summary: EVMS--Enterprise Volume Management System BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://prdownloads.sourceforge.net/evms/evms-%{version}.tar.bz2 @@ -211,6 +211,8 @@ /etc/ha.d/resource.d/evms_failover %changelog -n evms +* Mon Jan 29 2007 - cgao(a)novell.com +- Add more processing in boot.evms #237117 * Wed Jan 17 2007 - cgao(a)novell.com - fixed a comparison of two strings, which broke the build. * Tue Jan 16 2007 - cgao(a)novell.com ++++++ boot.evms ++++++ --- evms/boot.evms 2006-10-13 15:06:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/evms/boot.evms 2007-01-29 18:27:31.000000000 +0100 @@ -18,7 +18,9 @@ get_fstab_entries() { - FSTLIST=$(sed -n "\:^/dev/:p" <$1 | sed -e "\:/media/:d" -e "s:/dev/::" -e "s:[ ].*::" -e "s:/:|:g") + FSTLIST1=$(sed -n "\:^/dev/disk/:p" <$1 | sed -e "s:[ ].*::" | xargs -r ls -l | sed -e "s:^.*-> [./]*::" -e "s:/:|:g") + FSTLIST2=$(sed -n "\:^/dev/:p" <$1 | sed -e "\:/media/:d" -e "\:/dev/disk/:d" -e "s:/dev/::" -e "s:[ ].*::" -e "s:/:|:g") + FSTLIST="$FSTLIST1 $FSTLIST2" for i in $FSTLIST do LINES=$(dmsetup ls | sed -n "\:^$i:p") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package autofs checked in at Mon Jan 29 18:56:28 CET 2007. -------- --- autofs/autofs.changes 2006-11-30 17:49:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2007-01-29 18:01:00.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 29 16:59:17 CET 2007 - mkoenig(a)suse.de + +- remove the introduced -multi option, because this issue has + been fixed upstream in a different way. + add autofs-4.1.4-multi_parse_fix.patch, resolves [#232855] + +------------------------------------------------------------------- Old: ---- autofs4-net-multi.patch New: ---- autofs-4.1.4-multi_parse_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.l12874/_old 2007-01-29 18:55:43.000000000 +0100 +++ /var/tmp/diff_new_pack.l12874/_new 2007-01-29 18:55:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autofs (Version 4.1.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -19,7 +19,7 @@ Autoreqprov: on Requires: sed grep Version: 4.1.4 -Release: 53 +Release: 61 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 @@ -38,10 +38,10 @@ Patch7: autofs-4.1.3-optflags.patch Patch8: autofs-4.1.4-strip.patch Patch9: autofs-4.1.4-configurable-locking.patch -Patch10: autofs4-net-multi.patch Patch11: autofs4-e2fsck-error-handling.diff Patch12: autofs4-nfs-retry.diff Patch13: autofs-4.1.4-buffer_overflow.patch +Patch14: autofs-4.1.4-multi_parse_fix.patch PreReq: %fillup_prereq %insserv_prereq PreReq: /usr/bin/sed /usr/bin/grep /bin/mv @@ -73,10 +73,10 @@ %patch7 %patch8 %patch9 -p1 -%patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 +%patch14 -p1 %build autoconf @@ -143,6 +143,10 @@ /usr/sbin/automount %changelog -n autofs +* Mon Jan 29 2007 - mkoenig(a)suse.de +- remove the introduced -multi option, because this issue has + been fixed upstream in a different way. + add autofs-4.1.4-multi_parse_fix.patch, resolves [#232855] * Thu Nov 30 2006 - mkoenig(a)suse.de - add NetworkManager dispatcher script [#173990] - fix possible buffer overflow ++++++ autofs-4.1.4-multi_parse_fix.patch ++++++ diff -Nurp autofs-4.1.4.orig/modules/parse_sun.c autofs-4.1.4/modules/parse_sun.c --- autofs-4.1.4.orig/modules/parse_sun.c 2005-04-05 20:42:42.000000000 +0800 +++ autofs-4.1.4/modules/parse_sun.c 2005-04-25 10:00:13.000000000 +0800 @@ -766,7 +766,16 @@ static int check_is_multi(const char *ma { const char *p = (char *) mapent; int multi = 0; - int first_chunk = 0; + int not_first_chunk = 0; + + if (!p) { + crit("check_is_multi: unexpected NULL map entry pointer"); + return 0; + } + + /* If first character is "/" it's a multi-mount */ + if (*p == '/') + return 1; while (*p) { p = skipspace(p); @@ -779,7 +788,7 @@ static int check_is_multi(const char *ma * path that begins with '/' indicates a mutil-mount * entry. */ - if (first_chunk) { + if (not_first_chunk) { if (*p == '/' || *p == '-') { multi = 1; break; @@ -796,7 +805,7 @@ static int check_is_multi(const char *ma * after which it's a multi mount. */ p += chunklen(p, check_colon(p)); - first_chunk++; + not_first_chunk++; } return multi; @@ -883,7 +892,12 @@ int parse_mount(const char *root, const return 1; } - path = dequote(p, l = chunklen(p, 0)); + if (*p != '/') { + l = 0; + path = dequote("/", 1); + } else + path = dequote(p, l = chunklen(p, 0)); + if (!path) { error(MODPREFIX "out of memory"); free(myoptions); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kipi-plugins
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package kipi-plugins checked in at Mon Jan 29 17:42:14 CET 2007. -------- --- KDE/kipi-plugins/kipi-plugins.changes 2007-01-29 10:36:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins.changes 2007-01-29 17:24:15.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Jan 29 17:23:29 CET 2007 - stbinner(a)suse.de + +- update to version 0.1.3: + * GalleryExport : Add preliminary support for Gallery 2.2 + security features + * SendImages : Solved problems with filenames and commandline + with thunderbird and mozilla + +------------------------------------------------------------------- Old: ---- kipi-plugins-0.1.3-rc1.tar.bz2 New: ---- kipi-plugins-0.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.T13104/_old 2007-01-29 17:41:56.000000000 +0100 +++ /var/tmp/diff_new_pack.T13104/_new 2007-01-29 17:41:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kipi-plugins (Version 0.1.3rc1) +# spec file for package kipi-plugins (Version 0.1.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ License: BSD License and BSD-like, GNU General Public License (GPL) Group: Productivity/Graphics/Other Summary: KDE Plug-Ins for Image Manipulation -Version: 0.1.3rc1 -Release: 6 -%define rversion 0.1.3-rc1 +Version: 0.1.3 +Release: 1 +%define rversion 0.1.3 %if %suse_version > 1000 Recommends: dcraw %endif @@ -96,6 +96,12 @@ %_mandir/man*/* %changelog -n kipi-plugins +* Mon Jan 29 2007 - stbinner(a)suse.de +- update to version 0.1.3: + * GalleryExport : Add preliminary support for Gallery 2.2 + security features + * SendImages : Solved problems with filenames and commandline + with thunderbird and mozilla * Mon Jan 29 2007 - coolo(a)suse.de - fix rotation of scanned pictures (no EXIF data) * Wed Jan 03 2007 - adrian(a)suse.de ++++++ kipi-plugins-0.1.3-rc1.tar.bz2 -> kipi-plugins-0.1.3.tar.bz2 ++++++ KDE/kipi-plugins/kipi-plugins-0.1.3-rc1.tar.bz2 /mounts/work_src_done/STABLE/kipi-plugins/kipi-plugins-0.1.3.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-scanner
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package yast2-scanner checked in at Mon Jan 29 17:41:45 CET 2007. -------- --- yast2-scanner/yast2-scanner.changes 2006-11-29 14:51:57.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2007-01-29 15:05:54.292793000 +0100 @@ -1,0 +2,9 @@ +Mon Jan 29 14:42:47 CET 2007 - jsmeix(a)suse.de + +- V 2.15.0 +- Package 'sane' was renamed into 'sane-backends'. + Package 'hp-officeJet' was dropped. + Adapted it so that it works with 'sane-backends' + and dropped support for 'hp-officeJet'. + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.14.11.tar.bz2 New: ---- yast2-scanner-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.u12399/_old 2007-01-29 17:41:34.000000000 +0100 +++ /var/tmp/diff_new_pack.u12399/_new 2007-01-29 17:41:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-scanner (Version 2.14.11) +# spec file for package yast2-scanner (Version 2.15.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-scanner -Version: 2.14.11 +Version: 2.15.0 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.14.11.tar.bz2 +Source0: yast2-scanner-2.15.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Johannes Meixner <jsmeix(a)suse.de> %prep -%setup -n yast2-scanner-2.14.11 +%setup -n yast2-scanner-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,12 @@ %doc %{prefix}/share/doc/packages/yast2-scanner %changelog -n yast2-scanner +* Mon Jan 29 2007 - jsmeix(a)suse.de +- V 2.15.0 +- Package 'sane' was renamed into 'sane-backends'. + Package 'hp-officeJet' was dropped. + Adapted it so that it works with 'sane-backends' + and dropped support for 'hp-officeJet'. * Wed Nov 29 2006 - jsmeix(a)suse.de - V 2.14.11 - Fixed test_and_set_scanner_access_permissions to search only ++++++ yast2-scanner-2.14.11.tar.bz2 -> yast2-scanner-2.15.0.tar.bz2 ++++++ ++++ 6779 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/configure.in new/yast2-scanner-2.15.0/configure.in --- old/yast2-scanner-2.14.11/configure.in 2006-11-29 14:44:57.000000000 +0100 +++ new/yast2-scanner-2.15.0/configure.in 2007-01-29 14:50:08.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-scanner dnl -dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-scanner, 2.14.11, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.15.0, http://bugs.opensuse.org/, yast2-scanner) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.11" +VERSION="2.15.0" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile doc/autodocs/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/Makefile.am new/yast2-scanner-2.15.0/Makefile.am --- old/yast2-scanner-2.14.11/Makefile.am 2006-11-29 14:44:57.000000000 +0100 +++ new/yast2-scanner-2.15.0/Makefile.am 2007-01-29 14:50:08.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/Makefile.am.common new/yast2-scanner-2.15.0/Makefile.am.common --- old/yast2-scanner-2.14.11/Makefile.am.common 2006-11-29 14:44:57.000000000 +0100 +++ new/yast2-scanner-2.15.0/Makefile.am.common 2007-01-29 14:50:08.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/src/helps.ycp new/yast2-scanner-2.15.0/src/helps.ycp --- old/yast2-scanner-2.14.11/src/helps.ycp 2006-11-07 09:42:05.000000000 +0100 +++ new/yast2-scanner-2.15.0/src/helps.ycp 2007-01-29 15:03:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Johannes Meixner <jsmeix(a)suse.de> * - * $Id: helps.ycp 34110 2006-11-07 08:42:03Z jsmeix $ + * $Id: helps.ycp 35679 2007-01-29 14:03:13Z jsmeix $ */ { @@ -133,9 +133,10 @@ <tt>http://www.sane-project.org/</tt>. </p>") + // SelectModel dialog help 2/5: +// Do not change or translate "sane-backends", it is a package name. _("<p> A model is supported if there is at least one appropriate scanner driver available. -Most scanner drivers are provided by the sane package. +Most scanner drivers are provided by the sane-backends package. The support status varies from minimal to complete. </p>") + // SelectModel dialog help 3/5: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/src/Scanner.ycp new/yast2-scanner-2.15.0/src/Scanner.ycp --- old/yast2-scanner-2.14.11/src/Scanner.ycp 2006-11-29 14:51:31.000000000 +0100 +++ new/yast2-scanner-2.15.0/src/Scanner.ycp 2007-01-29 15:03:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix(a)suse.de> * - * $Id: Scanner.ycp 34636 2006-11-29 13:51:29Z jsmeix $ + * $Id: Scanner.ycp 35679 2007-01-29 14:03:13Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -61,13 +61,13 @@ /** * Scanner database: - * When package version of sane/hp-officeJet/iscan/iscan-free changes + * When package version of sane-backends/hplip/hp-officeJet/iscan/iscan-free changes * the database is created anew in Scanner::Read() which calls the bash script * "/usr/lib/YaST2/bin/create_scanner_database YCP" * which outputs on stdout a YCP list of @ref scanner_model_map * where the last list entry is an emtpy map. * @struct scanner_model_map - * $[ "package":"The package which provides the backend: sane/hplip/hp-officeJet/iscan/iscan-free (required)", + * $[ "package":"The package which provides the backend: sane-backends/hplip/hp-officeJet/iscan/iscan-free (required)", * "backend":"The name of the backend (required)", * "manufacturer":"The manufacturer name of the scanner (required)", * "model":"The model name of the scanner (required)", @@ -174,20 +174,20 @@ * Environment values: * It is a map of @ref environment_values * @struct environment_values - * $[ "sane_version":"What 'rpm -q sane' returns (required)", + * $[ "sane-backends_version":"What 'rpm -q sane-backends' returns (required)", * "hplip_version":"What 'rpm -q hplip' returns (required)", * "hp-officeJet_version":"What 'rpm -q hp-officeJet' returns (required)", * "iscan_version":"What 'rpm -q iscan' returns (required)" * "iscan-free_version":"What 'rpm -q iscan-free' returns (required)" * ] */ -global map< string, string > actual_environment = $[ "sane_version":"", +global map< string, string > actual_environment = $[ "sane-backends_version":"", "hplip_version":"", "hp-officeJet_version":"", "iscan_version":"", "iscan-free_version":"" ]; -global map< string, string > stored_environment = $[ "sane_version":"", +global map< string, string > stored_environment = $[ "sane-backends_version":"", "hplip_version":"", "hp-officeJet_version":"", "iscan_version":"", @@ -643,17 +643,17 @@ if( Abort() ) return false; Progress::NextStage(); // Make sure the package sane is installed (otherwise abort): - if( ! TestAndInstallPackage( "sane" ) ) + if( ! TestAndInstallPackage( "sane-backends" ) ) { return false; } - // Check installed package version of sane, hp-officeJet, iscan, iscan-free: - actual_environment["sane_version"] = InstalledPackageVersion( "sane" ); + // Check installed package version of sane-backends, hp-officeJet, iscan, iscan-free: + actual_environment["sane-backends_version"] = InstalledPackageVersion( "sane-backends" ); actual_environment["hplip_version"] = InstalledPackageVersion( "hplip" ); actual_environment["hp-officeJet_version"] = InstalledPackageVersion( "hp-officeJet" ); actual_environment["iscan_version"] = InstalledPackageVersion( "iscan" ); actual_environment["iscan-free_version"] = InstalledPackageVersion( "iscan-free" ); - y2milestone( "Version of sane, hplip, hp-officeJet, iscan, iscan-free: %1, %2, %3, %4, %5", - actual_environment["sane_version"]:"failed", + y2milestone( "Version of sane-backends, hplip, hp-officeJet, iscan, iscan-free: %1, %2, %3, %4, %5", + actual_environment["sane-backends_version"]:"failed", actual_environment["hplip_version"]:"failed", actual_environment["hp-officeJet_version"]:"failed", actual_environment["iscan_version"]:"failed", @@ -664,7 +664,7 @@ { stored_environment = (map< string, string >)SCR::Read( .target.ycp, environment_filename ); if( stored_environment == nil ) { y2milestone( "Warning: Failed to read the stored environment." ); - stored_environment = $[ "sane_version":"failed to read", + stored_environment = $[ "sane-backends_version":"failed to read", "hplip_version":"failed to read", "hp-officeJet_version":"failed to read", "iscan_version":"failed to read", @@ -675,7 +675,7 @@ // Progress 2. stage (Read or create the scanner database): if( Abort() ) return false; Progress::NextStage(); - if( actual_environment["sane_version"]:"0" != stored_environment["sane_version"]:"1" + if( actual_environment["sane-backends_version"]:"0" != stored_environment["sane-backends_version"]:"1" || actual_environment["hplip_version"]:"0" != stored_environment["hplip_version"]:"1" || actual_environment["hp-officeJet_version"]:"0" != stored_environment["hp-officeJet_version"]:"1" || actual_environment["iscan_version"]:"0" != stored_environment["iscan_version"]:"1" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/tools/create_scanner_database new/yast2-scanner-2.15.0/tools/create_scanner_database --- old/yast2-scanner-2.14.11/tools/create_scanner_database 2006-10-31 14:16:13.000000000 +0100 +++ new/yast2-scanner-2.15.0/tools/create_scanner_database 2007-01-29 13:15:11.000000000 +0100 @@ -28,7 +28,7 @@ # Process the SANE description files: # At least the SANE description files must exist: -PACKAGE="sane" +PACKAGE="sane-backends" DESCRIPTION_FILES="/usr/share/sane/descriptions/*.desc" rpm -q $PACKAGE &>/dev/null || { echo "Error: Required package $PACKAGE is not installed." 1>&2 ; exit 2 ; } ls $DESCRIPTION_FILES &>/dev/null || { echo "Error: Required SANE description files $DESCRIPTION_FILES not found." 1>&2 ; exit 3 ; } @@ -49,16 +49,6 @@ else echo "Info: Cannot read $DESCRIPTION_FILE" 1>&2 fi -# Process the optional HPOJ external description file: -# The package hp-officeJet is not installed by default. -PACKAGE="hp-officeJet" -DESCRIPTION_FILE="/usr/share/sane/descriptions-external/hpoj.desc" -if [ -r "$DESCRIPTION_FILE" ] -then echo ":package \"$PACKAGE\"" >>$TMP_DATA - Extract $DESCRIPTION_FILE >>$TMP_DATA -else echo "Info: Cannot read $DESCRIPTION_FILE" 1>&2 -fi - # Process the optional EPSON AVASYS (formerly EPSON KOWA) Image Scan external description file: # The proprietary binary-only i386-only package iscan cannot be installed by default. # The package iscan-free is not installed by default. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-scanner-2.14.11/VERSION new/yast2-scanner-2.15.0/VERSION --- old/yast2-scanner-2.14.11/VERSION 2006-11-29 14:42:11.000000000 +0100 +++ new/yast2-scanner-2.15.0/VERSION 2007-01-29 14:37:46.000000000 +0100 @@ -1 +1 @@ -2.14.11 +2.15.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xmanja
by root＠Hilbert.suse.de 29 Jan '07

29 Jan '07

Hello community, here is the log from the commit of package xmanja checked in at Mon Jan 29 17:41:27 CET 2007. -------- --- xmanja/xmanja.changes 2007-01-25 21:33:38.000000000 +0100 +++ /mounts/work_src_done/NOARCH/xmanja/xmanja.changes 2007-01-29 12:45:09.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 29 12:44:49 CET 2007 - mfabian(a)suse.de + +- remove /usr/share/man/ja/man4/mouse.4.gz because it conflicts + with the man-pages-ja package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmanja.spec ++++++ --- /var/tmp/diff_new_pack.g11490/_old 2007-01-29 17:40:59.000000000 +0100 +++ /var/tmp/diff_new_pack.g11490/_new 2007-01-29 17:40:59.000000000 +0100 @@ -16,7 +16,7 @@ Autoreqprov: on Provides: locale(xorg-x11:ja) Version: 0.7 -Release: 337 +Release: 338 URL: http://xjman.dsl.gr.jp/ Source0: http://xjman.dsl.gr.jp/dist/xjman-0.7.tar.bz2 Source1: license.txt @@ -52,6 +52,8 @@ # because that's where the English ones are mkdir -p $RPM_BUILD_ROOT/usr/share/man/ja/man1/ install -m 644 non-xfree86/WindowMaker/*.1x $RPM_BUILD_ROOT/usr/share/man/ja/man1/ +# conflicts with man-pages-ja package: +rm $RPM_BUILD_ROOT/usr/share/man/ja/man4/mouse.4* %clean #[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -61,9 +63,11 @@ %doc README license.txt ChangeLog %dir /usr/share/man/ja/ %doc /usr/share/man/ja/* -%doc /usr/share/man/ja/man1/* %changelog -n xmanja +* Mon Jan 29 2007 - mfabian(a)suse.de +- remove /usr/share/man/ja/man4/mouse.4.gz because it conflicts + with the man-pages-ja package. * Thu Jan 25 2007 - sndirsch(a)suse.de - move from /usr/X11R6 to /usr * Tue Feb 28 2006 - mfabian(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0