June 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-trans-it
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-trans-it checked in at Sat Jun 3 01:07:23 CEST 2006. -------- --- yast2-trans-it/yast2-trans-it.changes 2006-05-19 19:14:24.000000000 +0200 +++ yast2-trans-it/yast2-trans-it.changes 2006-06-02 17:47:39.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:47:15 2006 - ke(a)suse.de + +- Update to version 2.13.13. + +------------------------------------------------------------------------ Old: ---- yast2-trans-it-2.13.12.tar.bz2 New: ---- yast2-trans-it-2.13.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-it.spec ++++++ --- /var/tmp/diff_new_pack.8qCEVb/_old 2006-06-03 01:06:51.000000000 +0200 +++ /var/tmp/diff_new_pack.8qCEVb/_new 2006-06-03 01:06:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-it (Version 2.13.12) +# spec file for package yast2-trans-it (Version 2.13.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-it -Version: 2.13.12 +Version: 2.13.13 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-it-2.13.12.tar.bz2 +Source0: yast2-trans-it-2.13.13.tar.bz2 prefix: /usr Provides: locale(yast2:it) BuildRequires: pkgconfig yast2-devtools @@ -33,7 +33,7 @@ %prep -%setup -n yast2-trans-it-2.13.12 +%setup -n yast2-trans-it-2.13.13 %build autoreconf --force --install @@ -65,6 +65,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-it +* Fri Jun 02 2006 - ke(a)suse.de +- Update to version 2.13.13. * Fri May 19 2006 - ke(a)suse.de - Update to version 2.13.12. * Mon Apr 10 2006 - ke(a)suse.de ++++++ yast2-trans-it-2.13.12.tar.bz2 -> yast2-trans-it-2.13.13.tar.bz2 ++++++ ++++ 9647 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-fr
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-trans-fr checked in at Sat Jun 3 01:07:22 CEST 2006. -------- --- yast2-trans-fr/yast2-trans-fr.changes 2006-05-24 19:11:06.000000000 +0200 +++ yast2-trans-fr/yast2-trans-fr.changes 2006-06-02 17:45:18.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:44:45 2006 - ke(a)suse.de + +- Update to version 2.13.15. + +------------------------------------------------------------------------ Old: ---- yast2-trans-fr-2.13.14.tar.bz2 New: ---- yast2-trans-fr-2.13.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-fr.spec ++++++ --- /var/tmp/diff_new_pack.bD55Rb/_old 2006-06-03 01:06:48.000000000 +0200 +++ /var/tmp/diff_new_pack.bD55Rb/_new 2006-06-03 01:06:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-fr (Version 2.13.14) +# spec file for package yast2-trans-fr (Version 2.13.15) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-fr -Version: 2.13.14 +Version: 2.13.15 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-fr-2.13.14.tar.bz2 +Source0: yast2-trans-fr-2.13.15.tar.bz2 prefix: /usr Provides: locale(yast2:fr) BuildRequires: pkgconfig yast2-devtools @@ -31,7 +31,7 @@ YaST2 - French Translations %prep -%setup -n yast2-trans-fr-2.13.14 +%setup -n yast2-trans-fr-2.13.15 %build autoreconf --force --install @@ -63,6 +63,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-fr +* Fri Jun 02 2006 - ke(a)suse.de +- Update to version 2.13.15. * Wed May 24 2006 - ke(a)suse.de - Update to version 2.13.14. * Fri May 19 2006 - ke(a)suse.de ++++++ yast2-trans-fr-2.13.14.tar.bz2 -> yast2-trans-fr-2.13.15.tar.bz2 ++++++ ++++ 2458 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-es
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-trans-es checked in at Sat Jun 3 01:06:43 CEST 2006. -------- --- yast2-trans-es/yast2-trans-es.changes 2006-05-24 19:10:27.000000000 +0200 +++ yast2-trans-es/yast2-trans-es.changes 2006-06-02 17:42:43.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:42:12 2006 - ke(a)suse.de + +- Update to version 2.13.16. + +------------------------------------------------------------------------ Old: ---- yast2-trans-es-2.13.15.tar.bz2 New: ---- yast2-trans-es-2.13.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-es.spec ++++++ --- /var/tmp/diff_new_pack.70W33Z/_old 2006-06-03 01:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.70W33Z/_new 2006-06-03 01:06:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-es (Version 2.13.15) +# spec file for package yast2-trans-es (Version 2.13.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-es -Version: 2.13.15 +Version: 2.13.16 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-es-2.13.15.tar.bz2 +Source0: yast2-trans-es-2.13.16.tar.bz2 prefix: /usr Provides: locale(yast2:es) BuildRequires: pkgconfig yast2-devtools @@ -31,7 +31,7 @@ YaST2 - Spanish Translations %prep -%setup -n yast2-trans-es-2.13.15 +%setup -n yast2-trans-es-2.13.16 %build autoreconf --force --install @@ -63,6 +63,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-es +* Fri Jun 02 2006 - ke(a)suse.de +- Update to version 2.13.16. * Wed May 24 2006 - ke(a)suse.de - Update to version 2.13.15. * Fri May 19 2006 - ke(a)suse.de ++++++ yast2-trans-es-2.13.15.tar.bz2 -> yast2-trans-es-2.13.16.tar.bz2 ++++++ ++++ 3108 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-fi
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-trans-fi checked in at Sat Jun 3 01:06:41 CEST 2006. -------- --- yast2-trans-fi/yast2-trans-fi.changes 2006-06-01 16:16:01.000000000 +0200 +++ yast2-trans-fi/yast2-trans-fi.changes 2006-06-02 17:40:10.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:39:48 2006 - ke(a)suse.de + +- Update to version 2.13.16. + +------------------------------------------------------------------------ Old: ---- yast2-trans-fi-2.13.15.tar.bz2 New: ---- yast2-trans-fi-2.13.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-fi.spec ++++++ --- /var/tmp/diff_new_pack.0hjtXN/_old 2006-06-03 01:06:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0hjtXN/_new 2006-06-03 01:06:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-fi (Version 2.13.15) +# spec file for package yast2-trans-fi (Version 2.13.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-fi -Version: 2.13.15 +Version: 2.13.16 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-fi-2.13.15.tar.bz2 +Source0: yast2-trans-fi-2.13.16.tar.bz2 prefix: /usr Provides: locale(yast2:fi) BuildRequires: pkgconfig yast2-devtools @@ -30,7 +30,7 @@ %prep -%setup -n yast2-trans-fi-2.13.15 +%setup -n yast2-trans-fi-2.13.16 %build autoreconf --force --install @@ -62,6 +62,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-fi +* Fri Jun 02 2006 - ke(a)suse.de +- Update to version 2.13.16. * Thu Jun 01 2006 - ke(a)suse.de - Update to version 2.13.15. * Mon May 29 2006 - ke(a)suse.de ++++++ yast2-trans-fi-2.13.15.tar.bz2 -> yast2-trans-fi-2.13.16.tar.bz2 ++++++ ++++ 2426 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-de
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-trans-de checked in at Sat Jun 3 01:06:15 CEST 2006. -------- --- yast2-trans-de/yast2-trans-de.changes 2006-05-24 19:09:48.000000000 +0200 +++ yast2-trans-de/yast2-trans-de.changes 2006-06-02 17:38:27.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:38:05 2006 - ke(a)suse.de + +- Update to version 2.13.19. + +------------------------------------------------------------------------ Old: ---- yast2-trans-de-2.13.18.tar.bz2 New: ---- yast2-trans-de-2.13.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-de.spec ++++++ --- /var/tmp/diff_new_pack.wqo70a/_old 2006-06-03 01:06:04.000000000 +0200 +++ /var/tmp/diff_new_pack.wqo70a/_new 2006-06-03 01:06:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-de (Version 2.13.18) +# spec file for package yast2-trans-de (Version 2.13.19) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-de -Version: 2.13.18 +Version: 2.13.19 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-de-2.13.18.tar.bz2 +Source0: yast2-trans-de-2.13.19.tar.bz2 prefix: /usr Provides: locale(yast2:de) # Requires: yast2-config-XXpkgXX @@ -34,7 +34,7 @@ %prep -%setup -n yast2-trans-de-2.13.18 +%setup -n yast2-trans-de-2.13.19 %build autoreconf --force --install @@ -66,6 +66,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-de +* Fri Jun 02 2006 - ke(a)suse.de +- Update to version 2.13.19. * Wed May 24 2006 - ke(a)suse.de - Update to version 2.13.18. * Fri May 19 2006 - ke(a)suse.de ++++++ yast2-trans-de-2.13.18.tar.bz2 -> yast2-trans-de-2.13.19.tar.bz2 ++++++ ++++ 4902 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apparmor-admin_en
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package apparmor-admin_en checked in at Sat Jun 3 01:05:23 CEST 2006. -------- --- apparmor-admin_en/apparmor-admin_en.changes 2006-05-08 11:21:38.000000000 +0200 +++ apparmor-admin_en/apparmor-admin_en.changes 2006-06-02 10:52:54.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 10:51:59 CEST 2006 - ke(a)suse.de + +- Update for SLE 10 RC3. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-admin_en.spec ++++++ --- /var/tmp/diff_new_pack.0RnDOG/_old 2006-06-03 01:04:59.000000000 +0200 +++ /var/tmp/diff_new_pack.0RnDOG/_new 2006-06-03 01:04:59.000000000 +0200 @@ -13,7 +13,7 @@ Name: apparmor-admin_en %define my_lang en Version: 10 -Release: 6 +Release: 7 Source0: apparmor-admin_%{my_lang}-html.tar.bz2 Source10: apparmor-admin_%{my_lang}-desktop.tar.bz2 Source20: apparmor-admin-online_%{my_lang}.pdf @@ -100,6 +100,10 @@ fi sed -i "s|index.html|book.apparmor.admin.html|" $f done +book_file=$(find ../html -name 'book.*' -o -name 'index.*' | head -n 1) +charset=$(tr '<' '\n' < "$book_file" | sed -n 's:.*charset=$.*$".*:\1:p') +title=$(tr '<' '\n' < "$book_file" | sed -n 's:^title>::p;' | iconv -f $charset -t UTF-8) +sed -i "s|$title $title|$title |" .directory cp -a . $RPM_BUILD_ROOT%{myy_desktopdir} popd # sed "s|@PATH@|%{_defaultdocdir}/%{name}/manual| @@ -130,7 +134,7 @@ %dir %{_defaultdocdir} %doc *.pdf # -%doc html/APPARMOR_admin/* +%doc html/APPARMOR-admin/* %{myy_desktopdir} %dir %{_datadir}/susehelp/meta %dir %{_datadir}/susehelp @@ -141,6 +145,8 @@ %dir /opt/gnome/share/gnome/help %changelog -n apparmor-admin_en +* Fri Jun 02 2006 - ke(a)suse.de +- Update for SLE 10 RC3. * Mon May 08 2006 - ke(a)suse.de - Update for RC1. * Fri Apr 21 2006 - ke(a)suse.de ++++++ apparmor-admin-online_en.pdf ++++++ (binary differes) ++++++ apparmor-admin_en-desktop.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/app.aa.background.desktop new/desktop/app.aa.background.desktop --- old/desktop/app.aa.background.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/app.aa.background.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Background Information on AppArmor Profiling DocPath=@PATH@/app.aa.background.html -X-DOC-Weight=1310 +X-DOC-Weight=1300 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5bdo3.desktop new/desktop/bx5bdo3.desktop --- old/desktop/bx5bdo3.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5bdo3.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=About This Guide DocPath=@PATH@/bx5bdo3.html -X-DOC-Weight=1240 +X-DOC-Weight=1230 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5bfk7.desktop new/desktop/bx5bfk7.desktop --- old/desktop/bx5bfk7.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5bfk7.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Immunizing Programs DocPath=@PATH@/bx5bfk7.html -X-DOC-Weight=1250 +X-DOC-Weight=1240 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5bkfp.desktop new/desktop/bx5bkfp.desktop --- old/desktop/bx5bkfp.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5bkfp.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Selecting Programs to Immunize DocPath=@PATH@/bx5bkfp.html -X-DOC-Weight=1260 +X-DOC-Weight=1250 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5bmka.desktop new/desktop/bx5bmka.desktop --- old/desktop/bx5bmka.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5bmka.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Building Novell AppArmor Profiles DocPath=@PATH@/bx5bmka.html -X-DOC-Weight=1270 +X-DOC-Weight=1260 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5dcoe.desktop new/desktop/bx5dcoe.desktop --- old/desktop/bx5dcoe.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5dcoe.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Managing Profiled Applications DocPath=@PATH@/bx5dcoe.html -X-DOC-Weight=1280 +X-DOC-Weight=1270 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5dh00.desktop new/desktop/bx5dh00.desktop --- old/desktop/bx5dh00.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5dh00.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Profiling Your Web Applications Using ChangeHat Apache DocPath=@PATH@/bx5dh00.html -X-DOC-Weight=1290 +X-DOC-Weight=1280 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5dkv1.desktop new/desktop/bx5dkv1.desktop --- old/desktop/bx5dkv1.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5dkv1.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Support DocPath=@PATH@/bx5dkv1.html -X-DOC-Weight=1300 +X-DOC-Weight=1290 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/desktop/bx5dnt6.desktop new/desktop/bx5dnt6.desktop --- old/desktop/bx5dnt6.desktop 2006-05-08 10:29:27.000000000 +0200 +++ new/desktop/bx5dnt6.desktop 2006-06-02 10:46:38.000000000 +0200 @@ -1,4 +1,4 @@ [Desktop Entry] Name=Glossary DocPath=@PATH@/bx5dnt6.html -X-DOC-Weight=1320 +X-DOC-Weight=1310 ++++++ apparmor-admin_en-graphics.tar.bz2 ++++++ Binary files old/images/src/png/add_2_addentry_file.png and new/images/src/png/add_2_addentry_file.png differ Binary files old/images/src/png/add_2_editentry.png and new/images/src/png/add_2_editentry.png differ Binary files old/images/src/png/edit_2.png and new/images/src/png/edit_2.png differ Binary files old/images/src/png/report_config.png and new/images/src/png/report_config.png differ ++++++ apparmor-admin_en-html.tar.bz2 ++++++ ++++ 7805 lines of diff (skipped) ++++++ apparmor-admin_en.tar.bz2 ++++++ ++++ 7315 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ghostscript-library
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package ghostscript-library checked in at Sat Jun 3 01:04:17 CEST 2006. -------- --- ghostscript-library/ghostscript-library.changes 2006-05-17 19:58:21.000000000 +0200 +++ ghostscript-library/ghostscript-library.changes 2006-06-01 15:56:09.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 1 15:52:39 CEST 2006 - werner(a)suse.de + +- Update to espgs version 8.15.2 (unstripped:) + +------------------------------------------------------------------- ghostscript-mini.changes: same change Old: ---- espgs-8.15.2rc1-gdevijs-krgb-1.2.dif espgs-8.15.2rc1-pdfwrite.dif espgs-8.15.2rc1.dif espgs-8.15.2rc1.tar.bz2 New: ---- espgs-8.15.2.dif espgs-8.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostscript-library.spec ++++++ --- /var/tmp/diff_new_pack.Xd0KAx/_old 2006-06-03 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Xd0KAx/_new 2006-06-03 01:03:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ghostscript-library (Version 8.15.2rc1) +# spec file for package ghostscript-library (Version 8.15.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ %define fonts /usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/Type1 %define extnm 0 %define libgs 1 -%define GSVER 8.15.2rc1 +%define GSVER 8.15.2 %define GSMAIN 8.15 %define JPEG 6b %define PCL3VER 3.3 @@ -38,8 +38,8 @@ %endif # if ghostscript-mini Autoreqprov: on Summary: Necessary Files for Running Ghostscript -Version: 8.15.2rc1 -Release: 20 +Version: 8.15.2 +Release: 1 License: GPL, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: espgs-%{GSVER}.tar.bz2 @@ -62,10 +62,8 @@ Source40: fonts.scale.nimbus-sans-condensed Source50: glib-config Patch0: espgs-%{GSVER}.dif -Patch1: espgs-%{GSVER}-pdfwrite.dif -Patch2: espgs-%{GSVER}-pdfrange.dif -Patch3: espgs-%{GSVER}-gdevijs-krgb-1.2.dif -Patch4: espgs-%{GSVER}-pdfsec.dif +Patch1: espgs-8.15.2rc1-pdfrange.dif +Patch2: espgs-8.15.2rc1-pdfsec.dif Patch10: gimp-print-%{PRINT}.dif Patch11: gimp-print-%{PRINT}-pcl.dif Patch12: gimp-print-%{PRINT}-epson_horizontal_adjustment.patch @@ -206,7 +204,7 @@ %package -n libgimpprint Version: 4.2.7 -Release: 62 +Release: 63 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -221,7 +219,7 @@ %package -n libgimpprint-devel Version: 4.2.7 -Release: 62 +Release: 63 Requires: %install_info_prereq Summary: Gimp-Print Include Files Group: Development/Libraries/C and C++ @@ -340,10 +338,8 @@ } # # -%patch1 -p0 -b .pdfwrite -%patch2 -p0 -b .pdfrange -%patch3 -p0 -b .gdevijs -%patch4 -p0 -b .pdfsec +%patch1 -p0 -b .pdfrange +%patch2 -p0 -b .pdfsec %patch10 -p0 -b .stp %patch11 -p0 -b .stppcl %patch12 -p0 -b .escp2offset @@ -632,7 +628,8 @@ echo "%% ArialCyrMT, CourierCyrPS, TimesCyrMT, ERKurierKOI8-R" >> %{GSMAIN}/lib/Fontmap.rus sed 's@$@;@g' gs_rusfonts/fonts/Fontmap.ad >> %{GSMAIN}/lib/Fontmap.rus echo "" >> %{GSMAIN}/lib/Fontmap.rus - install -m 0444 gs_rusfonts/docs/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/ghostscript/ + mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/ghostscript-fonts-rus + install -m 0444 gs_rusfonts/docs/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/ghostscript-fonts-rus/ rm -rf gs_rusfonts/ popd # @@ -657,8 +654,31 @@ rm -rf ${RPM_BUILD_ROOT}/%{_mandir}/man1/ijsgimpprint.1* rm -rf ${RPM_BUILD_ROOT}/%{_mandir}/man8/cups-calibrate.8* %if "%name" == "ghostscript-mini" -rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/README.rusfonts -rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/rusps.txt +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-fonts-rus/README.rusfonts +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-fonts-rus/rusps.txt +%endif +%if "%name" == "ghostscript-mini" +mkdir -p ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-mini +cp -a ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/* \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-mini/ +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/ +ln -sf ghostscript-mini \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript +cp CHANGES LICENSE README doc/COPYING \ + ${RPM_BUILD_ROOT}/usr/share/ghostscript/%{GSMAIN}/doc/ +ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-mini/ +%else +mkdir -p ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library +cp -a ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/* \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/ +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/ +ln -sf ghostscript-library \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript +cp CHANGES LICENSE README doc/COPYING \ + ${RPM_BUILD_ROOT}/usr/share/ghostscript/%{GSMAIN}/doc/ +ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/ %endif # ############################################################## @@ -722,7 +742,6 @@ %files -f config.gs %defattr(-, root, root) -%doc CHANGES LICENSE README doc/COPYING %if "%name" == "ghostscript-mini" /usr/share/ghostscript/fonts /usr/X11R6/lib/X11/fonts/URW @@ -790,10 +809,26 @@ %doc /usr/share/ghostscript/%{GSMAIN}/doc/ %doc /usr/share/ghostscript/%{GSMAIN}/examples/ /usr/share/ghostscript/%{GSMAIN}/Resource/ -%doc %dir %{_defaultdocdir}/ghostscript -%doc %{_defaultdocdir}/ghostscript/catalog.devices -%doc %{_defaultdocdir}/ghostscript/doc -%doc %{_defaultdocdir}/ghostscript/examples +%doc %{_defaultdocdir}/ghostscript +%if "%name" == "ghostscript-mini" +%doc %dir %{_defaultdocdir}/ghostscript-mini/ +%doc %{_defaultdocdir}/ghostscript-mini/CHANGES +%doc %{_defaultdocdir}/ghostscript-mini/COPYING +%doc %{_defaultdocdir}/ghostscript-mini/LICENSE +%doc %{_defaultdocdir}/ghostscript-mini/README +%doc %{_defaultdocdir}/ghostscript-mini/catalog.devices +%doc %{_defaultdocdir}/ghostscript-mini/doc +%doc %{_defaultdocdir}/ghostscript-mini/examples +%else +%doc %dir %{_defaultdocdir}/ghostscript-library/ +%doc %{_defaultdocdir}/ghostscript-library/CHANGES +%doc %{_defaultdocdir}/ghostscript-library/COPYING +%doc %{_defaultdocdir}/ghostscript-library/LICENSE +%doc %{_defaultdocdir}/ghostscript-library/README +%doc %{_defaultdocdir}/ghostscript-library/catalog.devices +%doc %{_defaultdocdir}/ghostscript-library/doc +%doc %{_defaultdocdir}/ghostscript-library/examples +%endif %doc %{_mandir}/man1/dvipdf.1.gz %doc %{_mandir}/man1/e* %doc %{_mandir}/man1/font2c.1.gz @@ -989,8 +1024,9 @@ %files -n ghostscript-fonts-rus %defattr(0644,root,root,0755) -%doc %{_defaultdocdir}/ghostscript/README.rusfonts -%doc %{_defaultdocdir}/ghostscript/rusps.txt +%doc %dir %{_defaultdocdir}/ghostscript-fonts-rus/ +%doc %{_defaultdocdir}/ghostscript-fonts-rus/README.rusfonts +%doc %{_defaultdocdir}/ghostscript-fonts-rus/rusps.txt %dir /usr/share/ghostscript/fonts /usr/share/ghostscript/fonts/arial8.afm /usr/share/ghostscript/fonts/arial8.pfb @@ -1056,6 +1092,8 @@ %endif # if not ghostscript-mini %changelog -n ghostscript-library +* Thu Jun 01 2006 - werner(a)suse.de +- Update to espgs version 8.15.2 (unstripped:) * Wed May 17 2006 - schwab(a)suse.de - Don't strip binaries. * Thu Mar 09 2006 - werner(a)suse.de ++++++ ghostscript-mini.spec ++++++ --- /var/tmp/diff_new_pack.Xd0KAx/_old 2006-06-03 01:03:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Xd0KAx/_new 2006-06-03 01:03:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ghostscript-mini (Version 8.15.2rc1) +# spec file for package ghostscript-mini (Version 8.15.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ %define fonts /usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/Type1 %define extnm 0 %define libgs 0 -%define GSVER 8.15.2rc1 +%define GSVER 8.15.2 %define GSMAIN 8.15 %define JPEG 6b %define PCL3VER 3.3 @@ -38,8 +38,8 @@ %endif # if ghostscript-mini Autoreqprov: on Summary: SuSE internal replacement for ghostscript-library and ghostscript-any (Ghostscript) -Version: 8.15.2rc1 -Release: 19 +Version: 8.15.2 +Release: 1 License: GPL, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: espgs-%{GSVER}.tar.bz2 @@ -62,10 +62,8 @@ Source40: fonts.scale.nimbus-sans-condensed Source50: glib-config Patch0: espgs-%{GSVER}.dif -Patch1: espgs-%{GSVER}-pdfwrite.dif -Patch2: espgs-%{GSVER}-pdfrange.dif -Patch3: espgs-%{GSVER}-gdevijs-krgb-1.2.dif -Patch4: espgs-%{GSVER}-pdfsec.dif +Patch1: espgs-8.15.2rc1-pdfrange.dif +Patch2: espgs-8.15.2rc1-pdfsec.dif Patch10: gimp-print-%{PRINT}.dif Patch11: gimp-print-%{PRINT}-pcl.dif Patch12: gimp-print-%{PRINT}-epson_horizontal_adjustment.patch @@ -198,7 +196,7 @@ %package -n libgimpprint Version: 4.2.7 -Release: 62 +Release: 63 Summary: Gimp-Print libraries Group: Development/Libraries/C and C++ @@ -213,7 +211,7 @@ %package -n libgimpprint-devel Version: 4.2.7 -Release: 62 +Release: 63 Requires: %install_info_prereq Summary: Gimp-Print Include Files Group: Development/Libraries/C and C++ @@ -332,10 +330,8 @@ } # # -%patch1 -p0 -b .pdfwrite -%patch2 -p0 -b .pdfrange -%patch3 -p0 -b .gdevijs -%patch4 -p0 -b .pdfsec +%patch1 -p0 -b .pdfrange +%patch2 -p0 -b .pdfsec %patch10 -p0 -b .stp %patch11 -p0 -b .stppcl %patch12 -p0 -b .escp2offset @@ -624,7 +620,8 @@ echo "%% ArialCyrMT, CourierCyrPS, TimesCyrMT, ERKurierKOI8-R" >> %{GSMAIN}/lib/Fontmap.rus sed 's@$@;@g' gs_rusfonts/fonts/Fontmap.ad >> %{GSMAIN}/lib/Fontmap.rus echo "" >> %{GSMAIN}/lib/Fontmap.rus - install -m 0444 gs_rusfonts/docs/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/ghostscript/ + mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/ghostscript-fonts-rus + install -m 0444 gs_rusfonts/docs/* ${RPM_BUILD_ROOT}%{_defaultdocdir}/ghostscript-fonts-rus/ rm -rf gs_rusfonts/ popd # @@ -649,8 +646,31 @@ rm -rf ${RPM_BUILD_ROOT}/%{_mandir}/man1/ijsgimpprint.1* rm -rf ${RPM_BUILD_ROOT}/%{_mandir}/man8/cups-calibrate.8* %if "%name" == "ghostscript-mini" -rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/README.rusfonts -rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/rusps.txt +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-fonts-rus/README.rusfonts +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-fonts-rus/rusps.txt +%endif +%if "%name" == "ghostscript-mini" +mkdir -p ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-mini +cp -a ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/* \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-mini/ +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/ +ln -sf ghostscript-mini \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript +cp CHANGES LICENSE README doc/COPYING \ + ${RPM_BUILD_ROOT}/usr/share/ghostscript/%{GSMAIN}/doc/ +ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-mini/ +%else +mkdir -p ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library +cp -a ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/* \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/ +rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript/ +ln -sf ghostscript-library \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript +cp CHANGES LICENSE README doc/COPYING \ + ${RPM_BUILD_ROOT}/usr/share/ghostscript/%{GSMAIN}/doc/ +ln -sf ../../../ghostscript/8.15/doc/{CHANGES,LICENSE,README,COPYING} \ + ${RPM_BUILD_ROOT}/usr/share/doc/packages/ghostscript-library/ %endif # ############################################################## @@ -714,7 +734,6 @@ %files -f config.gs %defattr(-, root, root) -%doc CHANGES LICENSE README doc/COPYING %if "%name" == "ghostscript-mini" /usr/share/ghostscript/fonts /usr/X11R6/lib/X11/fonts/URW @@ -782,10 +801,26 @@ %doc /usr/share/ghostscript/%{GSMAIN}/doc/ %doc /usr/share/ghostscript/%{GSMAIN}/examples/ /usr/share/ghostscript/%{GSMAIN}/Resource/ -%doc %dir %{_defaultdocdir}/ghostscript -%doc %{_defaultdocdir}/ghostscript/catalog.devices -%doc %{_defaultdocdir}/ghostscript/doc -%doc %{_defaultdocdir}/ghostscript/examples +%doc %{_defaultdocdir}/ghostscript +%if "%name" == "ghostscript-mini" +%doc %dir %{_defaultdocdir}/ghostscript-mini/ +%doc %{_defaultdocdir}/ghostscript-mini/CHANGES +%doc %{_defaultdocdir}/ghostscript-mini/COPYING +%doc %{_defaultdocdir}/ghostscript-mini/LICENSE +%doc %{_defaultdocdir}/ghostscript-mini/README +%doc %{_defaultdocdir}/ghostscript-mini/catalog.devices +%doc %{_defaultdocdir}/ghostscript-mini/doc +%doc %{_defaultdocdir}/ghostscript-mini/examples +%else +%doc %dir %{_defaultdocdir}/ghostscript-library/ +%doc %{_defaultdocdir}/ghostscript-library/CHANGES +%doc %{_defaultdocdir}/ghostscript-library/COPYING +%doc %{_defaultdocdir}/ghostscript-library/LICENSE +%doc %{_defaultdocdir}/ghostscript-library/README +%doc %{_defaultdocdir}/ghostscript-library/catalog.devices +%doc %{_defaultdocdir}/ghostscript-library/doc +%doc %{_defaultdocdir}/ghostscript-library/examples +%endif %doc %{_mandir}/man1/dvipdf.1.gz %doc %{_mandir}/man1/e* %doc %{_mandir}/man1/font2c.1.gz @@ -981,8 +1016,9 @@ %files -n ghostscript-fonts-rus %defattr(0644,root,root,0755) -%doc %{_defaultdocdir}/ghostscript/README.rusfonts -%doc %{_defaultdocdir}/ghostscript/rusps.txt +%doc %dir %{_defaultdocdir}/ghostscript-fonts-rus/ +%doc %{_defaultdocdir}/ghostscript-fonts-rus/README.rusfonts +%doc %{_defaultdocdir}/ghostscript-fonts-rus/rusps.txt %dir /usr/share/ghostscript/fonts /usr/share/ghostscript/fonts/arial8.afm /usr/share/ghostscript/fonts/arial8.pfb @@ -1048,6 +1084,8 @@ %endif # if not ghostscript-mini %changelog -n ghostscript-mini +* Thu Jun 01 2006 - werner(a)suse.de +- Update to espgs version 8.15.2 (unstripped:) * Wed May 17 2006 - schwab(a)suse.de - Don't strip binaries. * Thu Mar 09 2006 - werner(a)suse.de ++++++ espgs-8.15.2rc1-gdevijs-krgb-1.2.dif -> espgs-8.15.2.dif ++++++ ++++ 3964 lines (skipped) ++++ between ghostscript-library/espgs-8.15.2rc1-gdevijs-krgb-1.2.dif ++++ and ghostscript-library/espgs-8.15.2.dif ++++++ espgs-8.15.2rc1.tar.bz2 -> espgs-8.15.2.tar.bz2 ++++++ ghostscript-library/espgs-8.15.2rc1.tar.bz2 ghostscript-library/espgs-8.15.2.tar.bz2 differ: char 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 zmd
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package zmd checked in at Sat Jun 3 01:03:33 CEST 2006. -------- --- zmd/zmd.changes 2006-06-01 19:17:57.000000000 +0200 +++ zmd/zmd.changes 2006-06-02 18:18:05.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jun 2 18:16:09 CEST 2006 - maw(a)suse.de + +- New source drop (r29634) which: +- Sees if we're updating ourself and, if so, delays the call to + ShutdownManager.allow(). This is so the client polling + the transaction can get the final status of the transaction + before we restart (#179413) +- An update is now apparently a resolvable with isntalled == 0 + && status = ResolvableStatus.Broken (#180698) +- Throws an exception if parse-meratadails and handles it correctly + where necessary (#181065). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.VvP78k/_old 2006-06-03 01:03:23.000000000 +0200 +++ /var/tmp/diff_new_pack.VvP78k/_new 2006-06-03 01:03:23.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 46 +Release: 47 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -159,6 +159,16 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Fri Jun 02 2006 - maw(a)suse.de +- New source drop (r29634) which: +- Sees if we're updating ourself and, if so, delays the call to + ShutdownManager.allow(). This is so the client polling + the transaction can get the final status of the transaction + before we restart (#179413) +- An update is now apparently a resolvable with isntalled == 0 + && status = ResolvableStatus.Broken (#180698) +- Throws an exception if parse-meratadails and handles it correctly + where necessary (#181065). * Thu Jun 01 2006 - maw(a)suse.de - New source drop (r29565) which: - Fixes #180392 ++++++ zmd-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/ChangeLog new/zmd-7.1.1.0/ChangeLog --- old/zmd-7.1.1.0/ChangeLog 2006-06-01 00:32:50.000000000 +0200 +++ new/zmd-7.1.1.0/ChangeLog 2006-06-01 23:16:05.000000000 +0200 @@ -1,3 +1,9 @@ +2006-06-01 James Willcox <james(a)ximian.com> + + * zmd.init.lsb.in: fix try-restart when zmd isn't running, and + make reload and force-reload do nothing, as HUP now restarts + the daemon. + 2006-05-23 Tambet Ingo <tambet(a)ximian.com> * SqliteClient/Makefile.am: Add SqliteException to build. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog --- old/zmd-7.1.1.0/modules/ChangeLog 2006-06-01 18:43:33.000000000 +0200 +++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-02 17:56:03.000000000 +0200 @@ -1,3 +1,29 @@ +2006-06-02 Chris Rivera <cmr(a)ximian.com> + + * linux/Transaction: See if we're updating ourself and delay the call + to ShutdownManager.Allow (). This is so the client polling the transaction + can get the final status of the transaction before we restart. This + fixes 179413. + +2006-06-02 Tambet Ingo <tambet(a)ximian.com> + + * linux/Pattern.cs (GetUpdates): + * linux/Patch.cs (GetUpdates): + * linux/Product.cs (GetUpdates): + + An update is now apparently a resolvable with + installed == 0 && status == ResolvableStatus.Broken. Fixes #180698. + + * linux/RedCarpetBackend.cs: Throw exception when parse-metadata fails. + Fixes #181065. + + * linux/NUService.cs: Remove useless String.Format(). + + * linux/YumService.cs: Fix the error message for when the metadata + parsing fails. + + * linux/ZyppService.cs: Catch exceptions when parsing metadata. + 2006-06-01 Chris Rivera <cmr(a)ximian.com> * linux/RemotePackageManager.cs: Sigh. s/GetPatchInfo/GetResolvableInfo/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/NUService.cs new/zmd-7.1.1.0/modules/linux/NUService.cs --- old/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-01 18:41:07.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-02 16:46:23.000000000 +0200 @@ -169,10 +169,10 @@ return; } } catch (Exception e) { - refreshProgress.Fail (e, String.Format ("Failed to parse XML metadata: " + e.Message)); + refreshProgress.Fail (e, "Failed to parse XML metadata: " + e.Message); } } else { - refreshProgress.Fail (String.Format ("Failed to download XML metadata: " + download.Message)); + refreshProgress.Fail ("Failed to download XML metadata: " + download.Message); } lock (this) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Patch.cs new/zmd-7.1.1.0/modules/linux/Patch.cs --- old/zmd-7.1.1.0/modules/linux/Patch.cs 2006-06-01 00:32:50.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/Patch.cs 2006-06-02 16:46:23.000000000 +0200 @@ -1,4 +1,5 @@ using System; +using System.Text; using System.Data; using Mono.Data.SqliteClient; using System.Collections; @@ -66,27 +67,12 @@ } public static Patch[] GetUpdates (Catalog catalog) { - Hashtable installedNames = new Hashtable (); - Hashtable updateNames = new Hashtable (); + StringBuilder sb = new StringBuilder (GetSqlQuery ()); + sb.AppendFormat (" WHERE installed = 0 AND status = {0}", (int) ResolvableStatus.Broken); + if (catalog != null) + sb.AppendFormat (" AND catalog = '{0}'", catalog.Id); - foreach (Patch p in Query ("IsInstalled", "is", true)) { - installedNames[p.Name] = p; - } - - Patch[] patches = (catalog == null) ? GetAll () : GetByCatalog (catalog); - foreach (Patch p in patches) { - Patch old = installedNames[p.Name] as Patch; - Patch oldUpdate = updateNames[p.Name] as Patch; - - if (p.Status == ResolvableStatus.Broken) { - updateNames[p.Name] = p; - } else if (old != null && p.CompareTo (old) > 0 && - (oldUpdate == null || p.CompareTo (oldUpdate) > 0)) { - updateNames[p.Name] = p; - } - } - - return (Patch[]) new ArrayList (updateNames.Values).ToArray (typeof (Patch)); + return GetPatches (sb.ToString ()); } // Start of SQL madness^w methods diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Pattern.cs new/zmd-7.1.1.0/modules/linux/Pattern.cs --- old/zmd-7.1.1.0/modules/linux/Pattern.cs 2006-06-01 00:32:50.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/Pattern.cs 2006-06-02 16:46:23.000000000 +0200 @@ -1,4 +1,5 @@ using System; +using System.Text; using System.Data; using Mono.Data.SqliteClient; using System.Collections; @@ -36,30 +37,16 @@ } public static Pattern[] GetUpdates () { - Hashtable installedNames = new Hashtable (); - Hashtable updateNames = new Hashtable (); - - Pattern[] all = GetAll (); - - foreach (Pattern p in all) { - if (p.IsInstalled) { - installedNames[p.Name] = p; - } - } + return GetUpdates (null); + } - foreach (Pattern p in all) { - Pattern old = installedNames[p.Name] as Pattern; - Pattern oldUpdate = updateNames[p.Name] as Pattern; - - if (p.Status == ResolvableStatus.Broken) { - updateNames[p.Name] = p; - } else if (old != null && p.CompareTo (old) > 0 && - (oldUpdate == null || p.CompareTo (oldUpdate) > 0)) { - updateNames[p.Name] = p; - } - } + public static Pattern[] GetUpdates (Catalog catalog) { + StringBuilder sb = new StringBuilder (GetSqlQuery ()); + sb.AppendFormat (" WHERE installed = 0 AND status = {0}", (int) ResolvableStatus.Broken); + if (catalog != null) + sb.AppendFormat (" AND catalog = '{0}'", catalog.Id); - return (Pattern[]) new ArrayList (updateNames.Values).ToArray (typeof (Pattern)); + return GetPatterns (sb.ToString ()); } // Start of SQL madness^w methods diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Product.cs new/zmd-7.1.1.0/modules/linux/Product.cs --- old/zmd-7.1.1.0/modules/linux/Product.cs 2006-06-01 00:32:50.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/Product.cs 2006-06-02 16:46:23.000000000 +0200 @@ -1,4 +1,5 @@ using System; +using System.Text; using System.Data; using Mono.Data.SqliteClient; using System.Collections; @@ -35,30 +36,16 @@ } public static Product[] GetUpdates () { - Hashtable installedNames = new Hashtable (); - Hashtable updateNames = new Hashtable (); - - Product[] all = GetAll (); - - foreach (Product p in all) { - if (p.IsInstalled) { - installedNames[p.Name] = p; - } - } + return GetUpdates (null); + } - foreach (Product p in all) { - Product old = installedNames[p.Name] as Product; - Product oldUpdate = updateNames[p.Name] as Product; - - if (p.Status == ResolvableStatus.Broken) { - updateNames[p.Name] = p; - } else if (old != null && p.CompareTo (old) > 0 && - (oldUpdate == null || p.CompareTo (oldUpdate) > 0)) { - updateNames[p.Name] = p; - } - } + public static Product[] GetUpdates (Catalog catalog) { + StringBuilder sb = new StringBuilder (GetSqlQuery ()); + sb.AppendFormat (" WHERE installed = 0 AND status = {0}", (int) ResolvableStatus.Broken); + if (catalog != null) + sb.AppendFormat (" AND catalog = '{0}'", catalog.Id); - return (Product[]) new ArrayList (updateNames.Values).ToArray (typeof (Product)); + return GetProducts (sb.ToString ()); } // Start of SQL madness^w methods diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs --- old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-01 01:12:25.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-02 16:46:23.000000000 +0200 @@ -276,6 +276,8 @@ RCProgress progress = new RCProgress (); progress.Start (info); progress.WaitForStop (); + if (progress.Status == ProgressStatus.Failed) + throw new ZenException (progress.Message); } finally { Database.ReleaseLock (false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Transaction.cs new/zmd-7.1.1.0/modules/linux/Transaction.cs --- old/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-06-01 00:32:50.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-06-02 17:51:24.000000000 +0200 @@ -50,6 +50,7 @@ private TransactionFlags flags; private PackageHistoryFile[] restoreFiles; private ArrayList logEntries = new ArrayList (); + private bool delayShutdownAllow; public static void Block () { Block (true); @@ -139,16 +140,28 @@ if (installs != null) { foreach (IResolvable res in installs) { Package pkg = res as Package; - if (pkg != null && pkg.FileName == null) + if (pkg == null) + continue; + + if (pkg.FileName == null) list.Add (pkg); + + if (pkg.Name == "zmd") + delayShutdownAllow = true; } } if (upgrades != null) { foreach (IResolvable res in upgrades) { Package pkg = res as Package; - if (pkg != null && pkg.FileName == null) + if (pkg == null) + continue; + + if (pkg.FileName == null) list.Add (pkg); + + if (pkg.Name == "zmd") + delayShutdownAllow = true; } } @@ -314,6 +327,14 @@ } catch (Exception e) { throw e; } finally { + if (delayShutdownAllow) { + /* + * if we are updating ourself then we need to give the clients enought time + * to ask for the result of the transaction + */ + Thread.Sleep (5000); + } + ShutdownManager.Allow (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/YumService.cs new/zmd-7.1.1.0/modules/linux/YumService.cs --- old/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-01 18:41:07.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-02 16:46:23.000000000 +0200 @@ -185,7 +185,7 @@ refreshProgress.Finish (); } catch (Exception e) { - refreshProgress.Fail (e.Message); + refreshProgress.Fail (e, "Failed to parse XML metadata: " + e.Message); } finally { lock (this) { refreshProgress = null; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ZyppService.cs new/zmd-7.1.1.0/modules/linux/ZyppService.cs --- old/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-01 18:41:07.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-02 16:46:23.000000000 +0200 @@ -130,13 +130,17 @@ } private void DoRefresh () { - Backend.Current.ParseMetadata ("zypp", typeof (ZyppPackage), uri, uri, catalog); - BundleManager.Add (catalog); - RedCarpetBackend.UpdatePatchStatus (); + try { + Backend.Current.ParseMetadata ("zypp", typeof (ZyppPackage), uri, uri, catalog); + BundleManager.Add (catalog); + RedCarpetBackend.UpdatePatchStatus (); - lock (this) { - refreshProgress.Finish (); - refreshProgress = null; + lock (this) { + refreshProgress.Finish (); + refreshProgress = null; + } + } catch (Exception e) { + refreshProgress.Fail (e, "Failed to parse XML metadata: " + e.Message); } } } Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po --- old/zmd-7.1.1.0/po/de_DE.po 2006-06-01 19:04:51.000000000 +0200 +++ new/zmd-7.1.1.0/po/de_DE.po 2006-06-02 17:56:58.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-01 13:04-0400\n" +"POT-Creation-Date: 2006-06-02 11:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -144,17 +144,17 @@ msgid "Aborted" msgstr "Abgebrochen" -#: modules/linux/Transaction.cs:62 +#: modules/linux/Transaction.cs:63 #, fuzzy msgid "A transaction is already in progress" msgstr "Eine andere Transaktion wird bereits ausgeführt." -#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "'{0}' ist bereits installiert." -#: modules/linux/Transaction.cs:263 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po --- old/zmd-7.1.1.0/po/en_US.po 2006-06-01 19:04:51.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_US.po 2006-06-02 17:56:59.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-01 13:04-0400\n" +"POT-Creation-Date: 2006-06-02 11:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -142,17 +142,17 @@ msgid "Aborted" msgstr "Aborted" -#: modules/linux/Transaction.cs:62 +#: modules/linux/Transaction.cs:63 #, fuzzy msgid "A transaction is already in progress" msgstr "Another transaction is already in progress" -#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "'{0}' is already installed." -#: modules/linux/Transaction.cs:263 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po --- old/zmd-7.1.1.0/po/es_ES.po 2006-06-01 19:04:52.000000000 +0200 +++ new/zmd-7.1.1.0/po/es_ES.po 2006-06-02 17:56:59.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-01 13:04-0400\n" +"POT-Creation-Date: 2006-06-02 11:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -146,17 +146,17 @@ msgid "Aborted" msgstr "Abortados" -#: modules/linux/Transaction.cs:62 +#: modules/linux/Transaction.cs:63 #, fuzzy msgid "A transaction is already in progress" msgstr "Hay otra transacción en proceso" -#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "'{0}' ya instalado." -#: modules/linux/Transaction.cs:263 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po --- old/zmd-7.1.1.0/po/fr_FR.po 2006-06-01 19:04:52.000000000 +0200 +++ new/zmd-7.1.1.0/po/fr_FR.po 2006-06-02 17:56:59.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-01 13:04-0400\n" +"POT-Creation-Date: 2006-06-02 11:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -146,17 +146,17 @@ msgid "Aborted" msgstr "Abandonné" -#: modules/linux/Transaction.cs:62 +#: modules/linux/Transaction.cs:63 #, fuzzy msgid "A transaction is already in progress" msgstr "Une autre transaction est déjà en cours" -#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "'{0}' est déjà installé." -#: modules/linux/Transaction.cs:263 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po --- old/zmd-7.1.1.0/po/pt_BR.po 2006-06-01 19:04:52.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt_BR.po 2006-06-02 17:56:59.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-01 13:04-0400\n" +"POT-Creation-Date: 2006-06-02 11:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -143,17 +143,17 @@ msgid "Aborted" msgstr "Anulado" -#: modules/linux/Transaction.cs:62 +#: modules/linux/Transaction.cs:63 #, fuzzy msgid "A transaction is already in progress" msgstr "Já existe outra transação em andamento" -#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, fuzzy, csharp-format msgid "Package {0} is already installed." msgstr "'{0}' já está instalado." -#: modules/linux/Transaction.cs:263 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot --- old/zmd-7.1.1.0/po/zmd.pot 2006-06-01 19:04:51.000000000 +0200 +++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-02 17:56:58.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-01 13:04-0400\n" +"POT-Creation-Date: 2006-06-02 11:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -141,16 +141,16 @@ msgid "Aborted" msgstr "" -#: modules/linux/Transaction.cs:62 +#: modules/linux/Transaction.cs:63 msgid "A transaction is already in progress" msgstr "" -#: modules/linux/Transaction.cs:218 modules/linux/Transaction.cs:227 +#: modules/linux/Transaction.cs:231 modules/linux/Transaction.cs:240 #, csharp-format msgid "Package {0} is already installed." msgstr "" -#: modules/linux/Transaction.cs:263 +#: modules/linux/Transaction.cs:276 #, csharp-format msgid "Can not download package {0}." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/zmd.init.lsb.in new/zmd-7.1.1.0/zmd.init.lsb.in --- old/zmd-7.1.1.0/zmd.init.lsb.in 2006-06-01 00:32:50.000000000 +0200 +++ new/zmd-7.1.1.0/zmd.init.lsb.in 2006-06-01 23:16:04.000000000 +0200 @@ -15,7 +15,7 @@ # Visit http://www.novell.com for more information. ### END INIT INFO -# $Id: zmd.init.lsb.in 28280 2006-05-11 23:09:56Z thunder $ +# $Id: zmd.init.lsb.in 29585 2006-06-01 19:01:37Z james $ # Source SuSE config PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -121,12 +121,7 @@ rc_status ;; reload) - echo -n "Reload ZENworks Management Daemon" - - if check_running; then \ - kill -HUP `cat /var/run/zmd.pid` - fi - + rc_failed 3 rc_status -v ;; status) @@ -140,13 +135,16 @@ rc_status -v ;; force-reload) - $0 restart + rc_failed 3 + rc_status -v ;; try-restart) echo -n "Restarting ZENworks Management Daemon: " if check_running; then \ kill -HUP `cat /var/run/zmd.pid` + else + $0 restart fi rc_status -v @@ -157,7 +155,7 @@ fi ;; *) - echo "Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload|showpid}" + echo "Usage: $0 {start|stop|status|restart|try-restart|showpid}" exit 1 ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zen-updater
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package zen-updater checked in at Sat Jun 3 01:03:30 CEST 2006. -------- --- zen-updater/zen-updater.changes 2006-06-01 19:20:14.000000000 +0200 +++ zen-updater/zen-updater.changes 2006-06-02 18:22:24.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 2 18:20:35 CEST 2006 - maw(a)suse.de + +- New source drop (r29631) which: +- Makes sure the select label is set insensitive in zen-installer + and zen-updater, and makes sure we always pass an absolute path + to QueryLocalFile() (#181062) +- Implements a timeout for pulling content from zmd. IF zmd is + restarting after a transactino we'll need this (helps with + #179413) +- Gets rid of the GLib idle handler. We were always talking to + zmd in the gtk main thread, which was causing small delays when + updating the UI (helps with #173383) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zen-updater.spec ++++++ --- /var/tmp/diff_new_pack.ffn06X/_old 2006-06-03 01:03:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ffn06X/_new 2006-06-03 01:03:20.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: glib-sharp2 gtk-sharp2 gtk2-devel log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files zmd-devel URL: http://novell.com/ Version: 7.1.0 -Release: 55 +Release: 56 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 @@ -70,6 +70,17 @@ %{_mandir}/*/* %changelog -n zen-updater +* Fri Jun 02 2006 - maw(a)suse.de +- New source drop (r29631) which: +- Makes sure the select label is set insensitive in zen-installer + and zen-updater, and makes sure we always pass an absolute path + to QueryLocalFile() (#181062) +- Implements a timeout for pulling content from zmd. IF zmd is + restarting after a transactino we'll need this (helps with + [#179413]) +- Gets rid of the GLib idle handler. We were always talking to + zmd in the gtk main thread, which was causing small delays when + updating the UI (helps with #173383) * Thu Jun 01 2006 - maw(a)suse.de - New source drop (r29516) which: - Adjusts a few key/digest messages ++++++ zen-updater-7.1.0.tar.bz2 ++++++ ++++ 15478 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-printer
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-printer checked in at Sat Jun 3 01:03:29 CEST 2006. -------- --- yast2-printer/yast2-printer.changes 2006-05-11 16:38:36.000000000 +0200 +++ yast2-printer/yast2-printer.changes 2006-06-02 18:54:21.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 18:41:25 CEST 2006 - mzugec(a)suse.cz + +- fixed #169750 - media size not saved properly + +------------------------------------------------------------------- Old: ---- yast2-printer-2.13.16.tar.bz2 New: ---- yast2-printer-2.13.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.81AwLc/_old 2006-06-03 01:03:22.000000000 +0200 +++ /var/tmp/diff_new_pack.81AwLc/_new 2006-06-03 01:03:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.13.16) +# spec file for package yast2-printer (Version 2.13.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-printer -Version: 2.13.16 +Version: 2.13.17 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.13.16.tar.bz2 +Source0: yast2-printer-2.13.17.tar.bz2 prefix: /usr BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 netcat zlib blocxx @@ -33,7 +33,7 @@ %prep -%setup -n yast2-printer-2.13.16 +%setup -n yast2-printer-2.13.17 %build %{prefix}/bin/y2tool y2autoconf @@ -100,6 +100,8 @@ %doc %{prefix}/share/doc/packages/yast2-printer %changelog -n yast2-printer +* Fri Jun 02 2006 - mzugec(a)suse.cz +- fixed #169750 - media size not saved properly * Thu May 11 2006 - mzugec(a)suse.cz - fixed #172856 - wrong encoding * Thu May 11 2006 - mzugec(a)suse.cz ++++++ yast2-printer-2.13.16.tar.bz2 -> yast2-printer-2.13.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/VERSION new/yast2-printer-2.13.17/VERSION --- old/yast2-printer-2.13.16/VERSION 2006-05-11 16:36:12.000000000 +0200 +++ new/yast2-printer-2.13.17/VERSION 2006-06-02 18:39:35.000000000 +0200 @@ -1 +1 @@ -2.13.16 +2.13.17 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/agents/Makefile.am new/yast2-printer-2.13.17/agents/Makefile.am --- old/yast2-printer-2.13.16/agents/Makefile.am 2006-04-14 09:25:56.000000000 +0200 +++ new/yast2-printer-2.13.17/agents/Makefile.am 2006-06-02 18:48:49.000000000 +0200 @@ -1,10 +1,10 @@ # # Makefile.am for y2c_prnt/agents # -# $Id: Makefile.am 30130 2006-04-14 07:25:44Z mzugec $ +# $Id: Makefile.am 31303 2006-06-02 16:46:50Z mzugec $ # scrconf_DATA = $(wildcard *.scr) -agent_SCRIPTS = ag_smb_queues ag_ppd_file_modify ag_paper_size +agent_SCRIPTS = ag_smb_queues ag_ppd_file_modify EXTRA_DIST = $(scrconf_DATA) $(agent_SCRIPTS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/agents/Makefile.in new/yast2-printer-2.13.17/agents/Makefile.in --- old/yast2-printer-2.13.16/agents/Makefile.in 2006-05-11 16:21:48.000000000 +0200 +++ new/yast2-printer-2.13.17/agents/Makefile.in 2006-06-02 18:49:12.000000000 +0200 @@ -17,7 +17,7 @@ # # Makefile.am for y2c_prnt/agents # -# $Id: Makefile.am 30130 2006-04-14 07:25:44Z mzugec $ +# $Id: Makefile.am 31303 2006-06-02 16:46:50Z mzugec $ # @@ -220,7 +220,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ scrconf_DATA = $(wildcard *.scr) -agent_SCRIPTS = ag_smb_queues ag_ppd_file_modify ag_paper_size +agent_SCRIPTS = ag_smb_queues ag_ppd_file_modify EXTRA_DIST = $(scrconf_DATA) $(agent_SCRIPTS) all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/agents/ag_paper_size new/yast2-printer-2.13.17/agents/ag_paper_size --- old/yast2-printer-2.13.16/agents/ag_paper_size 2006-04-26 18:20:19.000000000 +0200 +++ new/yast2-printer-2.13.17/agents/ag_paper_size 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -#!/bin/bash - -function get_paper () { - ( - . /etc/sysconfig/language &> /dev/null - read h w r < <(LANG=$RC_LANG LC_ALL=$RC_LC_ALL LC_PAPER=$RC_LC_PAPER locale -k LC_PAPER) - case "$h" in - height=297) echo "\$[\"value\":\"A4\"]" ;; - height=279) echo "\$[\"value\":\"Letter\"]" ;; - *) echo "\$[\"value\":\"\"]";; - esac - ) -} - -while true ; do -read COMMAND || exit - # strip leading backquote introduced by NI - COMMAND=${COMMAND#\`} - - case "$COMMAND" in - "result ("*) - exit - ;; - "Read ("*) - get_paper - ;; - *) - echo nil - - esac - done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/agents/paper_size.scr new/yast2-printer-2.13.17/agents/paper_size.scr --- old/yast2-printer-2.13.16/agents/paper_size.scr 2006-04-13 16:35:55.000000000 +0200 +++ new/yast2-printer-2.13.17/agents/paper_size.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -.ppd.paper_size - -`ag_paper_size () - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/configure new/yast2-printer-2.13.17/configure --- old/yast2-printer-2.13.16/configure 2006-05-11 16:21:38.000000000 +0200 +++ new/yast2-printer-2.13.17/configure 2006-06-02 18:08:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.15. +# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.16. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.13.15' -PACKAGE_STRING='yast2-printer 2.13.15' +PACKAGE_VERSION='2.13.16' +PACKAGE_STRING='yast2-printer 2.13.16' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -959,7 +959,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 yast2-printer 2.13.15 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.13.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1026,7 +1026,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.13.15:";; + short | recursive ) echo "Configuration of yast2-printer 2.13.16:";; esac cat <<\_ACEOF @@ -1169,7 +1169,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.13.15 +yast2-printer configure 2.13.16 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1183,7 +1183,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-printer $as_me 2.13.15, which was +It was created by yast2-printer $as_me 2.13.16, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1913,7 +1913,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.13.15' + VERSION='2.13.16' cat >>confdefs.h <<_ACEOF @@ -2124,7 +2124,7 @@ -VERSION="2.13.15" +VERSION="2.13.16" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -21730,7 +21730,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-printer $as_me 2.13.15, which was +This file was extended by yast2-printer $as_me 2.13.16, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21793,7 +21793,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-printer config.status 2.13.15 +yast2-printer config.status 2.13.16 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/configure.in new/yast2-printer-2.13.17/configure.in --- old/yast2-printer-2.13.16/configure.in 2006-05-11 16:21:18.000000000 +0200 +++ new/yast2-printer-2.13.17/configure.in 2006-06-02 18:07:58.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.13.15, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.13.16, http://bugs.opensuse.org/, yast2-printer) 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.13.15" +VERSION="2.13.16" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/src/common/dialogs-connection.ycp new/yast2-printer-2.13.17/src/common/dialogs-connection.ycp --- old/yast2-printer-2.13.16/src/common/dialogs-connection.ycp 2006-04-14 09:25:57.000000000 +0200 +++ new/yast2-printer-2.13.17/src/common/dialogs-connection.ycp 2006-06-02 18:48:49.000000000 +0200 @@ -9,7 +9,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs-connection.ycp 30130 2006-04-14 07:25:44Z mzugec $ + * $Id: dialogs-connection.ycp 31303 2006-06-02 16:46:50Z mzugec $ * */ { @@ -207,36 +207,36 @@ define symbol runGenericConnectionTypeDialog (term items, string caption, string frame, string help, symbol what) ``{ + term contents = `VBox(); - term contents = `VBox ( + if ( size(caption)==0 || size(frame)==0 ) + { + contents = `VBox ( `VSpacing (2), `HBox ( `HSpacing (5), - `Frame ( - frame, `VBox ( `RadioButtonGroup (`id (`connection_type), items), `VSpacing (1) - ) - ), + ), `HSpacing (5) ), `VSpacing (2) ); - - if (caption==nil || frame==nil) - { - contents = `VBox ( + } else contents = `VBox ( `VSpacing (2), `HBox ( `HSpacing (5), + `Frame ( + frame, `VBox ( `RadioButtonGroup (`id (`connection_type), items), `VSpacing (1) - ), + ) + ), `HSpacing (5) ), `VSpacing (2) ); - } + // dialog caption Wizard::SetContentsButtons (caption, contents, @@ -309,7 +309,6 @@ * @return symbol wizard sequencer symbol */ define symbol runNewQueueDialog() ``{ - list<term> printers = []; term contents = `VBox(); if (Spooler::Get () == "cups") @@ -360,7 +359,6 @@ } } - if (is(ret, integer)) { integer from_detect = -1; @@ -456,9 +454,9 @@ )); } // dialog caption - any ret = runGenericConnectionTypeDialog (items, nil, //_("Printer Type"), + any ret = runGenericConnectionTypeDialog (items, "", //_("Printer Type"), // frame label - nil, //_("Printer Type"), + "", //_("Printer Type"), getConnectionTypeHelp (add_queue), `connection_type); if (ret == `lpd) Printer::printer["proposed_raw"] = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/src/common/dialogs.ycp new/yast2-printer-2.13.17/src/common/dialogs.ycp --- old/yast2-printer-2.13.16/src/common/dialogs.ycp 2006-04-28 13:16:12.000000000 +0200 +++ new/yast2-printer-2.13.17/src/common/dialogs.ycp 2006-06-02 18:48:49.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Petr Blahos <pblahos(a)suse.cz> * - * $Id: dialogs.ycp 30573 2006-04-28 11:16:06Z mzugec $ + * $Id: dialogs.ycp 31303 2006-06-02 16:46:50Z mzugec $ * Main dialogs. */ { @@ -243,6 +243,20 @@ { ret = `next_propose_queues; } + +map ppd_options = Printer::printer["ppd_options"]:$[]; + + if (ppd_options == $[]) { + string ps = Printer::getPaperSize(); + ppd_options = $["PageSize":ps, + "PageRegion":ps, + "ImageableArea":ps, + "PaperDimension":ps]; + } + Printer::printer["ppd_options"]=ppd_options; + + + } y2milestone ("Returning %1, printer set to %2", ret, Printer::printer); return ret; @@ -1061,6 +1075,22 @@ return ret; } +/* +void saveOptions(){ + // fixed #164851 - check for conflict choices in PPD + string src_ppd = Printer::printer["ppd"]:""; + string dst_ppd = (string)SCR::Read (.target.tmpdir) + "/patched_ppd_" + Printer::printer["name"]:""; + SCR::Write (.ppd.file.modify,[src_ppd, dst_ppd, Printer::printer["ppd_options"]:$[]]); + string warning = parseWarn( ((map<string, any>)SCR::Execute(.target.bash_output, + "cupstestppd $PPD", $["PPD":dst_ppd]))["stdout"]:""); + SCR::Execute(.target.remove, dst_ppd); + if (size(warning)>0){ + Popup::Error(warning); + } + +} +*/ + /** * Configuration of the filter. It is quite complicated because there can * be depended options so change of value (lower list) can change content @@ -1100,9 +1130,9 @@ // check locales (for printer size) only for new queue, not modified boolean checkLocales = true; - foreach(map<string, any> row, Printer::printcap, { - if (Printer::printer["name"]:"" == row["name"]:"") checkLocales = false; - }); +// foreach(map<string, any> row, Printer::printcap, { +// if (Printer::printer["name"]:"" == row["name"]:"") checkLocales = false; +// }); list<map> optlist = Printerdb::getPpdFileOptions (filename, checkLocales); // and now add options without their location in PPD file @@ -1323,7 +1353,7 @@ Printer::printer["options"] = selected; Printer::printer["ppd_options"] = ppd_selected; - +/* // fixed #164851 - check for conflict choices in PPD string src_ppd = Printer::printer["ppd"]:""; string dst_ppd = (string)SCR::Read (.target.tmpdir) + "/patched_ppd_" + Printer::printer["name"]:""; @@ -1334,8 +1364,8 @@ if (size(warning)>0){ Popup::Error(warning); } - - +*/ +//saveOptions(); } return (symbol)ret; @@ -1360,7 +1390,19 @@ boolean know = conf_type || Printer::printer["type"]:"yast2" == "non-yast-now"; boolean raw = Printer::printer["raw"]:false; string model = Printer::printer["detected", "ppd_info", "model"]:""; //["device"]:""; - + map ppd_options = Printer::printer["ppd_options"]:$[]; +/* + if (ppd_options == $[]) { + string ps = Printer::getPaperSize(); + ppd_options = $["PageSize":ps, + "PageRegion":ps, + "ImageableArea":ps, + "PaperDimension":ps]; + } + Printer::printer["ppd_options"]=ppd_options; +y2internal("Printer %1", Printer::printer); +*/ +//saveOptions(); // // texts // @@ -1412,7 +1454,7 @@ if (! raw) { // table entry - items = add (items, `item (`id (`settings), _("Filter settings"), "")); + items = add (items, `item (`id (`settings), _("Filter settings"), ppd_options["PageSize"]:""+" ...")); // table entry items = add (items, `item (`id (`perm), _("Restriction settings"), "")); // table entry @@ -1877,7 +1919,7 @@ // new queue to existing printer if (Printer::runAutoprobedListDialog__current == "-2") { - y2milestone ("Configuring queue for isntalled printer"); + y2milestone ("Configuring queue for installed printer"); return `installed_printer; } // not detected printer @@ -2309,51 +2351,9 @@ { Printer::selectPrinter(-1); ret = `configure_button; -/* - if (new_spooler == "cups") - { - if ( size(Printer::printcap)>0 && true == Popup::AnyQuestion( Label::WarningMsg(), - // message box : configure new queue or add a new printer - "Do want to configure new queue ?", "Yes", "No", `focus_no )) { - integer from_detect = -1; - integer count = 0; - string prn_id=""; - foreach(map<string, any> temp_printer, Printer::Detect(), { - string temp_string = splitstring(temp_printer["uri"]:"", ":")[1]:""; - if (tointeger(selected) >= count) - { - if (temp_string == Printer::conf_unconf_printers[tointeger(selected), "ID"]:"") - { - from_detect = from_detect + 1; - break; - } - if (temp_string != prn_id) - { - from_detect = from_detect+1; - prn_id = temp_printer["ID"]:""; - } - count=count + 1; - } - - }); - map <string, any> tmp_map = Printer::Detect()[from_detect]:$[]; - Printer::editDetected(tmp_map); - y2milestone("Configuring detected, non-configured printer"); - ret = `edit_button; - } - else - { - Printer::selectPrinter(-1); - ret = `configure_button; - } - } else { - continue; - } -*/ - } - if (ret == `edit) - { + if (ret == `edit) + { if (new_spooler == "cups") { if (Printer::printer == $["type":"yast2"]) @@ -2386,7 +2386,7 @@ if (Printer::printer["ppd_info", "model"]:nil == nil) ret=`edit_unconf; else ret = `edit_button; } else ret=`connection_cups; - } + } else if (ret == `redetect) ret = `restart_button; cont = false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/src/common/misc.ycp new/yast2-printer-2.13.17/src/common/misc.ycp --- old/yast2-printer-2.13.16/src/common/misc.ycp 2006-05-11 16:37:18.000000000 +0200 +++ new/yast2-printer-2.13.17/src/common/misc.ycp 2006-06-02 18:48:49.000000000 +0200 @@ -12,7 +12,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> 2002 * - * $Id: misc.ycp 30871 2006-05-11 14:37:03Z mzugec $ + * $Id: misc.ycp 31303 2006-06-02 16:46:50Z mzugec $ * * Miscelaneous defines. */ @@ -96,7 +96,7 @@ map composite = $[]; if (found) composite = opts[ind]:$[]; - string pagesize = Printerlib::getDefaultPaperSize () == `a4 + string pagesize = Printer::getPaperSize () == "A4" ? "A4" : "Letter"; if (composite != $[]) @@ -177,7 +177,7 @@ map options = p["ppd_options"]:$[]; if (haskey (options, "PageSize")) return p; - string pagesize = Printerlib::getDefaultPaperSize () == `a4 ? "A4" : "Letter"; + string pagesize = Printer::getPaperSize (); options["PageSize"] = pagesize; options["PageRegion"] = pagesize; options["ImageableArea"] = pagesize; @@ -219,7 +219,6 @@ printers = add (printers, p); } }); - return printers; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/src/common/wizards.ycp new/yast2-printer-2.13.17/src/common/wizards.ycp --- old/yast2-printer-2.13.16/src/common/wizards.ycp 2006-03-21 08:59:06.000000000 +0100 +++ new/yast2-printer-2.13.17/src/common/wizards.ycp 2006-06-02 18:48:49.000000000 +0200 @@ -9,7 +9,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: wizards.ycp 29005 2006-03-15 13:49:42Z mzugec $ + * $Id: wizards.ycp 31303 2006-06-02 16:46:50Z mzugec $ */ { textdomain "printer"; @@ -298,24 +298,6 @@ `queue : "inst_printer", `other : "connection_other", ], -/* - "connection_type" : $[ - `edit_button : "edit_printer_wz", - `parallel : "parallel", - `serial: "serial", - `usb: "usb", - `irda: "irda", - `bluetooth: "bluetooth", - `cups : "connection_cups", - `lpd : "lpd", - `smb : "samba", - `ipx : "novell", - `direct : "connection_direct", - `queue : "inst_printer", - `other : "connection_other", - `abort : `abort, - ], -*/ "edit_printer_wz": $[ `next: `next, `abort : `abort, @@ -340,10 +322,6 @@ `uri : "other", `abort : `abort, ], -// "new_queue" : $[ -// `abort : `abort -// ], - // single connection types "parallel" : $[ `next : "name_auto", `abort : `abort, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.16/src/modules/Printer.ycp new/yast2-printer-2.13.17/src/modules/Printer.ycp --- old/yast2-printer-2.13.16/src/modules/Printer.ycp 2006-05-04 13:28:03.000000000 +0200 +++ new/yast2-printer-2.13.17/src/modules/Printer.ycp 2006-06-02 18:48:49.000000000 +0200 @@ -12,7 +12,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: Printer.ycp 30684 2006-05-04 11:26:07Z locilka $ + * $Id: Printer.ycp 31303 2006-06-02 16:46:50Z mzugec $ * * Well we all know what modules are for. */ @@ -125,6 +125,27 @@ */ global list<map<string,any> > autodetected = []; + string default_paper_size = nil; + +global string getPaperSize(){ + + if(default_paper_size == nil){ + string p_size="A4"; + map <string, any> output = (map <string, any>) SCR::Execute (.target.bash_output, + ". /etc/sysconfig/language >/dev/null + h=$(locale -k LC_PAPER|grep height) + case $h in + height=297) echo 'A4' ;; + height=279) echo 'Letter' ;; + *) echo 'nil';; + esac", $[]); + if (output["exit"]:0==0) p_size = (splitstring(output["stdout"]:"", "\n"))[0]:""; + default_paper_size = p_size; + } + + return default_paper_size; +} + /** * List of unique keys of the printers read at the beginning. @@ -1215,6 +1236,8 @@ printcap = maplist (map<string,any> e, printcap,``{return assignState (e, false);}); + default_paper_size = getPaperSize(); + y2milestone("Default paper size is %1", default_paper_size); if (!skip_autodetection) { Progress::NextStageStep (16); // step 16-19 - autodetection @@ -2018,7 +2041,6 @@ return; // settings are read and hw is detected list<string> forbidden_names = getForbiddenNames (); - symbol page_size = Printerlib::getDefaultPaperSize (); foreach (map i, autodetected, ``{ if (!alreadyConfigured (i["unique_key"]:"")) { @@ -2048,10 +2070,7 @@ foreach (string paperentry, ["ImageableArea", "PageRegion", "PageSize", "PaperDimension"], ``{ - if (page_size == `letter) - printer["ppd_options", paperentry] = "Letter"; - else - printer["ppd_options", paperentry] = "A4"; + printer["ppd_options", paperentry] = getPaperSize(); }); if (ok) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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