Hello community, here is the log from the commit of package opensuse-gnomeuser_en checked in at Fri Aug 17 18:44:37 CEST 2007. -------- --- opensuse-gnomeuser_en/opensuse-gnomeuser_en.changes 2007-08-15 08:48:20.000000000 +0200 +++ /mounts/work_src_done/NOARCH/opensuse-gnomeuser_en/opensuse-gnomeuser_en.changes 2007-08-17 14:47:05.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 17 14:46:25 CEST 2007 - ke@suse.de + +- Re-write coolo's trigger +- optipng the image files. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-gnomeuser_en.spec ++++++ --- /var/tmp/diff_new_pack.c18832/_old 2007-08-17 18:44:19.000000000 +0200 +++ /var/tmp/diff_new_pack.c18832/_new 2007-08-17 18:44:19.000000000 +0200 @@ -14,7 +14,8 @@ %define my_lang en %define my_book opensuse-gnomeuser Version: 10.3 -Release: 4 +Release: 6 +Provides: locale(desktop-data-SuSE:en) #OBS Source0: opensuse-gnomeuser_en-html.tar.bz2 Source1: opensuse-gnomeuser_en-desktop.tar.bz2 @@ -25,10 +26,10 @@ #SOURCES BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArchitectures: noarch +BuildRequires: update-desktop-files Group: Documentation/SuSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE GNOME User Guide (English) -Provides: locale(gnome2-SuSE:en) %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual %define PDFDOC %{_defaultdocdir}/%{name}-pdf @@ -42,6 +43,7 @@ Group: Documentation/SuSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE GNOME User Guide (English) +Provides: locale(desktop-data-SuSE:en) #PDFOBS %description pdf @@ -63,7 +65,7 @@ # make sure index.html exists for f in $(find html -type f -name 'book.*'); do pushd ${f%/*} - ln -sf ${f##*/} index.html + [ -f index.html -o -L index.html ] || ln -sf ${f##*/} index.html popd done @@ -87,6 +89,13 @@ if [ -d html/%my_book ]; then mv html/%my_book html/manual pushd desktop +# problem writing desktop files on 10.3 +if [ -d index.desktop ]; then + for f in $(find index.desktop -mindepth 1 -maxdepth 1); do + mv $f . + done + rmdir index.desktop +fi for f in $(find . -type f -name '*desktop'); do # /usr/share/doc/manual/suselinux-manual_en/manual sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual| @@ -161,6 +170,7 @@ install -d html/manual echo PDF only > html/manual/%{name} fi +%suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory %files pdf %defattr(-, root, root) @@ -177,6 +187,9 @@ %dir /usr/share/gnome/help %changelog +* Fri Aug 17 2007 - ke@suse.de +- Re-write coolo's trigger +- optipng the image files. * Wed Aug 15 2007 - coolo@suse.de - trigger installation on english (or fallbck) gnome installations * Thu Aug 02 2007 - ke@suse.de ++++++ LICENSE.txt ++++++ --- opensuse-gnomeuser_en/LICENSE.txt 2007-08-02 10:58:16.000000000 +0200 +++ /mounts/work_src_done/NOARCH/opensuse-gnomeuser_en/LICENSE.txt 2007-08-17 12:36:53.000000000 +0200 @@ -10,12 +10,13 @@ A copy of the license is included in the section entitled GNU Free Documentation License. - - SUSE, openSUSE, the openSUSE logo, Novell, the Novell - Logo, the N Logo, are registered trademarks of Novell, Inc. in the - United States and other countries. Linux* is a registered trademark of - Linus Torvalds. All other third party trademarks are the property of their - respective owners. + SUSE®, openSUSE®, the openSUSE® logo, Novell®, + the Novell® logo, the N® logo, are registered trademarks of Novell, + Inc. in the United States and other countries. Linux* is a registered + trademark of Linus Torvalds. All other third party trademarks are the + property of their respective owners. A trademark symbol (® , ™, + etc.) denotes a Novell trademark; an asterisk (*) denotes a third-party + trademark. All information found in this book has been compiled with utmost ++++++ opensuse-gnomeuser_en-desktop.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/apd.desktop new/desktop/index.desktop/apd.desktop --- old/desktop/index.desktop/apd.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/apd.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -3,10 +3,10 @@ Name[en]=GNU Licenses Comment=GNU Licenses Comment[en]=GNU Licenses -DocPath=@PATH@/apd.desktop +DocPath=@PATH@/apd.html Icon=document2 X-DOC-DocumentType=text/html X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=200 \ No newline at end of file +X-DOC-Weight=-210 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/b7ji9tz.desktop new/desktop/index.desktop/b7ji9tz.desktop --- old/desktop/index.desktop/b7ji9tz.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/b7ji9tz.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=180 \ No newline at end of file +X-DOC-Weight=-190 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/cha_helpnld.desktop new/desktop/index.desktop/cha_helpnld.desktop --- old/desktop/index.desktop/cha_helpnld.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/cha_helpnld.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=170 \ No newline at end of file +X-DOC-Weight=-180 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/cha_linwin.desktop new/desktop/index.desktop/cha_linwin.desktop --- old/desktop/index.desktop/cha_linwin.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/cha_linwin.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=190 \ No newline at end of file +X-DOC-Weight=-200 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/.directory new/desktop/index.desktop/.directory --- old/desktop/index.desktop/.directory 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/.directory 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=-950 +X-DOC-Weight=-10 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_desktop/bwak1f3.desktop new/desktop/index.desktop/part_gnome_desktop/bwak1f3.desktop --- old/desktop/index.desktop/part_gnome_desktop/bwak1f3.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_desktop/bwak1f3.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=30 \ No newline at end of file +X-DOC-Weight=-40 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_desktop/bwak2br.desktop new/desktop/index.desktop/part_gnome_desktop/bwak2br.desktop --- old/desktop/index.desktop/part_gnome_desktop/bwak2br.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_desktop/bwak2br.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=40 \ No newline at end of file +X-DOC-Weight=-50 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_desktop/.directory new/desktop/index.desktop/part_gnome_desktop/.directory --- old/desktop/index.desktop/part_gnome_desktop/.directory 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_desktop/.directory 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=20 \ No newline at end of file +X-DOC-Weight=-30 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_internet/cha_firefox.desktop new/desktop/index.desktop/part_gnome_internet/cha_firefox.desktop --- old/desktop/index.desktop/part_gnome_internet/cha_firefox.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_internet/cha_firefox.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=110 \ No newline at end of file +X-DOC-Weight=-120 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_internet/.directory new/desktop/index.desktop/part_gnome_internet/.directory --- old/desktop/index.desktop/part_gnome_internet/.directory 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_internet/.directory 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=100 \ No newline at end of file +X-DOC-Weight=-110 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_multimedia/b2qs0ba.desktop new/desktop/index.desktop/part_gnome_multimedia/b2qs0ba.desktop --- old/desktop/index.desktop/part_gnome_multimedia/b2qs0ba.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_multimedia/b2qs0ba.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=150 \ No newline at end of file +X-DOC-Weight=-160 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_multimedia/b3xx0s1.desktop new/desktop/index.desktop/part_gnome_multimedia/b3xx0s1.desktop --- old/desktop/index.desktop/part_gnome_multimedia/b3xx0s1.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_multimedia/b3xx0s1.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=130 \ No newline at end of file +X-DOC-Weight=-140 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_multimedia/b3xx10v.desktop new/desktop/index.desktop/part_gnome_multimedia/b3xx10v.desktop --- old/desktop/index.desktop/part_gnome_multimedia/b3xx10v.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_multimedia/b3xx10v.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=160 \ No newline at end of file +X-DOC-Weight=-170 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_multimedia/cha_gimp.desktop new/desktop/index.desktop/part_gnome_multimedia/cha_gimp.desktop --- old/desktop/index.desktop/part_gnome_multimedia/cha_gimp.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_multimedia/cha_gimp.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=140 \ No newline at end of file +X-DOC-Weight=-150 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_multimedia/.directory new/desktop/index.desktop/part_gnome_multimedia/.directory --- old/desktop/index.desktop/part_gnome_multimedia/.directory 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_multimedia/.directory 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=120 \ No newline at end of file +X-DOC-Weight=-130 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_office/b3ikrig.desktop new/desktop/index.desktop/part_gnome_office/b3ikrig.desktop --- old/desktop/index.desktop/part_gnome_office/b3ikrig.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_office/b3ikrig.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=80 \ No newline at end of file +X-DOC-Weight=-90 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_office/bwak36n.desktop new/desktop/index.desktop/part_gnome_office/bwak36n.desktop --- old/desktop/index.desktop/part_gnome_office/bwak36n.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_office/bwak36n.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=60 \ No newline at end of file +X-DOC-Weight=-70 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_office/cha_ekiga.desktop new/desktop/index.desktop/part_gnome_office/cha_ekiga.desktop --- old/desktop/index.desktop/part_gnome_office/cha_ekiga.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_office/cha_ekiga.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=90 \ No newline at end of file +X-DOC-Weight=-100 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_office/.directory new/desktop/index.desktop/part_gnome_office/.directory --- old/desktop/index.desktop/part_gnome_office/.directory 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_office/.directory 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=50 \ No newline at end of file +X-DOC-Weight=-60 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/index.desktop/part_gnome_office/usage-mainwindow.desktop new/desktop/index.desktop/part_gnome_office/usage-mainwindow.desktop --- old/desktop/index.desktop/part_gnome_office/usage-mainwindow.desktop 2007-08-02 10:56:15.000000000 +0200 +++ new/desktop/index.desktop/part_gnome_office/usage-mainwindow.desktop 2007-08-17 12:33:49.000000000 +0200 @@ -9,4 +9,4 @@ X-DOC-Identifier=@id@ X-DOC-SearchMethod=Htdig X-DOC-SearchEnabledDefault=true -X-DOC-Weight=70 \ No newline at end of file +X-DOC-Weight=-80 \ No newline at end of file ++++++ opensuse-gnomeuser_en-graphics.tar.bz2 ++++++ opensuse-gnomeuser_en/opensuse-gnomeuser_en-graphics.tar.bz2 /mounts/work_src_done/NOARCH/opensuse-gnomeuser_en/opensuse-gnomeuser_en-graphics.tar.bz2 differ: byte 11, line 1 ++++++ opensuse-gnomeuser_en-html.tar.bz2 ++++++ opensuse-gnomeuser_en/opensuse-gnomeuser_en-html.tar.bz2 /mounts/work_src_done/NOARCH/opensuse-gnomeuser_en/opensuse-gnomeuser_en-html.tar.bz2 differ: byte 11, line 1 ++++++ opensuse-gnomeuser_en.pdf ++++++ (binary differes) ++++++ opensuse-gnomeuser_en.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/.env-profile new/.env-profile --- old/.env-profile 1970-01-01 01:00:00.000000000 +0100 +++ new/.env-profile 2007-03-16 15:55:01.000000000 +0100 @@ -0,0 +1,7 @@ +# -*- shell-script -*- +unset DTDROOT +export DTDROOT=$(make dtdroot) +echo "Using the DTDROOT ${DTDROOT}" +. $DTDROOT/etc/system-profile + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/copyright_opensuse.xml new/xml/copyright_opensuse.xml --- old/xml/copyright_opensuse.xml 2007-08-02 10:57:28.000000000 +0200 +++ new/xml/copyright_opensuse.xml 2007-08-17 12:36:13.000000000 +0200 @@ -20,12 +20,13 @@ A copy of the license is included in the section entitled <quote>GNU Free Documentation License</quote>. </para> - <para> - SUSE, openSUSE, the openSUSE logo, Novell, the Novell - Logo, the N Logo, are registered trademarks of Novell, Inc. in the - United States and other countries. Linux* is a registered trademark of - Linus Torvalds. All other third party trademarks are the property of their - respective owners. + <para>&suse;®, &opensuse;®, the &opensuse;® logo, Novell®, + the Novell® logo, the N® logo, are registered trademarks of Novell, + Inc. in the United States and other countries. Linux* is a registered + trademark of Linus Torvalds. All other third party trademarks are the + property of their respective owners. A trademark symbol (® , ™, + etc.) denotes a Novell trademark; an asterisk (*) denotes a third-party + trademark. </para> <para> All information found in this book has been compiled with utmost diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/suse-gimp2.xml new/xml/suse-gimp2.xml --- old/xml/suse-gimp2.xml 2007-08-02 10:58:02.000000000 +0200 +++ new/xml/suse-gimp2.xml 2007-08-17 12:36:41.000000000 +0200 @@ -1108,7 +1108,7 @@ <emphasis>Grokking the GIMP</emphasis> by Carey Bunks is an excellent book based on an older version of The GIMP. Although some aspects of the program have changed, it can provide excellent guidance for image - manipulation. An online version is available at <ulink url="http://gimp-savvy.com/BOOK/"/>. + manipulation. An online version is available at <ulink url="http://gug.sunsite.dk/docs/Grokking-the-GIMP-v1.0/"/>. </para> </listitem> </itemizedlist> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org