July 2009 - openSUSE Commits - openSUSE Mailing Lists

commit perl-ldap for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, here is the log from the commit of package perl-ldap for openSUSE:Factory checked in at Wed Jul 29 00:47:56 CEST 2009. -------- --- perl-ldap/perl-ldap.changes 2009-02-23 16:11:58.000000000 +0100 +++ perl-ldap/perl-ldap.changes 2009-07-28 09:52:47.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 28 09:52:19 CEST 2009 - richard.bos(a)xs4all.nl + +- Added patch SyncRequestCookie.patch to avoid 'cookie parsing error' + in combination with openldap-2.3 +- Added chmod -x to prevent a rpmlint warning + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- SyncRequestCookie.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-ldap.spec ++++++ --- /var/tmp/diff_new_pack.o4IF3R/_old 2009-07-29 00:47:10.000000000 +0200 +++ /var/tmp/diff_new_pack.o4IF3R/_new 2009-07-29 00:47:10.000000000 +0200 @@ -21,17 +21,18 @@ Name: perl-ldap BuildRequires: perl-Authen-SASL perl-Convert-ASN1 perl-IO-Socket-SSL perl-XML-Parser Version: 0.39 -Release: 1 +Release: 2 Provides: perl_ldp perl-Net-LDAP = %{version} Obsoletes: perl_ldp perl-Net-LDAP < %{version} Requires: perl-URI perl-XML-Parser perl-Convert-ASN1 Requires: perl = %{perl_version} AutoReqProv: on Group: Development/Libraries/Perl -License: Artistic License +License: Artistic License .. Url: http://cpan.org/modules/by-module/Net/ Summary: Client Interface for LDAP Servers Source: perl-ldap-%{version}.tar.bz2 +Patch0: SyncRequestCookie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,7 +45,7 @@ <gbarr(a)pobox.com> (Graham Barr) %package ssl -License: Artistic License +License: Artistic License .. Summary: SSL Extension to perl-ldap Group: Development/Libraries/Perl Requires: %{name} = %{version} perl-IO-Socket-SSL @@ -64,8 +65,11 @@ %prep %setup -q -n perl-ldap-%{version} +%patch0 -p1 %build +# Prevent rpmlint warning script-without-shebang +chmod -x lib/Net/LDAP/DSML.pm find contrib -type f | xargs -n 1 sed -i "s@/usr/local/bin/perl@/usr/bin/perl@" perl Makefile.PL make ++++++ SyncRequestCookie.patch ++++++ diff --git a/lib/Net/LDAP/Control/SyncRequest.pm b/lib/Net/LDAP/Control/SyncRequest.pm index 95cd716..d905d7b 100644 --- a/lib/Net/LDAP/Control/SyncRequest.pm +++ b/lib/Net/LDAP/Control/SyncRequest.pm @@ -21,7 +21,7 @@ sub init { unless (exists $self->{value}) { $self->{asn} = { mode => $self->{mode} || '1', - cookie => $self->{cookie} || '', + cookie => $self->{cookie} || undef, reloadHint => $self->{reloadHint} || '0', }; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xlockmore for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, here is the log from the commit of package xlockmore for openSUSE:Factory checked in at Wed Jul 29 00:46:50 CEST 2009. -------- --- xlockmore/xlockmore.changes 2009-06-11 17:27:13.000000000 +0200 +++ xlockmore/xlockmore.changes 2009-07-28 18:22:50.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 18:20:46 CEST 2009 - sbrabec(a)suse.cz + +- Default to not accept root password to unlock (bnc#519637). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xlockmore.spec ++++++ --- /var/tmp/diff_new_pack.ejkEdC/_old 2009-07-29 00:41:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ejkEdC/_new 2009-07-29 00:41:20.000000000 +0200 @@ -20,13 +20,13 @@ Name: xlockmore BuildRequires: bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ gltt-devel libdrm-devel pkg-config -License: GPL v2 or later; X11/MIT +License: GPL v2 or later ; MIT License (or similar) Group: System/X11/Utilities Provides: xlock Obsoletes: xlock AutoReqProv: on Version: 5.28 -Release: 1 +Release: 2 Summary: Screen Saver and Locker for the X Window System Url: http://www.tux.org/~bagleyd/xlockmore.html Source: %{name}-%{version}.tar.bz2 @@ -119,6 +119,7 @@ --disable-bomb\ --enable-vtlock\ --enable-use-mb\ + --disable-allow-root\ --x-includes=%{_xorg7_prefix}/include\ --x-libraries=%{_xorg7_prefix}/%_lib make %{?jobs:-j%jobs} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Wed Jul 29 00:41:01 CEST 2009. -------- --- kiwi/kiwi.changes 2009-07-23 11:59:18.000000000 +0200 +++ kiwi/kiwi.changes 2009-07-27 17:12:28.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jul 23 16:30:28 CEST 2009 - ms(a)suse.de + +- v3.65 +- added suse-11.2-JeOS template +- removed obsolte tools/cdtool/suse-isolinux +- fixed isoboot: added gfxboot.com if it exists +- leave libncursesw inside the initrd for dialog use +- added waitForUSBDeviceScan() function and wait only + if usbcore module could be loaded + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.fhKHyf/_old 2009-07-29 00:40:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fhKHyf/_new 2009-07-29 00:40:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 3.64) +# spec file for package kiwi (Version 3.65) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,7 +53,7 @@ Summary: OpenSuSE - KIWI Image System Provides: kiwi2 <= 2.14 Obsoletes: kiwi2 <= 2.14 -Version: 3.64 +Version: 3.65 Release: 1 Group: System/Management License: GPL v2 or later @@ -437,6 +437,7 @@ %defattr(-, root, root) %dir %{_datadir}/kiwi %dir %{_datadir}/kiwi/image +%exclude %{_datadir}/kiwi/image/suse-11.2-JeOS %exclude %{_datadir}/kiwi/image/suse-11.1-JeOS %exclude %{_datadir}/kiwi/image/suse-SLE10-JeOS %exclude %{_datadir}/kiwi/image/suse-SLE11-JeOS @@ -476,7 +477,6 @@ %{_datadir}/kiwi/modules/KIWICollect.pm %{_datadir}/kiwi/modules/KIWIUtil.pm %{_datadir}/kiwi/modules/KIWIRepoMetaHandler.pm -/usr/bin/suse-isolinux #================================================= # KIWI-pxeboot files... # ------------------------------------------------ @@ -511,7 +511,6 @@ %files -n kiwi-tools %defattr(-, root, root) %doc %{_defaultdocdir}/kiwi/README.tools -%exclude /usr/bin/suse-isolinux %if %{suse_version} > 1010 %exclude /usr/bin/imagewriter %endif @@ -581,9 +580,11 @@ %files -n kiwi-templates %defattr(-, root, root) +%dir %{_datadir}/kiwi/image/suse-11.2-JeOS %dir %{_datadir}/kiwi/image/suse-11.1-JeOS %dir %{_datadir}/kiwi/image/suse-SLE10-JeOS %dir %{_datadir}/kiwi/image/suse-SLE11-JeOS +%{_datadir}/kiwi/image/suse-11.2-JeOS %{_datadir}/kiwi/image/suse-11.1-JeOS %{_datadir}/kiwi/image/suse-SLE10-JeOS %{_datadir}/kiwi/image/suse-SLE11-JeOS ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 kiwi/kiwi.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 sysvinit for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Wed Jul 29 00:38:30 CEST 2009. -------- --- sysvinit/sysvinit.changes 2009-06-30 17:01:25.000000000 +0200 +++ sysvinit/sysvinit.changes 2009-07-28 16:51:32.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 16:48:09 CEST 2009 - werner(a)suse.de + +- Do not loop around in the forwarder of startpar + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.c1vD85/_old 2009-07-29 00:36:07.000000000 +0200 +++ /var/tmp/diff_new_pack.c1vD85/_new 2009-07-29 00:36:07.000000000 +0200 @@ -30,7 +30,7 @@ PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 211 +Release: 212 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel ++++++ startpar-0.53.dif ++++++ --- /var/tmp/diff_new_pack.c1vD85/_old 2009-07-29 00:36:07.000000000 +0200 +++ /var/tmp/diff_new_pack.c1vD85/_new 2009-07-29 00:36:07.000000000 +0200 @@ -106,7 +106,7 @@ +#define alignof(type) ((sizeof(type)+(sizeof(void*)-1)) & ~(sizeof(void*)-1)) +#define strsize(string) ((strlen(string)+1)*sizeof(char)) --- startpar.c -+++ startpar.c 2009-06-29 12:24:47.632457764 +0200 ++++ startpar.c 2009-07-28 16:47:11.198401578 +0200 @@ -66,7 +66,8 @@ static struct makenode **nodevec; #define PBUF_SIZE 8192 @@ -167,7 +167,15 @@ perror(prg); _exit(1); } -@@ -710,11 +711,11 @@ int main(int argc, char **argv) +@@ -415,6 +416,7 @@ void do_forward(void) + rr = r; + } + r -= rr; ++ b += rr; + } + } + _exit(0); +@@ -710,11 +712,11 @@ int main(int argc, char **argv) { if ((*nodevec = pickup_task())) { @@ -181,7 +189,7 @@ goto finished; } -@@ -818,9 +819,12 @@ int main(int argc, char **argv) +@@ -818,9 +820,12 @@ int main(int argc, char **argv) if (nodevec[num]->interactive) interactive_task = p; p->name = nodevec[num]->name; @@ -195,7 +203,7 @@ p->splashadd = calcsplash(num, argc, splashopt); p->num = num++; if (interactive_task) -@@ -855,7 +859,7 @@ int main(int argc, char **argv) +@@ -855,7 +860,7 @@ int main(int argc, char **argv) if (active == 0) { p = interactive_task; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop choqoK from openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, FYI: Package choqoK was dropped from openSUSE:Factory at Wed Jul 29 00:36:35 CEST 2009. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ch… 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 for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at Wed Jul 29 00:35:52 CEST 2009. -------- --- yast2-printer/yast2-printer.changes 2009-06-03 09:38:08.000000000 +0200 +++ yast2-printer/yast2-printer.changes 2009-07-28 13:08:52.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Jul 28 12:14:43 CEST 2009 - jsmeix(a)suse.de + +- Be prepared for CUPS 1.4: + * Since CUPS 1.4 'lpstat -r' results true even when scheduler + is not running. Therefore we must now grep in its output for + 'scheduler is running' (see Novell/Suse Bugzilla bnc#520599). + * Since CUPS 1.4 there is no longer a readymade PostScript + testpage in CUPS. Therefore a slightly modified CUPS 1.3.10 + testprint.ps was added as /usr/share/YaST2/data/testprint.ps + (see Novell/Suse Bugzilla bnc#520617). + * Since CUPS 1.4 there are several seconds delay until cupsd + writes confug files like printers.conf which requires the + new function Printerlib::WaitForUpdatedConfigFiles + (see Novell/Suse Bugzilla bnc#520612). + * At least in CUPS 1.4.rc1 a 'sleep 1' workaround is required + to ensure that 'lpoptions -l' reports correct defaults + (see Novell/Suse Bugzilla bnc#520642 and + CUPS STR #3264 http://www.cups.org/str.php?L3264). +- 2.18.18 + +------------------------------------------------------------------- +Wed Jul 8 12:23:59 CEST 2009 - ug(a)suse.de + +- redone RNC file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.18.17.tar.bz2 New: ---- yast2-printer-2.18.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.g5XvC9/_old 2009-07-29 00:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.g5XvC9/_new 2009-07-29 00:33:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.18.17) +# spec file for package yast2-printer (Version 2.18.18) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,21 +17,19 @@ # norootforbuild -Url: http://en.opensuse.org/YaST/Modules/Printer Name: yast2-printer -Version: 2.18.17 +Version: 2.18.18 Release: 1 -License: GPL v2 or later +License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.18.17.tar.bz2 +Source0: yast2-printer-2.18.18.tar.bz2 Prefix: /usr BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat Requires: /usr/bin/host cups-libs Requires: yast2 >= 2.16.12 -#Requires: cups >= 1.2 Provides: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel Obsoletes: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel Provides: yast2-agent-cups-devel yast2-agent-printerdb-devel y2d_prnt y2t_prnt yast2-db-printer yast2-printerdb @@ -39,33 +37,19 @@ Summary: YaST2 - Printer Configuration %package devel-doc -License: GPL v2 or later +License: GPL Group: Documentation/SUSE BuildRequires: cups-devel yast2-core-devel -Summary: YaST2 - Developer documentation for yast2-printer +Summary: Developer documentation for yast2-printer %description This package contains the YaST2 component for printer configuration. - - -Authors: --------- - Johannes Meixner <jsmeix(a)suse.de> - Michal Zugec <mzugec(a)suse.cz> - %description devel-doc -This package contains Developer documentation for YaST2 printer -configuration module. - - - -Authors: --------- - Michal Zugec <mzugec(a)suse.cz> +Developer documentation for yast2-printer. %prep -%setup -n yast2-printer-2.18.17 +%setup -n yast2-printer-2.18.18 %build %{prefix}/bin/y2tool y2autoconf @@ -93,7 +77,6 @@ %files %defattr(-,root,root) %dir /usr/share/YaST2/include/printer -#%dir /usr/share/YaST2/data/printer %{prefix}/share/applications/YaST2/printer.desktop /usr/share/YaST2/modules/*.y* /usr/share/YaST2/clients/printer* @@ -101,9 +84,7 @@ /usr/share/YaST2/schema/autoyast/rnc/printer.rnc /usr/share/YaST2/scrconf/* /usr/lib/YaST2/servers_non_y2/* -#data -#check this - we need testpage! -#/usr/share/YaST2/data/printer/testpg.* +/usr/share/YaST2/data/testprint.ps %{prefix}/lib/YaST2/bin/autodetect_print_queues %{prefix}/lib/YaST2/bin/autodetect_printers %{prefix}/lib/YaST2/bin/create_printer_ppd_database ++++++ yast2-printer-2.18.17.tar.bz2 -> yast2-printer-2.18.18.tar.bz2 ++++++ ++++ 1715 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/Makefile.am new/yast2-printer-2.18.18/Makefile.am --- old/yast2-printer-2.18.17/Makefile.am 2009-06-02 16:43:07.000000000 +0200 +++ new/yast2-printer-2.18.18/Makefile.am 2009-07-28 12:12:42.000000000 +0200 @@ -214,4 +214,4 @@ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo # test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents doc src testsuite tools +SUBDIRS = agents data doc src testsuite tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/VERSION new/yast2-printer-2.18.18/VERSION --- old/yast2-printer-2.18.17/VERSION 2009-06-02 16:35:54.000000000 +0200 +++ new/yast2-printer-2.18.18/VERSION 2009-07-28 12:12:16.000000000 +0200 @@ -1 +1 @@ -2.18.17 +2.18.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/configure.in new/yast2-printer-2.18.18/configure.in --- old/yast2-printer-2.18.17/configure.in 2009-06-02 16:43:07.000000000 +0200 +++ new/yast2-printer-2.18.18/configure.in 2009-07-28 12:12:42.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.18.17, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.18.18, http://bugs.opensuse.org/, yast2-printer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.17" +VERSION="2.18.18" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -151,6 +151,7 @@ AC_CONFIG_FILES(Makefile agents/Makefile +data/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/data/Makefile.am new/yast2-printer-2.18.18/data/Makefile.am --- old/yast2-printer-2.18.17/data/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.18.18/data/Makefile.am 2009-07-09 15:23:29.000000000 +0200 @@ -0,0 +1,5 @@ +# Makefile.am for printer/data + +ydata_DATA = testprint.ps + +EXTRA_DIST = $(ydata_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/data/testprint.ps new/yast2-printer-2.18.18/data/testprint.ps --- old/yast2-printer-2.18.17/data/testprint.ps 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-printer-2.18.18/data/testprint.ps 2009-07-09 15:25:26.000000000 +0200 @@ -0,0 +1,598 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 +%%Pages: 1 +%%LanguageLevel: 1 +%%DocumentData: Clean7Bit +%%DocumentSuppliedResources: procset testprint/1.3 +%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman +%%Creator: Michael Sweet, Apple Inc. +%%CreationDate: D:20090113092400+0800 +%%Title: Test Page +%%EndComments +%%BeginProlog +%%BeginResource procset testprint 1.3 0 +% +% PostScript test page for the Common UNIX Printing System ("CUPS"). +% +% Copyright 2007-2009 Apple Inc. +% Copyright 1993-2007 Easy Software Products +% +% These coded instructions, statements, and computer programs are the +% property of Apple Inc. and are protected by Federal copyright law. +% Distribution and use rights are outlined in the file "LICENSE.txt" +% which is included with the CUPS source distribution. +% +/SEXTANT { % Draw a color wheel sextant... + % (name) white radius r g b SEXTANT - + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup 0.75 le { % Get "white" value + % Start from black + dup 0.75 div % val2 = val / 0.75 + + 0 index 5 index mul % R = R * val2 + 1 index 5 index mul % G = G * val2 + 2 index 5 index mul % B = B * val2 + + 4 -1 roll pop % Discard val2 + } { + % Fade to white + dup neg 1 add 4 mul % val2 = (1 - val) * 4 + + 0 index 5 index mul % R = R * val2 + 1 index neg 1 add add % + (1 - val2) + 1 index 5 index mul % G = G * val2 + 2 index neg 1 add add % + (1 - val2) + 2 index 5 index mul % B = B * val2 + 3 index neg 1 add add % + (1 - val2) + + 4 -1 roll pop % Discard val2 + } ifelse + setrgbcolor % Set the color... + + % Draw the polygon... + newpath % Start a new path... + dup 5 index mul % r1 = radius * val + 0 0 3 -1 roll 0 60 arc % Draw the inner arc + + dup 0.010101 add 5 index mul% r2 = (radius + 0.010101) * val + 0 0 3 -1 roll 60 0 arcn % Draw the outer arc + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + % Draw a line around the polygons... + pop pop pop dup % Pop R, G, B, start + 0 setgray % Black + newpath + 0 0 moveto % Center + 0 0 3 -1 roll 0 60 arc % Arc around octant + closepath % Back to center + stroke % Stroke it... + + % Draw the label... + dup % Save radius + dup 30 cos mul % X = radius * cos(30) + exch 30 sin mul % Y = radius * sin(30) + moveto % Position label + + gsave + 30 rotate % Rotate label + dup 0.05 mul % Offset to the right + exch -0.05 mul % and down... + rmoveto % Offset label + show % Show label + grestore +} bind def +/CENTER { % Draw centered text + % (name) CENTER - + dup stringwidth pop % Get the width of the string + 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance + show % Show the string +} bind def +/RIGHT { % Draw right-justified text + % (name) RIGHT - + dup stringwidth pop % Get the width of the string + neg 0 rmoveto % Shift left the entire distance + show % Show the string +} bind def +/NUMBER { % Draw a number + % power n NUMBER - + 1 index 1 eq { % power == 1? + round cvi exch pop % Convert "n" to integer + } { + 1 index mul round exch div % Truncate extra decimal places + } ifelse + 100 string cvs show % Convert to a string and show it... +} bind def +/CUPSLOGO { % Draw the CUPS logo + % height CUPSLOGO + % Start with a big C... + /Helvetica findfont 1 index scalefont setfont + 0 setgray + 0 0 moveto + (C) show + + % Then "UNIX Printing System" much smaller... + /Helvetica-Bold findfont 1 index 9 div scalefont setfont + 0.25 mul + dup dup 2.0 mul moveto + (UNIX) show + dup dup 1.6 mul moveto + (Printing) show + dup 1.2 mul moveto + (System) show +} bind def +%%EndResource +%%EndProlog +%%Page: 1 1 +gsave + + % Determine the imageable area and device resolution... + initclip newpath clippath pathbbox % Get bounding rectangle + 72 div /pageTop exch def % Get top margin in inches + 72 div /pageRight exch def % Get right margin in inches + 72 div /pageBottom exch def % Get bottom margin in inches + 72 div /pageLeft exch def % Get left margin in inches + + 4 setlinewidth % Draw wide lines + 0 setgray closepath stroke % Draw a clipping rectangle + + /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft + /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom + + 72 72 dtransform % Get device resolution per inch + /yResolution exch abs def % yResolution = abs(yres) + /xResolution exch abs def % xResolution = abs(xres) + + % Figure out the sizes of things... + /wheelSize % size of wheels + pageWidth pageHeight lt + { pageWidth 9 mul } + { pageHeight 7 mul } + ifelse def + + % Create fonts... + /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold + pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) + + /mediumFont /Helvetica findfont % mediumFont = Helvetica + pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) + + /smallFont /Times-Roman findfont % smallFont = Times-Roman + pageHeight scalefont def % size = pageHeight (nominally 11) + + % Draw rulers along the edges... + /CENTIMETER 72 2.54 div def + /MILLIMETER 72 25.4 div def + + /Times-Roman findfont % Font for ruler numbers + 11 scalefont setfont % 11 points + + gsave % Left side inches + pageLeft 72 mul 0 translate % Offset left edge + + 1 setlinewidth % Draw normal lines + 72 72 pageTop 72 mul { % Height inches + dup dup + 0 exch moveto 24 0 rlineto stroke % Draw tic mark + 24 exch pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs RIGHT + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageTop 72 mul { % 1/4 inches + 0 exch moveto 15 0 rlineto stroke % Draw tic mark + } for + + 9 9 pageTop 72 mul { % 1/8 inches + 0 exch moveto 6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Bottom inches + 0 pageBottom 72 mul translate % Offset bottom edge + + 1 setlinewidth % Draw normal lines + 72 72 pageRight 72 mul { % Width inches + dup dup + 0 moveto 0 24 rlineto stroke % Draw tic mark + 3 add 27 pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageRight 72 mul { % 1/4 inches + 0 moveto 0 15 rlineto stroke % Draw tic mark + } for + + 9 9 pageRight 72 mul { % 1/8 inches + 0 moveto 0 6 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Right side centimeters + pageRight 72 mul 0 translate % Offset right edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageTop 72 mul { % Height centimeters + 0 exch moveto -24 0 rlineto stroke% Draw tic mark + } for + 1 1 pageTop 2.54 mul { % Height labels + dup + -24 exch CENTIMETER mul + pageHeight sub moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageTop 72 mul { % 1/2 centimeters + 0 exch moveto -15 0 rlineto stroke% Draw tic mark + } for + 0 MILLIMETER pageTop 72 mul { % Millimeters + 0 exch moveto -6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Top centimeters + 0 pageTop 72 mul translate % Offset top edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageRight 72 mul { % Width centimeters + 0 moveto 0 -24 rlineto stroke % Draw tic mark + } for + 1 1 pageRight 2.54 mul { % Width labels + dup + CENTIMETER mul 3 add -24 moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageRight 72 mul { % 1/2 centimeters + 0 moveto 0 -15 rlineto stroke % Draw tic mark + } for + 0 MILLIMETER pageRight 72 mul { % Millimeters + 0 moveto 0 -6 rlineto stroke % Draw tic mark + } for + grestore + + % Offset page to account for lower-left margin... + pageLeft 72 mul + pageBottom 72 mul + translate + + % Set text font and color... + mediumFont setfont % Font + 0 setgray % Color + 1 setlinewidth % Draw normal lines + + % Draw the color wheel... + gsave + % Position the wheel on the left side... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Draw the colors... + dup (C) 3 -1 roll 0 1 1 SEXTANT 60 rotate + dup (M) 3 -1 roll 1 0 1 SEXTANT 60 rotate + dup (Y) 3 -1 roll 1 1 0 SEXTANT 60 rotate + dup (R) 3 -1 roll 1 0 0 SEXTANT 60 rotate + dup (G) 3 -1 roll 0 1 0 SEXTANT 60 rotate + dup (B) 3 -1 roll 0 0 1 SEXTANT 60 rotate + + pop + grestore + + % Label the color wheel... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Color Wheel) CENTER % Show the text centered + + % Draw the gray ramp... + gsave + % Position the gray ramp in the center... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + wheelSize sub % - wheelSize + translate + + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup setgray % Set the grayscale... + + % Draw the polygon... + newpath % Start a new path... + + wheelSize -0.2 mul % X = -wheelSize / 5 + 1 index 2 mul wheelSize mul % Y = val * 2 * wheelSize + moveto % Move there... + + wheelSize 0.4 mul 0 rlineto % Right side... + + wheelSize 0.2 mul % X = wheelSize / 5 + 1 index 0.010101 add 2 mul wheelSize mul + % Y = (val + 0.010101) * 2 * wheelSize + lineto % Move there... + + wheelSize -0.4 mul 0 rlineto % Left side... + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + 0 setgray % Black + + newpath % Start a new path + wheelSize -0.2 mul 0 moveto % Bottom left + wheelSize 0.4 mul 0 rlineto % Bottom right + 0 wheelSize 2 mul rlineto % Upper right + wheelSize -0.4 mul 0 rlineto % Upper left + closepath % Close the path + stroke % Stroke it... + + 0 wheelSize -0.2 mul moveto % Center bottom for label + (K) CENTER % Center K at bottom + + 0 wheelSize 2.05 mul moveto % Center top for label + (W) CENTER % Center W at top + grestore + + % Label the gray ramp... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Gray Ramp) CENTER % Show the text centered + + + % Draw radial lines... + gsave + 0 setlinewidth % 1 pixel lines + + % Position the lines on the left side... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Loop at 1 degree increments + 0 1 359 { + pop % Discard angle - not used + 0 0 moveto % Start line at the center + dup 0 lineto % Draw to the radius + 1 rotate % Rotate 1 degree + } for + + pop % Discard radius - not needed anymore + stroke % Draw lines... + + grestore + + % Label the lines... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (1 Degree Radial Lines) CENTER % Show the text centered + + % Imageable area... + pageHeight 15 mul % Height of imageable area + + pageWidth 4.5 mul % x = pageWidth * 1/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the imageable area... + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Imageable Area) show % Show the text + + smallFont setfont % Font + pageWidth 14 mul % x = pageWidth * 3/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight -2 mul add % y -= 2 * smallFont height + + % Page Size inches + 2 copy moveto % Move to x & y + (Page Size: ) RIGHT % Label + 100 pageWidth NUMBER % pageWidth + (x) show % "x" + 100 pageHeight NUMBER % pageHeight + (in) show % "in" + + % Page Size millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageWidth 25.4 mul NUMBER % pageWidth + (x) show % "x" + 10 pageHeight 25.4 mul NUMBER % pageHeight + (mm) show % "mm" + + % Lower-left inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Lower-Left: ) RIGHT % Label + 100 pageLeft NUMBER % pageLeft + (x) show % "x" + 100 pageBottom NUMBER % pageBottom + (in) show % "in" + + % Lower-left millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageLeft 25.4 mul NUMBER % pageLeft + (x) show % "x" + 10 pageBottom 25.4 mul NUMBER % pageBottom + (mm) show % "mm" + + % Upper-right inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Upper-Right: ) RIGHT % Label + 100 pageRight NUMBER % pageRight + (x) show % "x" + 100 pageTop NUMBER % pageTop + (in) show % "in" + + % Upper-right millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageRight 25.4 mul NUMBER % pageRight + (x) show % "x" + 10 pageTop 25.4 mul NUMBER % pageTop + (mm) show % "mm" + + % Resolution dots-per-inch + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Resolution: ) RIGHT % Label + 1 xResolution NUMBER % xResolution + (x) show % "x" + 1 yResolution NUMBER % yResolution + (dpi) show % "dpi" + + % Resolution dots-per-meter + pageHeight sub % Move down... + + moveto % Move to x & y + 1 xResolution 39.27 mul NUMBER % xResolution + (x) show % "x" + 1 yResolution 39.27 mul NUMBER % yResolution + (dpm) show % "dpm" + + % Interpreter Information... + pageHeight 15 mul % Height of interpreter information + + pageWidth 40.5 mul % x = pageWidth * 9/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the interpreter info... + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Interpreter Information) show % Show the text + + smallFont setfont % Font + pageWidth 49 mul % x = pageWidth * 11/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight 2 mul sub % y -= 2 * smallFont height + + % Language level + 2 copy moveto % Move to x & y + (PostScript: ) RIGHT % Label + (Level ) show % "Level " + 1 languagelevel NUMBER % Language level + + % Version + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Version: ) RIGHT % Label + version show % Version + ( $) show % " (" + 1 revision NUMBER % Revision + ($) show % ")" + + % Product + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Product: ) RIGHT % Label + product show % Product name + + % Serial Number + pageHeight 2 mul sub % Move down... + moveto % Move to x & y + (Serial #: ) RIGHT % Label + 1 serialnumber NUMBER % S/N + + % Draw the label at the top... + pageWidth 36 mul % Center of page + pageHeight 66 mul % Top of page (11/12ths) + moveto % Position text + bigFont setfont % Font + (CUPS Printer Test Page) CENTER % Show text centered + + % Draw the copyright notice at the bottom... + pageWidth 17 mul % Center of page + pageHeight 9.5 mul % Bottom of page + moveto % Position text + (Printed with CUPS) show + + pageWidth 17 mul % Left side of page + pageHeight 7.5 mul % Move down... + 2 copy moveto % Position text + smallFont setfont % Font + (Copyright 2007-2009 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are) show + pageHeight 2 add sub % Move down... + 2 copy moveto % Position text + (the trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show + pageHeight 2 mul 4 add sub % Move down... + moveto % Position text + (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show + + % Then the CUPS logo.... + gsave + pageWidth 4 mul + pageHeight 4 mul + translate + pageWidth 15 mul CUPSLOGO + grestore + +% Show the page... +grestore +showpage +% +% End of "$Id: testprint.ps 8236 2009-01-13 17:27:16Z mike $". +% +%%EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/src/Printer.ycp new/yast2-printer-2.18.18/src/Printer.ycp --- old/yast2-printer-2.18.17/src/Printer.ycp 2009-04-30 15:35:41.000000000 +0200 +++ new/yast2-printer-2.18.18/src/Printer.ycp 2009-07-17 13:57:14.000000000 +0200 @@ -1735,7 +1735,14 @@ // see https://bugzilla.novell.com/show_bug.cgi?id=395760 // and http://www.cups.org/str.php?L2848 if( "" != default_paper_size ) - { // The following command fails intentionally if the queue has no PPD file - i.e. when it is a "raw" queue + { // Since CUPS 1.4 there is a weird timing-effect regarding which defaults 'lpoptions -l' reports + // after the defaults have been changed directly after a new queue was set up + // see https://bugzilla.novell.com/show_bug.cgi?id=520642 + // and http://www.cups.org/str.php?L3264 + // Regardless of the DirtyCleanInterval setting it works when there is one second delay + // between a new queue was set up and before its defaults were changed: + sleep( 1000 ); + // The following command fails intentionally if the queue has no PPD file - i.e. when it is a "raw" queue // (a queue with a "System V style interface script" cannot be set up with YaST). // '\>' is used to find an available choice also when it is the last value on the line. // Note the YCP quoting: \\< becomes \< and \\> becomes \> in the commandline. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/src/Printerlib.ycp new/yast2-printer-2.18.18/src/Printerlib.ycp --- old/yast2-printer-2.18.17/src/Printerlib.ycp 2009-04-30 15:35:41.000000000 +0200 +++ new/yast2-printer-2.18.18/src/Printerlib.ycp 2009-07-16 15:33:34.000000000 +0200 @@ -36,7 +36,7 @@ import "Package"; import "Popup"; import "Service"; -import "Map"; + // Fortunately the tools are for all architectures always // installed in /usr/lib/YaST2/bin/ (i.e. no "lib64"). // I tested this on Thu Aug 28 2008 using the command @@ -241,8 +241,10 @@ global boolean GetAndSetCupsdStatus( string new_status ) { // Determine whether or not a local cupsd is accessible. // The value 'false' is also the right one when the command itself fails - // (e.g. when there is no /usr/bin/lpstat binary or whatever broken stuff): - string local_cupsd_accessible_commandline = "/usr/bin/lpstat -h localhost -r"; + // (e.g. when there is no /usr/bin/lpstat binary or whatever broken stuff). + // Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. + // Therefore we must now grep in its output: + string local_cupsd_accessible_commandline = "/usr/bin/lpstat -h localhost -r | grep -q 'scheduler is running'"; local_cupsd_accessible = ExecuteBashCommand( local_cupsd_accessible_commandline ); // Start cupsd: if( "start" == new_status ) @@ -510,6 +512,83 @@ return true; } +// Up to CUPS 1.3 cupsd writes changes to config files immediately so that the updated files +// will be available after the corresponding command, function call, or IPP operation is completed. +// Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files, +// which defaults to 30 seconds. Setting it to 0 will have it write the changes on the next pass through +// the main run loop - less immediate than before, but still should be within a few milliseconds. +// To be on the safe side regarding "within a few milliseconds" (which could become much more +// depending on which processes the scheduler lets run - in particular cupsd versus yast2-printer) +// it sleeps in any case at least one second: +global boolean WaitForUpdatedConfigFiles( string popupheader ) +{ // By default there is no DirtyCleanInterval entry in /etc/cups/cupsd.conf + // and then the default delay until cupsd writes config files like printers.conf + // is 30 seconds which is also used here as fallback. + integer dirty_clean_interval = 30; + // Determine the DirtyCleanInterval value in /etc/cups/cupsd.conf: + if( ExecuteBashCommand( yast_bin_dir + "modify_cupsd_conf DirtyCleanInterval" ) ) + { // I must use "0123456789" here instead of Printer::number_chars because + // the latter would require 'import "Printer"' but Printer does already 'import "Printerlib"' + // and a cyclic import drives the YaST machinery mad (it collapses with "too many open files"): + string dirty_clean_interval_string = filterchars( result["stdout"]:"30", "0123456789" ); + if( "" != dirty_clean_interval_string + && nil != tointeger( dirty_clean_interval_string ) + ) + { dirty_clean_interval = tointeger( dirty_clean_interval_string ); + } + // Use fallback value when there is no DirtyCleanInterval entry or + // when the DirtyCleanInterval value cannot be converted to an integer. + } + // Use fallback cupsd_conf_dirty_clean_interval value when the command above failed. + y2milestone( "Waiting DirtyCleanInterval='%1'+1 seconds for updated config files.", dirty_clean_interval ); + if( dirty_clean_interval < 1 ) + { // Even in case if "immediate" update of the config files + // be on the safe side and sleep one second but without user notification: + sleep( 1000 ); + return true; + } + if( dirty_clean_interval < 31 ) + { // If 1 <= dirty_clean_interval <= 30 (30 is the default and fallback value) + // do not let the user interrupt the waiting for updated config files. + // To be on the safe side sleep one second longer than the dirty_clean_interval: + Popup::ShowFeedback( popupheader, + sformat( // Message of a Popup::ShowFeedback where %1 will be replaced + // by the number of seconds how long it takes. + // The number of seconds is always greater or equal than 2 + // so that it is always the plural "seconds" here: + _("It takes %1 seconds until the config files are updated..."), + dirty_clean_interval + 1 + ) + ); + sleep( ( 1000 * dirty_clean_interval ) + 1000 ); + Popup::ClearFeedback(); + return true; + } + // If dirty_clean_interval > 30 let the user interrupt the waiting for updated config files + // and return true if the user did not interrupt the waiting for updated config files + // but return false if the user interrupted the waiting for updated config files. + // To be on the safe side sleep one second longer than the dirty_clean_interval. + // Only Popup::TimedAnyQuestion and Popup::TimedOKCancel return a non-void value + // but neither of them return false if the user interrupted the waiting + // because both of them return true if the user interrupted via the 'Yes' or 'OK' button + // so that both are useless to determine if the user interrupted the waiting + // and therefore I return depending on calculating the waiting time directly + // by calling time() which returns the number of seconds since 1.1.1970: + integer time_before = time(); + Popup::TimedMessage( // Message of a Popup::TimedMessage: + popupheader + "\n\n" + _("Waiting until the config files are updated..."), + dirty_clean_interval + 1 + ); + integer waiting_time = time() - time_before; + if( waiting_time < dirty_clean_interval ) + { // To avoid needless error popups be on the safe side and return false only + // when the waiting_time is strictly less than the dirty_clean_interval: + return false; + } + return true; +} + + global boolean WriteCupsSettings(map ay){ string cups_file="/etc/cups/cupsd.conf"; y2milestone("Create backup of %1 file:%2", cups_file, SCR::Execute(.target.bash, sformat("mv %1 %1.$(date -I)", cups_file))); @@ -517,7 +596,6 @@ return true; } - global boolean WriteClientSettings(map ay){ string cups_file="/etc/cups/client.conf"; y2milestone("Create backup of %1 file:%2", cups_file, SCR::Execute(.target.bash, sformat("mv %1 %1.$(date -I)", cups_file))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/src/basicadd.ycp new/yast2-printer-2.18.18/src/basicadd.ycp --- old/yast2-printer-2.18.17/src/basicadd.ycp 2009-04-30 15:35:41.000000000 +0200 +++ new/yast2-printer-2.18.18/src/basicadd.ycp 2009-07-16 15:38:42.000000000 +0200 @@ -310,6 +310,17 @@ // After a local queue was added, enforce to show also local queues // in particular when no local queues were shown before: Printer::queue_filter_show_local = true; + // Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files: + if( ! Printerlib::WaitForUpdatedConfigFiles( _("Created New Printer Setup") ) ) + { // It returns false if the user had interrupted the waiting for updated config files: + Popup::ErrorDetails( // Message of a Popup::ErrorDetails: + _("New Printer Configuration not yet Stored in the System"), + // Explanation details of a Popup::ErrorDetails. + // The 'next dialog' is the overview dialog where the printer configurations are shown + // which has a 'Refresh List' button to update the shown printer configurations: + _("If the next dialog does not show the new printer configuration as expected, wait some time and use the 'Refresh List' button.") + ); + } Wizard::EnableBackButton(); Wizard::EnableNextButton(); // Exit this dialog in any case: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/src/basicmodify.ycp new/yast2-printer-2.18.18/src/basicmodify.ycp --- old/yast2-printer-2.18.17/src/basicmodify.ycp 2009-04-30 15:35:41.000000000 +0200 +++ new/yast2-printer-2.18.18/src/basicmodify.ycp 2009-07-16 14:13:57.000000000 +0200 @@ -604,6 +604,17 @@ } } } + // Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files: + if( ! Printerlib::WaitForUpdatedConfigFiles( _("Modified Printer Setup") ) ) + { // It returns false if the user had interrupted the waiting for updated config files: + Popup::WarningDetails( // Message of a Popup::WarningDetails. + _("Modified Printer Configuration not yet Stored in the System"), + // Explanation details of a Popup::WarningDetails. + // The 'next dialog' is the overview dialog where the printer configurations are shown + // which has a 'Refresh List' button to update the shown printer configurations: + _("If the next dialog does not show the expected modifications, wait some time and use the 'Refresh List' button.") + ); + } Wizard::EnableBackButton(); Wizard::EnableNextButton(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/src/overview.ycp new/yast2-printer-2.18.18/src/overview.ycp --- old/yast2-printer-2.18.17/src/overview.ycp 2009-04-30 15:35:41.000000000 +0200 +++ new/yast2-printer-2.18.18/src/overview.ycp 2009-07-09 15:36:03.000000000 +0200 @@ -483,14 +483,29 @@ } string testprint_job_title = "YaST2testprint_" + queue_name; // Do not enforce to talk to the cupsd on localhost when submiting the testpage - // because testpage printing must also work for a "client-only" config: + // because testpage printing must also work for a "client-only" config. + // Since CUPS 1.4 there is no longer a readymade PostScript testpage in CUPS, see + // https://bugzilla.novell.com/show_bug.cgi?id=520617 + // Therefore a slightly modified CUPS 1.3.10 testprint.ps was added + // to yast2-printer as /usr/share/YaST2/data/testprint.ps + // The following modifications + // --- cups-1.3.10/data/testprint.ps 2009-01-13 18:27:16.000000000 +0100 + // +++ data/testprint.ps 2009-07-09 15:25:26.000000000 +0200 + // @@ -564 +564 @@ + // - (Printer Test Page) CENTER % Show text centered + // + (CUPS Printer Test Page) CENTER % Show text centered + // @@ -570 +570 @@ + // - (Printed with CUPS v1.3.x) show + // + (Printed with CUPS) show + // make it obvious that it is not a YaST testpage but a CUPS testpage + // and it is now independent of the CUPS version. if( ! Printerlib::ExecuteBashCommand( "/usr/bin/lp -d '" + queue_name + "' -t '" + testprint_job_title + "' -o page-label=\"" + queue_name - + ":YaST2testprint@$(hostname)\" /usr/share/cups/data/testprint.ps" + + ":YaST2testprint@$(hostname)\" /usr/share/YaST2/data/testprint.ps" ) ) { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/src/printer.rnc new/yast2-printer-2.18.18/src/printer.rnc --- old/yast2-printer-2.18.17/src/printer.rnc 2009-04-30 15:35:41.000000000 +0200 +++ new/yast2-printer-2.18.18/src/printer.rnc 2009-07-09 14:11:28.000000000 +0200 @@ -2,15 +2,34 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -printer = - element printer { - (text - | printer_default - | printcap - | cups_installation - | server_hostname - | spooler)* - } +# +# redone. I used "Anything*" because for me it looks like a generic parser +# with unpredictable keys - ug(a)suse.de +# +printer = element printer { + element cups_remote_server { text }? & + element server_settings { + Anything* + }? +} + + +# removed (read above) +# +#printer = +# element printer { +# (text +# | printer_default +# | printcap +# | cups_installation +# | server_hostname +# | spooler)* +# } + + +# +# old stuff +# config = element config { text } printer_default = element default { text } create_remote_queue = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/tools/autodetect_print_queues new/yast2-printer-2.18.18/tools/autodetect_print_queues --- old/yast2-printer-2.18.17/tools/autodetect_print_queues 2009-06-02 16:28:54.000000000 +0200 +++ new/yast2-printer-2.18.18/tools/autodetect_print_queues 2009-07-16 11:44:06.000000000 +0200 @@ -38,7 +38,9 @@ if test -z "$SERVERNAME" then SERVERNAME="localhost" fi -if ! $LPSTAT -h $SERVERNAME -r &>/dev/null +# Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. +# Therefore we must now grep in its output: +if $LPSTAT -h $SERVERNAME -r | grep -q 'scheduler is not running' then echo "Cannot access cupsd on '$SERVERNAME'" 1>&2 exit 2 fi @@ -125,7 +127,7 @@ # a local queue (in /etc/cups/printers.conf) and a remote queue (on another host) and # therefore /etc/cups/printers.conf is directly inspected to distinguish local and remote queues. # Reason: -# In the CUPS sources systemv/lpstat.c uses CUPS_PRINTER_REMOTE to distinguish between +# In the CUPS sources systemv/lpstat.c uses only CUPS_PRINTER_REMOTE to distinguish between # its output "Connection: remote" and "Connection: direct". # But the new support for "hard-wired" remote printers has muddied the waters: # CUPS_PRINTER_REMOTE means that the printer is hosted (does filtering) on a remote system. @@ -133,13 +135,12 @@ # If both bits are set, then the queue is a traditional CUPS browsing remote printer. # If CUPS_PRINTER_DISCOVERED is not set, it is a local queue but filtering happens remote. # Summary table: -# Type CUPS_PRINTER_RREMOTE CUPS_PRINTER_DISCOVERED -# --------------------- -------------------- ----------------------- -# Local queue No No -# CUPS-browsing printer Yes Yes -# Raw IPP queue Yes No -# Bonjour queue Yes No - +# Type CUPS_PRINTER_RREMOTE CUPS_PRINTER_DISCOVERED exists in printers.conf +# --------------------- -------------------- ----------------------- ----------------------- +# Local queue No No Yes +# CUPS-browsing printer Yes Yes No +# Raw IPP queue Yes No Yes +# Bonjour queue Yes No (I don't know) exec <$TMP_DATA while read KEY VALUE do case "$KEY" in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/tools/autodetect_printers new/yast2-printer-2.18.18/tools/autodetect_printers --- old/yast2-printer-2.18.17/tools/autodetect_printers 2009-04-30 15:35:38.000000000 +0200 +++ new/yast2-printer-2.18.18/tools/autodetect_printers 2009-07-09 14:15:51.000000000 +0200 @@ -36,7 +36,9 @@ # CUPS supports even remote queue setup but this is not supported by YaST. # Therefore explicitely the cupsd on localhost is asked for autodetected printer information. echo 'Testing if cupsd on localhost is accessible...' >>$PROGRESS -if ! $LPSTAT -h localhost -r &>/dev/null +# Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. +# Therefore we must now grep in its output: +if $LPSTAT -h localhost -r | grep -q 'scheduler is not running' then echo "Cannot access cupsd on localhost" 1>&2 exit 2 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/tools/create_printer_ppd_database new/yast2-printer-2.18.18/tools/create_printer_ppd_database --- old/yast2-printer-2.18.17/tools/create_printer_ppd_database 2009-04-30 15:35:38.000000000 +0200 +++ new/yast2-printer-2.18.18/tools/create_printer_ppd_database 2009-07-09 14:16:20.000000000 +0200 @@ -36,7 +36,9 @@ # CUPS supports even remote queue setup but this is not supported by YaST. # Therefore explicitely the cupsd on localhost is asked for printer driver information. echo 'Testing if cupsd on localhost is accessible...' >>$PROGRESS -if ! $LPSTAT -h localhost -r &>/dev/null +# Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. +# Therefore we must now grep in its output: +if $LPSTAT -h localhost -r | grep -q 'scheduler is not running' then echo "Cannot access cupsd on localhost" 1>&2 exit 2 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/tools/determine_printer_driver_options new/yast2-printer-2.18.18/tools/determine_printer_driver_options --- old/yast2-printer-2.18.17/tools/determine_printer_driver_options 2009-06-02 15:41:35.000000000 +0200 +++ new/yast2-printer-2.18.18/tools/determine_printer_driver_options 2009-07-09 14:16:45.000000000 +0200 @@ -34,7 +34,9 @@ # Only on localhost print queue settings should be changed. # CUPS supports to modify even remote queues but this is not supported by YaST. # Therefore explicitely the cupsd on localhost is asked for printer driver options. -if ! $LPSTAT -h localhost -r &>/dev/null +# Since CUPS 1.4 'lpstat -r' results true even when scheduler is not running. +# Therefore we must now grep in its output: +if $LPSTAT -h localhost -r | grep -q 'scheduler is not running' then echo "Cannot access cupsd on localhost" 1>&2 exit 2 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-printer-2.18.17/tools/modify_cupsd_conf new/yast2-printer-2.18.18/tools/modify_cupsd_conf --- old/yast2-printer-2.18.17/tools/modify_cupsd_conf 2009-04-30 15:35:38.000000000 +0200 +++ new/yast2-printer-2.18.18/tools/modify_cupsd_conf 2009-07-15 14:54:59.000000000 +0200 @@ -40,6 +40,9 @@ echo " (The policy-name must exist as a '<Policy policy-name>' section)" 1>&2 echo "ErrorPolicy [ stop-printer | retry-job | abort-job ]" 1>&2 echo " (if ErrorPolicy is not set, stop-printer is the CUPS default)" 1>&2 + echo "DirtyCleanInterval [ seconds ] (since CUPS 1.4)" 1>&2 + echo "e.g.: DirtyCleanInterval 30 (default 30 seconds delay until cupsd writes config files)" 1>&2 + echo " DirtyCleanInterval 0 (update config files like printers.conf almost immediately)" 1>&2 echo "For the syntax for keywords and values see 'man cupsd.conf'" 1>&2 echo "and http://www.cups.org/documentation.php/ref-cupsd-conf.html" 1>&2 echo "In case of ambiguity use the syntax which is described above." 1>&2 @@ -83,15 +86,22 @@ then # Try to substitute an existing active Browsing line (ignore case). # (If there is more than one active Browsing line it is a broken config file): sed -i -e "s/^[[:space:]]*$KEY.*/$KEY $VALUE/i" $CUPSDCONF - # There may exist no Browsing line: + # There may exist no Browsing line or the above substitute may have failed + # (therefore it tests not only for "^$KEY" but for "^$KEY $VALUE$"): if ! grep -q "^$KEY $VALUE$" $CUPSDCONF then # Append a Browsing line below the last active 'Brows' line (ignore case) # to have the new Browsing line at the matching place - # but if no 'Brows' line exists, append at the end of the file: + # but if no 'Brows' line exists, append below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file: LAST_BROWSE_LINE_NUMBER="$( sed -n -e '/^[^#]*Brows/I=' $CUPSDCONF | tail -n 1 )" if test -n "$LAST_BROWSE_LINE_NUMBER" then sed -i -e "${LAST_BROWSE_LINE_NUMBER}a$KEY $VALUE" $CUPSDCONF - else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + else FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}a$KEY $VALUE\n" $CUPSDCONF + else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + fi fi fi fi @@ -123,11 +133,17 @@ sed -i -e '/^[[:space:]]*BrowseOrder.*/Id' $CUPSDCONF # Append the new BrowseOrder line below the last active 'Brows' line (ignore case) # to have the new BrowseOrder line at the matching place - # but if no 'Brows' line exists, append at the end of the file: + # but if no 'Brows' line exists, append below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file: LAST_BROWSE_LINE_NUMBER="$( sed -n -e '/^[^#]*Brows/I=' $CUPSDCONF | tail -n 1 )" if test -n "$LAST_BROWSE_LINE_NUMBER" then sed -i -e "${LAST_BROWSE_LINE_NUMBER}aBrowseOrder allow,deny" $CUPSDCONF - else echo -en "\nBrowseOrder allow,deny\n\n" >>$CUPSDCONF + else FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}aBrowseOrder allow,deny\n" $CUPSDCONF + else echo -en "\nBrowseOrder allow,deny\n\n" >>$CUPSDCONF + fi fi # All existing active BrowseAllow lines are removed (ignore case). # Those lines can be removed because YaST supports BrowseAllow lines @@ -188,10 +204,16 @@ # Insert the mandatory 'Listen localhost' line (see http://www.cups.org/str.php?L2834 # "What is *not* supported is a configuration where only a domain socket is enabled") # to have the new Listen line where the first active Listen line was - # but if no 'Listen' line exists, append at the end of the file: + # but if no 'Listen' line exists, append below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file: if test -n "$FIRST_LISTEN_LINE_NUMBER" then sed -i -e "${FIRST_LISTEN_LINE_NUMBER}iListen localhost:631" $CUPSDCONF - else echo -en "\nListen localhost:631\n\n" >>$CUPSDCONF + else FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}iListen localhost:631\n" $CUPSDCONF + else echo -en "\nListen localhost:631\n\n" >>$CUPSDCONF + fi fi # Append a Listen line for the domain socket (if such a line was there): if test -n "$LISTEN_DOMAIN_SOCKET_LINE_CONTENT" @@ -254,10 +276,16 @@ # Set 'Order allow,deny' in the root location to deny packets by default # and then allow them from certain sources via Allow entries # and finally deny from certain sources via Deny entries. - # but if no root location was there, append at the end of the file: + # If no root location was there, append it below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file: if test -n "$ROOT_LOCATION_LINE_NUMBER" then sed -i -e "${ROOT_LOCATION_LINE_NUMBER}i<Location />\nOrder allow,deny\nAllow 127.0.0.2\n</Location>" $CUPSDCONF - else echo -en "\n<Location />\nOrder allow,deny\nAllow 127.0.0.2\n</Location>\n\n" >>$CUPSDCONF + else FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}a<Location />\nOrder allow,deny\nAllow 127.0.0.2\n</Location>\n" $CUPSDCONF + else echo -en "\n<Location />\nOrder allow,deny\nAllow 127.0.0.2\n</Location>\n\n" >>$CUPSDCONF + fi fi # Determine (again) where the new root location starts (exact match): ROOT_LOCATION_LINE_NUMBER="$( sed -n -e '/<Location \/>/=' $CUPSDCONF | head -n 1 )" @@ -314,13 +342,23 @@ if ! test "none" = "$VALUE" then # Append the new BrowseAddress lines below the last active 'Brows' line (ignore case) # to have the new BrowseAddress lines at the matching place - # but if no 'Brows' line exists, append at the end of the file. + # but if no 'Brows' line exists, append below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file. # Invert the ordering of the values to get the lines # in the original ordering of the values (needed for the test below): LAST_BROWSE_LINE_NUMBER="$( sed -n -e '/^[^#]*Brows/I=' $CUPSDCONF | tail -n 1 )" + FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + APPEND_LINE_NUMBER="" + if test -n "$LAST_BROWSE_LINE_NUMBER" + then APPEND_LINE_NUMBER="$LAST_BROWSE_LINE_NUMBER" + fi + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then APPEND_LINE_NUMBER="$FIRST_EMPTY_LINE_NUMBER" + fi for V in $( echo "$VALUE" | tac -s ' ' ) - do if test -n "$LAST_BROWSE_LINE_NUMBER" - then test -n "$V" && sed -i -e "${LAST_BROWSE_LINE_NUMBER}a$KEY $V" $CUPSDCONF + do if test -n "$APPEND_LINE_NUMBER" + then test -n "$V" && sed -i -e "${APPEND_LINE_NUMBER}a$KEY $V" $CUPSDCONF else test -n "$V" && echo -en "\n$KEY $V\n" >>$CUPSDCONF fi done @@ -368,16 +406,23 @@ then # Try to substitute an existing active DefaultPolicy line (ignore case). # (If there is more than one active DefaultPolicy line it is a broken config file): sed -i -e "s/^[[:space:]]*$KEY.*/$KEY $VALUE/i" $CUPSDCONF - # There may exist no DefaultPolicy line: + # There may exist no DefaultPolicy line or the above substitute may have failed + # (therefore it tests not only for "^$KEY" but for "^$KEY $VALUE$"): if ! grep -q "^$KEY $VALUE$" $CUPSDCONF then # Append a DefaultPolicy line below the last active 'Policy' line # which is usually a '</Policy>' or a 'ErrorPolicy' line (ignore case) # to have the new DefaultPolicy line at the matching place - # but if no 'Policy' line exists, append at the end of the file: + # but if no 'Policy' line exists, append below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file: LAST_POLICY_LINE_NUMBER="$( sed -n -e '/^[^#]*Policy/I=' $CUPSDCONF | tail -n 1 )" if test -n "$LAST_POLICY_LINE_NUMBER" then sed -i -e "${LAST_POLICY_LINE_NUMBER}a$KEY $VALUE" $CUPSDCONF - else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + else FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}a$KEY $VALUE\n" $CUPSDCONF + else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + fi fi fi fi @@ -405,16 +450,23 @@ then # Try to substitute an existing active ErrorPolicy line (ignore case). # (If there is more than one active ErrorPolicy line it is a broken config file): sed -i -e "s/^[[:space:]]*$KEY.*/$KEY $VALUE/i" $CUPSDCONF - # There may exist no ErrorPolicy line: + # There may exist no ErrorPolicy line or the above substitute may have failed + # (therefore it tests not only for "^$KEY" but for "^$KEY $VALUE$"): if ! grep -q "^$KEY $VALUE$" $CUPSDCONF then # Append a ErrorPolicy line below the last active 'Policy' line # which is usually a '</Policy>' or a 'DefaultPolicy' line (ignore case) # to have the new ErrorPolicy line at the matching place - # but if no 'Policy' line exists, append at the end of the file: + # but if no 'Policy' line exists, append below the first empty line + # which is usually the line after the initial comment block + # and if even no empty line exists, append at the end of the file: LAST_POLICY_LINE_NUMBER="$( sed -n -e '/^[^#]*Policy/I=' $CUPSDCONF | tail -n 1 )" if test -n "$LAST_POLICY_LINE_NUMBER" then sed -i -e "${LAST_POLICY_LINE_NUMBER}a$KEY $VALUE" $CUPSDCONF - else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + else FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}a$KEY $VALUE\n" $CUPSDCONF + else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + fi fi fi fi @@ -436,6 +488,43 @@ fi } +# Function to deal with 'DirtyCleanInterval [ seconds ]' +DirtyCleanInterval() +{ if test -n "$VALUE" + then # Try to substitute an existing active DirtyCleanInterval line (ignore case). + # (If there is more than one active DirtyCleanInterval line it is a broken config file): + sed -i -e "s/^[[:space:]]*$KEY.*/$KEY $VALUE/i" $CUPSDCONF + # There may exist no DirtyCleanInterval line or the above substitute may have failed + # (therefore it tests not only for "^$KEY" but for "^$KEY $VALUE$"): + if ! grep -q "^$KEY $VALUE$" $CUPSDCONF + then # Append a DirtyCleanInterval line below the first empty line + # which is usually the line after the initial comment block + # but if no empty line exists, append at the end of the file: + FIRST_EMPTY_LINE_NUMBER="$( sed -n -e '/^[[:space:]]*$/=' $CUPSDCONF | head -n 1 )" + if test -n "$FIRST_EMPTY_LINE_NUMBER" + then sed -i -e "${FIRST_EMPTY_LINE_NUMBER}a$KEY $VALUE\n" $CUPSDCONF + else echo -en "\n$KEY $VALUE\n\n" >>$CUPSDCONF + fi + fi + fi + # Report the resulting setting in any case: + # The 'tr ... [:blank:]' makes sure that all active DirtyCleanInterval entries + # are found if there is more than one which is a broken config. + # Remove leading spaces (to cut the right part). + # Remove trailing spaces (needed for the test below). + RESULT="$( grep -i "^[[:space:]]*$KEY[[:space:]]" $CUPSDCONF | tr -s '[:blank:]' ' ' | sed -e 's/^ *//' | cut -s -d ' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" + echo -n "$RESULT" + # For a nicer output on a terminal where stdout and stderr is mixed up, + # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt + # or an error message because of a failed test below) on a new line: + echo 1>&2 + # Test if the result is the expected one if a value was specified: + if test -n "$VALUE" -a "$RESULT" != "$VALUE" + then echo "Failed to set '$KEY $VALUE' in $CUPSDCONF." 1>&2 + exit 5 + fi +} + case "$KEY" in Browsing) Browsing;; BrowseAllow) BrowseAllow;; @@ -445,6 +534,7 @@ Policies) Policies;; DefaultPolicy) DefaultPolicy;; ErrorPolicy) ErrorPolicy;; + DirtyCleanInterval) DirtyCleanInterval;; *) echo "Ignoring keyword '$KEY'" 1>&2 exit 4 ;; 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 kdegraphics4 for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jul '09

28 Jul '09

Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Wed Jul 29 00:29:08 CEST 2009. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2009-06-24 21:16:19.000000000 +0200 +++ kdegraphics4/kdegraphics4.changes 2009-07-22 13:54:20.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Jul 22 13:53:58 CEST 2009 - llunak(a)suse.cz + +- epub dependency for okular (bnc#512631) + +------------------------------------------------------------------- +Tue Jul 21 22:25:25 CEST 2009 - dmueller(a)suse.de + +- update to 4.2.98 + +------------------------------------------------------------------- +Wed Jul 8 18:31:33 CEST 2009 - dmueller(a)suse.de + +- update to 4.2.96 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.2.95.tar.bz2 New: ---- kdegraphics-4.2.98.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.Le4XoA/_old 2009-07-29 00:27:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Le4XoA/_new 2009-07-29 00:27:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.2.95) +# spec file for package kdegraphics4 (Version 4.2.98) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,12 +28,12 @@ %if %suse_version > 1030 BuildRequires: libspectre-devel %endif -BuildRequires: libpoppler-qt4-devel libqca2-devel libsoprano-devel +BuildRequires: libepub-devel libpoppler-qt4-devel libqca2-devel libsoprano-devel License: GPL v2 or later Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.2.95 +Version: 4.2.98 Release: 1 Source0: kdegraphics-%version.tar.bz2 Patch0: 4_3_BRANCH.diff ++++++ kdegraphics-4.2.95.tar.bz2 -> kdegraphics-4.2.98.tar.bz2 ++++++ Files old/kdegraphics-4.2.95/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.2.98/doc/gwenview/index.cache.bz2 differ Files old/kdegraphics-4.2.95/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.2.98/doc/kcontrol/kamera/index.cache.bz2 differ Files old/kdegraphics-4.2.95/doc/kgamma/index.cache.bz2 and new/kdegraphics-4.2.98/doc/kgamma/index.cache.bz2 differ Files old/kdegraphics-4.2.95/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.2.98/doc/kolourpaint/index.cache.bz2 differ Files old/kdegraphics-4.2.95/doc/kruler/index.cache.bz2 and new/kdegraphics-4.2.98/doc/kruler/index.cache.bz2 differ Files old/kdegraphics-4.2.95/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.2.98/doc/ksnapshot/index.cache.bz2 differ Files old/kdegraphics-4.2.95/doc/okular/index.cache.bz2 and new/kdegraphics-4.2.98/doc/okular/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/NEWS new/kdegraphics-4.2.98/gwenview/NEWS --- old/kdegraphics-4.2.95/gwenview/NEWS 2009-06-17 22:05:53.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/NEWS 2009-07-08 16:47:03.000000000 +0200 @@ -23,6 +23,7 @@ - Do not crash when clicking a rotate button from the thumbnail view speedbar. - Disable screensaver in fullscreen mode (bug #185916). - Forget modified documents if they are deleted or trashed. +- Fix date sorting. # 2.2.3 ## Fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/app/gwenview.desktop new/kdegraphics-4.2.98/gwenview/app/gwenview.desktop --- old/kdegraphics-4.2.95/gwenview/app/gwenview.desktop 2009-05-27 21:53:09.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/app/gwenview.desktop 2009-07-21 17:20:55.000000000 +0200 @@ -39,8 +39,9 @@ GenericName[km]=កម្មវិធីមើលរូបភាព GenericName[ko]=그림 뷰어 GenericName[ku]=Nîşanderê Wêneyan -GenericName[lt]=Paveikslėlių žiūriklis +GenericName[lt]=Paveikslėlių žiūryklė GenericName[lv]=Attēlu skatītājs +GenericName[mai]=चित्र प्रदर्शक GenericName[ms]=Paparan Imej GenericName[nb]=Bildeviser GenericName[nds]=Bildkieker @@ -116,6 +117,7 @@ Comment[tr]=Basit bir resim gösterici Comment[uk]=Простий переглядач зображень Comment[vi]=Bộ xem ảnh đơn giản +Comment[wa]=On simpe håyneu d' imådjes Comment[x-test]=xxA simple image viewerxx Comment[zh_CN]=简单图像查看器 Comment[zh_TW]=一個簡單的影像檢視程式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/app/imagemetainfodialog.cpp new/kdegraphics-4.2.98/gwenview/app/imagemetainfodialog.cpp --- old/kdegraphics-4.2.95/gwenview/app/imagemetainfodialog.cpp 2009-05-19 14:06:20.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/app/imagemetainfodialog.cpp 2009-07-21 17:20:55.000000000 +0200 @@ -88,9 +88,10 @@ virtual void reset() { QTreeView::reset(); - for (int row = 0; row < model()->rowCount(); ++row) { - setUpRootIndex(row); - } + if ( model() ) + for (int row = 0; row < model()->rowCount(); ++row) { + setUpRootIndex(row); + } } private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/app/infocontextmanageritem.cpp new/kdegraphics-4.2.98/gwenview/app/infocontextmanageritem.cpp --- old/kdegraphics-4.2.95/gwenview/app/infocontextmanageritem.cpp 2009-05-27 21:53:09.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/app/infocontextmanageritem.cpp 2009-07-21 17:20:55.000000000 +0200 @@ -252,7 +252,7 @@ connect(d->mImageMetaInfoDialog, SIGNAL(preferredMetaInfoKeyListChanged(const QStringList&)), SLOT(slotPreferredMetaInfoKeyListChanged(const QStringList&)) ); } - d->mImageMetaInfoDialog->setMetaInfo(d->mDocument->metaInfo(), GwenviewConfig::preferredMetaInfoKeyList()); + d->mImageMetaInfoDialog->setMetaInfo(d->mDocument ? d->mDocument->metaInfo() : 0, GwenviewConfig::preferredMetaInfoKeyList()); d->mImageMetaInfoDialog->show(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/app/slideshow.desktop new/kdegraphics-4.2.98/gwenview/app/slideshow.desktop --- old/kdegraphics-4.2.95/gwenview/app/slideshow.desktop 2009-06-23 13:14:10.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/app/slideshow.desktop 2009-07-21 17:20:55.000000000 +0200 @@ -5,7 +5,7 @@ [Desktop Action slideshow] Name=Start a Slideshow -Name[ar]=أبدء عرض الشرائح +Name[ar]=ابدأ عرض شرائح Name[ca]=Inicia una presentació amb diapositives Name[cs]=Spustit promítání Name[da]=Start et diasshow @@ -44,6 +44,7 @@ Name[th]=เริ่มการนำเสนอ Name[tr]=Bir Slayt Gösterisi Başlat Name[uk]=Почати показ слайдів +Name[wa]=Enonder on diaporama Name[x-test]=xxStart a Slideshowxx Name[zh_CN]=以幻灯模式启动 Name[zh_TW]=開始投影秀 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/app/thumbnailviewpanel.cpp new/kdegraphics-4.2.98/gwenview/app/thumbnailviewpanel.cpp --- old/kdegraphics-4.2.95/gwenview/app/thumbnailviewpanel.cpp 2009-05-14 19:26:07.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/app/thumbnailviewpanel.cpp 2009-07-08 16:47:03.000000000 +0200 @@ -291,7 +291,7 @@ } // This works because for now Sorting::Enum maps to KDirModel::ModelColumns - d->mDirModel->sort(sortingFromSortAction(action), Qt::AscendingOrder); + d->mDirModel->setSortRole(sortingFromSortAction(action)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/lib/document/document.cpp new/kdegraphics-4.2.98/gwenview/lib/document/document.cpp --- old/kdegraphics-4.2.95/gwenview/lib/document/document.cpp 2009-06-17 22:05:53.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/lib/document/document.cpp 2009-07-08 16:47:03.000000000 +0200 @@ -224,11 +224,10 @@ waitUntilLoaded(); bool ok = d->mImpl->save(url, format); if (ok) { - // Call QUndoStack::setClean() with a QueuedConnection to ensure we are - // (more or less :/) thread-safe. + // Use QueuedConnection to ensure we are (more or less :/) thread-safe. // FIXME: This method should be turned into an asynchronous call to // reduce thread-safe potential issues. - // No need to emit saved(), slotCleanChanged() will do it for us. + QMetaObject::invokeMethod(this, "saved", Qt::QueuedConnection, Q_ARG(KUrl, d->mUrl)); QMetaObject::invokeMethod(&d->mUndoStack, "setClean", Qt::QueuedConnection); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/part/gvpart.desktop new/kdegraphics-4.2.98/gwenview/part/gvpart.desktop --- old/kdegraphics-4.2.95/gwenview/part/gvpart.desktop 2009-05-27 21:53:10.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/part/gvpart.desktop 2009-07-21 17:20:55.000000000 +0200 @@ -48,6 +48,7 @@ Name[tr]=Gwenview Resim Gösterici Name[uk]=Переглядач зображень Gwenview Name[vi]=Bộ xem ảnh Gwenview +Name[wa]=Håyneu d' imådjes Gwenview Name[x-test]=xxGwenview Image Viewerxx Name[zh_CN]=Gwenview 图像查看器 Name[zh_TW]=Gwenview 影像檢視程式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/gwenview/tests/documenttest.cpp new/kdegraphics-4.2.98/gwenview/tests/documenttest.cpp --- old/kdegraphics-4.2.95/gwenview/tests/documenttest.cpp 2009-06-17 22:05:53.000000000 +0200 +++ new/kdegraphics-4.2.98/gwenview/tests/documenttest.cpp 2009-07-08 16:47:03.000000000 +0200 @@ -405,18 +405,24 @@ document()->editor()->setImage(image); } }; + QSignalSpy spy(DocumentFactory::instance(), SIGNAL(modifiedDocumentListChanged())); KUrl url = urlForTestFile("orient6.jpg"); Document::Ptr doc = DocumentFactory::instance()->load(url); doc->loadFullImage(); doc->waitUntilLoaded(); QVERIFY(!doc->isModified()); + QCOMPARE(spy.count(), 0); QVERIFY(doc->editor()); TestOperation* op = new TestOperation; op->setDocument(doc); doc->undoStack()->push(op); QVERIFY(doc->isModified()); + QCOMPARE(spy.count(), 1); + QList<KUrl> lst = DocumentFactory::instance()->modifiedDocumentList(); + QCOMPARE(lst.count(), 1); + QCOMPARE(lst.first(), url); KUrl destUrl = urlForTestOutputFile("modify.png"); QVERIFY(doc->save(destUrl, "png")); @@ -425,6 +431,8 @@ // event loop QTest::qWait(100); QVERIFY(!doc->isModified()); + QCOMPARE(spy.count(), 2); + QVERIFY(DocumentFactory::instance()->modifiedDocumentList().isEmpty()); } void DocumentTest::testMetaInfoJpeg() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/kamera/kcontrol/kamera.desktop new/kdegraphics-4.2.98/kamera/kcontrol/kamera.desktop --- old/kdegraphics-4.2.95/kamera/kcontrol/kamera.desktop 2009-05-27 21:53:13.000000000 +0200 +++ new/kdegraphics-4.2.98/kamera/kcontrol/kamera.desktop 2009-07-21 17:20:58.000000000 +0200 @@ -60,6 +60,7 @@ Comment[uz]=Fotoaparatni moslash Comment[uz@cyrillic]=Фотоапаратни мослаш Comment[vi]=Cấu hình Kamera +Comment[wa]=Apontyî Kamera Comment[xh]=Qwalasela Umfoti Comment[x-test]=xxConfigure Kameraxx Comment[zh_CN]=配置 Kamera @@ -174,6 +175,7 @@ Name[uz]=Fotoaparat Name[uz@cyrillic]=Фотоапарат Name[vi]=Máy ảnh số +Name[wa]=Aparey di fotos didjitå Name[xh]=Ikhamera Yesuntswana Name[x-test]=xxDigital Cameraxx Name[zh_CN]=数码相机 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/kamera/kcontrol/kameradevice.cpp new/kdegraphics-4.2.98/kamera/kcontrol/kameradevice.cpp --- old/kdegraphics-4.2.95/kamera/kcontrol/kameradevice.cpp 2009-05-06 12:13:24.000000000 +0200 +++ new/kdegraphics-4.2.98/kamera/kcontrol/kameradevice.cpp 2009-07-21 17:20:58.000000000 +0200 @@ -132,7 +132,7 @@ m_camera = NULL; emit error( i18n("Unable to initialize camera. Check your port settings and camera connectivity and try again."), - gp_result_as_string(result)); + QString::fromUtf8(gp_result_as_string(result))); return false; } @@ -168,7 +168,7 @@ result = gp_camera_get_config(m_camera, &window, glob_context); if (result != GP_OK) { - emit error(i18n("Camera configuration failed."), gp_result_as_string(result)); + emit error(i18n("Camera configuration failed."), QString::fromUtf8(gp_result_as_string(result))); return false; } @@ -178,7 +178,7 @@ if (result == GP_PROMPT_OK) { result = gp_camera_set_config(m_camera, window, glob_context); if (result != GP_OK) { - emit error(i18n("Camera configuration failed."), gp_result_as_string(result)); + emit error(i18n("Camera configuration failed."), QString::fromUtf8(gp_result_as_string(result))); return false; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/kgamma/kcmkgamma/kgamma.desktop new/kdegraphics-4.2.98/kgamma/kcmkgamma/kgamma.desktop --- old/kdegraphics-4.2.95/kgamma/kcmkgamma/kgamma.desktop 2009-05-27 21:53:10.000000000 +0200 +++ new/kdegraphics-4.2.98/kgamma/kcmkgamma/kgamma.desktop 2009-07-21 17:20:55.000000000 +0200 @@ -76,6 +76,7 @@ Name[is]=Litatíðni (gamma) Name[kk]=Гамма Name[km]=ហ្គាម៉ា +Name[mai]=गामा Name[ne]=गामा Name[oc]=Gammà Name[pa]=ਗ਼ਾਮਾ @@ -89,6 +90,7 @@ Name[th]=แกมมา Name[uk]=Гама Name[uz@cyrillic]=Гамма +Name[wa]=Gama Name[xh]=Unobumba wesithathu konoobumba besiGrike Name[x-test]=xxGammaxx Name[zh_HK]=伽馬（Gamma） diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/kolourpaint/kolourpaint.desktop new/kdegraphics-4.2.98/kolourpaint/kolourpaint.desktop --- old/kdegraphics-4.2.95/kolourpaint/kolourpaint.desktop 2009-05-27 21:53:13.000000000 +0200 +++ new/kdegraphics-4.2.98/kolourpaint/kolourpaint.desktop 2009-07-08 16:47:10.000000000 +0200 @@ -48,6 +48,7 @@ GenericName[ku]=Bernameya Nexşe Kirinê GenericName[lt]=Piešimo programa GenericName[lv]=Krāsošanas programma +GenericName[mai]=पेंट प्रोग्राम GenericName[ms]=Program Mewarna GenericName[nb]=Maleprogram GenericName[nds]=Maalprogramm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/kruler/kruler.notifyrc new/kdegraphics-4.2.98/kruler/kruler.notifyrc --- old/kdegraphics-4.2.95/kruler/kruler.notifyrc 2009-06-23 13:14:14.000000000 +0200 +++ new/kdegraphics-4.2.98/kruler/kruler.notifyrc 2009-07-21 17:20:58.000000000 +0200 @@ -2,7 +2,7 @@ IconName=kruler Comment=KDE Screen Ruler Comment[af]=Kde Skerm Liniaal -Comment[ar]=مسطرة الشاشة لكيدي +Comment[ar]=مسطرة الشاشة لكدي Comment[ca]=Regle de pantalla del KDE Comment[cs]=Obrazovkové pravítko Comment[cy]=Mesurydd Sgrîn KDE @@ -97,6 +97,7 @@ Name[nds]=Mit Pieltasten verschaven Name[nl]=Verplaatst door cursortoetsen Name[nn]=Flytta med piltastar +Name[pa]=ਕਰਸਰ ਸਵਿੱਚਾਂ ਹਿਲਾਇਆ Name[pl]=Przesunięto klawiszami kursora Name[pt]=Movido pelas Teclas de Cursores Name[pt_BR]=Movido pelas teclas de direção diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/ksaneplugin/ksane_scan_service.desktop new/kdegraphics-4.2.98/ksaneplugin/ksane_scan_service.desktop --- old/kdegraphics-4.2.95/ksaneplugin/ksane_scan_service.desktop 2009-05-27 21:53:07.000000000 +0200 +++ new/kdegraphics-4.2.98/ksaneplugin/ksane_scan_service.desktop 2009-07-21 17:20:54.000000000 +0200 @@ -2,7 +2,7 @@ Type=Service Name=KDE Scan Service Name[af]=Kde Skandeer Diens -Name[ar]=خدمة المسح لكيدي +Name[ar]=خدمة المسح لكدي Name[bg]=Услуга за сканиране Name[br]=Damanterien skramm Name[ca]=Servei d'escaneig del KDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/ksnapshot/ksnapshot.desktop new/kdegraphics-4.2.98/ksnapshot/ksnapshot.desktop --- old/kdegraphics-4.2.95/ksnapshot/ksnapshot.desktop 2009-05-27 21:53:13.000000000 +0200 +++ new/kdegraphics-4.2.98/ksnapshot/ksnapshot.desktop 2009-07-08 16:47:10.000000000 +0200 @@ -32,6 +32,7 @@ GenericName[ku]=Bernameya Wêne Girtina Dîmenderê GenericName[lt]=Ekrano kopijos programa GenericName[lv]=Ekrāna tveršanas programma +GenericName[mai]=स्क्रीन केप्चर प्रोग्राम GenericName[ms]=Program Cekupan Skrin GenericName[nb]=Skjermbildeprogram GenericName[nds]=Schirmfotos opnehmen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.2.98/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp --- old/kdegraphics-4.2.95/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2009-06-23 13:14:10.000000000 +0200 +++ new/kdegraphics-4.2.98/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2009-07-08 16:47:03.000000000 +0200 @@ -733,6 +733,7 @@ } case Exiv2::xmpBag: case Exiv2::xmpSeq: + case Exiv2::xmpAlt: { QStringList list; for (int i=0; i < it->count(); i++) @@ -741,7 +742,7 @@ } return list; } - case Exiv2::xmpAlt: + case Exiv2::langAlt: { // access the value directly const Exiv2::LangAltValue &value = static_cast<const Exiv2::LangAltValue &>(it->value()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/libs/libkipi/kipiplugin.desktop new/kdegraphics-4.2.98/libs/libkipi/kipiplugin.desktop --- old/kdegraphics-4.2.95/libs/libkipi/kipiplugin.desktop 2009-06-23 13:14:10.000000000 +0200 +++ new/kdegraphics-4.2.98/libs/libkipi/kipiplugin.desktop 2009-07-21 17:20:55.000000000 +0200 @@ -18,6 +18,7 @@ Name[sr@latin]=KIPI priključak Name[sv]=KIPI-insticksprogram Name[tr]=KIPI Eklentisi +Name[wa]=Tchôke-divins KIPI Name[x-test]=xxKIPIPluginxx Name[zh_TW]=KIPI 外掛程式 Comment=A KIPI Plugin @@ -60,6 +61,7 @@ Comment[th]=โปรแกรมเสริม KIPI Comment[tr]=Bir KIPI Eklentisi Comment[uk]=Додаток KIPI +Comment[wa]=On tchôke-divins KIPI Comment[x-test]=xxA KIPI Pluginxx Comment[zh_CN]=一个 KIPI 插件 Comment[zh_TW]=KIPI 外掛程式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/CMakeLists.txt new/kdegraphics-4.2.98/okular/CMakeLists.txt --- old/kdegraphics-4.2.95/okular/CMakeLists.txt 2009-02-18 17:28:33.000000000 +0100 +++ new/kdegraphics-4.2.98/okular/CMakeLists.txt 2009-07-08 16:47:10.000000000 +0200 @@ -101,7 +101,7 @@ target_link_libraries(okularcore ${OKULAR_IOKIT} ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${KDE4_KJSAPI_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} ) -set_target_properties(okularcore PROPERTIES VERSION 1.2.0 SOVERSION 1 ) +set_target_properties(okularcore PROPERTIES VERSION 1.3.0 SOVERSION 1 ) install(TARGETS okularcore ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/VERSION new/kdegraphics-4.2.98/okular/VERSION --- old/kdegraphics-4.2.95/okular/VERSION 2009-06-24 18:19:41.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/VERSION 2009-07-21 17:20:57.000000000 +0200 @@ -1 +1 @@ -okular v0.8.90 +okular v0.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/document.cpp new/kdegraphics-4.2.98/okular/core/document.cpp --- old/kdegraphics-4.2.95/okular/core/document.cpp 2009-05-14 19:26:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/core/document.cpp 2009-07-08 16:47:03.000000000 +0200 @@ -890,8 +890,12 @@ } } -void DocumentPrivate::rotationFinished( int page ) +void DocumentPrivate::rotationFinished( int page, Okular::Page *okularPage ) { + Okular::Page *wantedPage = m_pagesVector.value( page, 0 ); + if ( !wantedPage || wantedPage != okularPage ) + return; + QMap< int, DocumentObserver * >::const_iterator it = m_observers.constBegin(), end = m_observers.constEnd(); for ( ; it != end ; ++ it ) { (*it)->notifyPageChanged( page, DocumentObserver::Pixmap | DocumentObserver::Annotations ); @@ -1464,8 +1468,8 @@ d->m_bookmarkManager = new BookmarkManager( d ); d->m_viewportIterator = d->m_viewportHistory.insert( d->m_viewportHistory.end(), DocumentViewport() ); - connect( PageController::self(), SIGNAL( rotationFinished( int ) ), - this, SLOT( rotationFinished( int ) ) ); + connect( PageController::self(), SIGNAL( rotationFinished( int, Okular::Page * ) ), + this, SLOT( rotationFinished( int, Okular::Page * ) ) ); connect( Settings::self(), SIGNAL( configChanged() ), this, SLOT( _o_configChanged() ) ); qRegisterMetaType<Okular::FontInfo>(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/document.h new/kdegraphics-4.2.98/okular/core/document.h --- old/kdegraphics-4.2.95/okular/core/document.h 2009-05-14 19:26:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/core/document.h 2009-07-08 16:47:03.000000000 +0200 @@ -699,7 +699,7 @@ Q_PRIVATE_SLOT( d, void saveDocumentInfo() const ) Q_PRIVATE_SLOT( d, void slotTimedMemoryCheck() ) Q_PRIVATE_SLOT( d, void sendGeneratorRequest() ) - Q_PRIVATE_SLOT( d, void rotationFinished( int page ) ) + Q_PRIVATE_SLOT( d, void rotationFinished( int page, Okular::Page *okularPage ) ) Q_PRIVATE_SLOT( d, void fontReadingProgress( int page ) ) Q_PRIVATE_SLOT( d, void fontReadingGotFont( const Okular::FontInfo& font ) ) Q_PRIVATE_SLOT( d, void slotGeneratorConfigChanged( const QString& ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/document_p.h new/kdegraphics-4.2.98/okular/core/document_p.h --- old/kdegraphics-4.2.95/okular/core/document_p.h 2009-05-14 19:26:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/core/document_p.h 2009-07-08 16:47:03.000000000 +0200 @@ -118,7 +118,7 @@ void saveDocumentInfo() const; void slotTimedMemoryCheck(); void sendGeneratorRequest(); - void rotationFinished( int page ); + void rotationFinished( int page, Okular::Page *okularPage ); void fontReadingProgress( int page ); void fontReadingGotFont( const Okular::FontInfo& font ); void slotGeneratorConfigChanged( const QString& ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/okularGenerator.desktop new/kdegraphics-4.2.98/okular/core/okularGenerator.desktop --- old/kdegraphics-4.2.95/okular/core/okularGenerator.desktop 2009-06-23 13:14:10.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/core/okularGenerator.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -2,7 +2,7 @@ Type=ServiceType X-KDE-ServiceType=okular/Generator Comment=File format backend for Okular -Comment[ar]=المنتهى الخلفي لـ نسق الملف لأوكلار +Comment[ar]=المنتهى الخلفي لـنسق الملف لأوكلار Comment[ca]=Dorsal de format de fitxer per a l'Okular Comment[da]=Filformatmotor til Okular Comment[de]=Dateiformat-Modul für Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/pagecontroller.cpp new/kdegraphics-4.2.98/okular/core/pagecontroller.cpp --- old/kdegraphics-4.2.95/okular/core/pagecontroller.cpp 2008-01-05 00:53:45.000000000 +0100 +++ new/kdegraphics-4.2.98/okular/core/pagecontroller.cpp 2009-07-08 16:47:03.000000000 +0200 @@ -52,7 +52,7 @@ { job->page()->imageRotationDone( job ); - emit rotationFinished( job->page()->m_number ); + emit rotationFinished( job->page()->m_number, job->page()->m_page ); } job->deleteLater(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/pagecontroller_p.h new/kdegraphics-4.2.98/okular/core/pagecontroller_p.h --- old/kdegraphics-4.2.95/okular/core/pagecontroller_p.h 2008-01-05 00:53:45.000000000 +0100 +++ new/kdegraphics-4.2.98/okular/core/pagecontroller_p.h 2009-07-08 16:47:03.000000000 +0200 @@ -38,7 +38,7 @@ void addRotationJob( RotationJob *job ); signals: - void rotationFinished( int page ); + void rotationFinished( int page, Okular::Page *okularPage ); private slots: void imageRotationDone(ThreadWeaver::Job*); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/core/version.h new/kdegraphics-4.2.98/okular/core/version.h --- old/kdegraphics-4.2.95/okular/core/version.h 2009-06-24 18:19:41.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/core/version.h 2009-07-21 17:20:56.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.8.90" +#define OKULAR_VERSION_STRING "0.9" #define OKULAR_VERSION_MAJOR 0 -#define OKULAR_VERSION_MINOR 8 -#define OKULAR_VERSION_RELEASE 90 +#define OKULAR_VERSION_MINOR 9 +#define OKULAR_VERSION_RELEASE 0 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/chm/generator_chm.cpp new/kdegraphics-4.2.98/okular/generators/chm/generator_chm.cpp --- old/kdegraphics-4.2.95/okular/generators/chm/generator_chm.cpp 2009-05-14 19:26:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/chm/generator_chm.cpp 2009-07-08 16:47:08.000000000 +0200 @@ -36,7 +36,7 @@ "okular_chm", "okular_chm", ki18n( "CHM Backend" ), - "0.1.1", + "0.1.3", ki18n( "A Microsoft Windows help file renderer" ), KAboutData::License_GPL, ki18n( "© 2005-2007 Piotr Szymański\n© 2008 Albert Astals Cid" ) @@ -96,7 +96,12 @@ { QDomElement item = m_docSyn.createElement(e.name); if (!e.urls.isEmpty()) - item.setAttribute("ViewportName", e.urls.first()); + { + QString url = e.urls.first(); + if (url.contains(QChar::fromLatin1('%'))) + url = QString::fromUtf8(QByteArray::fromPercentEncoding(url.toUtf8())); + item.setAttribute("ViewportName", url); + } item.setAttribute("Icon", e.imageid); if (e.indent == 0) m_docSyn.appendChild(item); else lastIndentElement[e.indent - 1].appendChild(item); @@ -436,8 +441,10 @@ { if ( key == "NamedViewport" && !option.toString().isEmpty() ) { + const int pos = option.toString().indexOf('#'); + QString tmpUrl = pos == -1 ? option.toString() : option.toString().left(pos); Okular::DocumentViewport viewport; - QMap<QString,int>::const_iterator it = m_urlPage.find(option.toString()); + QMap<QString,int>::const_iterator it = m_urlPage.find(tmpUrl); if (it != m_urlPage.end()) { viewport.pageNumber = it.value(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/chm/kio-msits/msits.protocol new/kdegraphics-4.2.98/okular/generators/chm/kio-msits/msits.protocol --- old/kdegraphics-4.2.95/okular/generators/chm/kio-msits/msits.protocol 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/chm/kio-msits/msits.protocol 2009-07-21 17:20:57.000000000 +0200 @@ -37,6 +37,7 @@ Description[ne]=विनहेल्प फाइल प्रदर्शन गर्नका लागि कियोस्लाभ Description[nl]=Een kioslave voor het weergeven van WinHelp-bestanden Description[nn]=Ein kioslave for vising av WinHelp-filer +Description[pa]=WinHelp ਫਾਇਲਾਂ ਵੇਖਾਉਣ ਲਈ kioslave Description[pl]=Moduł wyświetlający pliki WinHelp Description[pt]=Um 'kioslave' para mostrar ficheiros do WinHelp Description[pt_BR]=Um kioslave para mostrar arquivos WinHelp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/chm/okularApplication_chm.desktop new/kdegraphics-4.2.98/okular/generators/chm/okularApplication_chm.desktop --- old/kdegraphics-4.2.95/okular/generators/chm/okularApplication_chm.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/chm/okularApplication_chm.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/comicbook/libokularGenerator_comicbook.desktop new/kdegraphics-4.2.98/okular/generators/comicbook/libokularGenerator_comicbook.desktop --- old/kdegraphics-4.2.95/okular/generators/comicbook/libokularGenerator_comicbook.desktop 2009-06-23 13:14:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/comicbook/libokularGenerator_comicbook.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -31,6 +31,7 @@ Name[th]=หนังสือการ์ตูน Name[uk]=Комікс Name[vi]=Truyện Tranh +Name[wa]=Binde d' imådjes Name[x-test]=xxComic Bookxx Comment=Comic book backend for Okular Comment[ar]=المنتهى الخلفي Comic book لأوكلار @@ -71,6 +72,7 @@ Comment[th]=แบ็คเอนต์หนังสือการ์ตูนสำหรับ Okular Comment[tr]=Okular için Comic book arka ucu Comment[uk]=Втулка коміксів для Okular +Comment[wa]=Programe fondmint d' Okular po les bindes d' imådjes Comment[x-test]=xxComic book backend for Okularxx Comment[zh_CN]=Okular 的 Comic book 格式后端 Comment[zh_TW]=Okular 的 Comic book 後端 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/comicbook/okularApplication_comicbook.desktop new/kdegraphics-4.2.98/okular/generators/comicbook/okularApplication_comicbook.desktop --- old/kdegraphics-4.2.95/okular/generators/comicbook/okularApplication_comicbook.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/comicbook/okularApplication_comicbook.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/djvu/libokularGenerator_djvu.desktop new/kdegraphics-4.2.98/okular/generators/djvu/libokularGenerator_djvu.desktop --- old/kdegraphics-4.2.95/okular/generators/djvu/libokularGenerator_djvu.desktop 2009-06-23 13:14:13.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/djvu/libokularGenerator_djvu.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -49,6 +49,7 @@ Comment[th]=แบ็คเอนต์เอกสาร DjVu สำหรับ Okular Comment[tr]=Okular için DjVu arka ucu Comment[uk]=Втулка DjVu для Okular +Comment[wa]=Programe fondmint d' Okular po DjVu Comment[x-test]=xxDjVu backend for Okularxx Comment[zh_CN]=Okular 的 Djvu 格式后端 Comment[zh_TW]=Okular 的 DjVu 後端 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/djvu/okularApplication_djvu.desktop new/kdegraphics-4.2.98/okular/generators/djvu/okularApplication_djvu.desktop --- old/kdegraphics-4.2.95/okular/generators/djvu/okularApplication_djvu.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/djvu/okularApplication_djvu.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/dvi/generator_dvi.cpp new/kdegraphics-4.2.98/okular/generators/dvi/generator_dvi.cpp --- old/kdegraphics-4.2.95/okular/generators/dvi/generator_dvi.cpp 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/dvi/generator_dvi.cpp 2009-07-08 16:47:06.000000000 +0200 @@ -51,7 +51,7 @@ "okular_dvi", "okular_dvi", ki18n( "DVI Backend" ), - "0.1", + "0.2", ki18n( "A DVI file renderer" ), KAboutData::License_GPL, ki18n( "© 2006 Luigi Toscano" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/dvi/libokularGenerator_dvi.desktop new/kdegraphics-4.2.98/okular/generators/dvi/libokularGenerator_dvi.desktop --- old/kdegraphics-4.2.95/okular/generators/dvi/libokularGenerator_dvi.desktop 2009-06-23 13:14:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/dvi/libokularGenerator_dvi.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -48,6 +48,7 @@ Comment[th]=แบ็คเอนต์เอกสาร DVI สำหรับ Okular Comment[tr]=Okular için DVI arka ucu Comment[uk]=Втулка DVI для Okular +Comment[wa]=Programe fondmint d' Okular po les DVI Comment[x-test]=xxDVI backend for Okularxx Comment[zh_CN]=Okular 的 DVI 格式后端 Comment[zh_TW]=Okular 的 DVI 後端 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/dvi/okularApplication_dvi.desktop new/kdegraphics-4.2.98/okular/generators/dvi/okularApplication_dvi.desktop --- old/kdegraphics-4.2.95/okular/generators/dvi/okularApplication_dvi.desktop 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/dvi/okularApplication_dvi.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/epub/libokularGenerator_epub.desktop new/kdegraphics-4.2.98/okular/generators/epub/libokularGenerator_epub.desktop --- old/kdegraphics-4.2.95/okular/generators/epub/libokularGenerator_epub.desktop 2009-06-23 13:14:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/epub/libokularGenerator_epub.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -3,6 +3,7 @@ Name=EPub document Name[ar]=مستند إيباب Name[ca]=Document EPub +Name[cs]=EPub dokument Name[da]=EPub-dokument Name[de]=EPub-Dokument Name[el]=Έγγραφο EPub @@ -40,6 +41,7 @@ Name[th]=เอกสาร EPub Name[tr]=EPub belgesi Name[uk]=Документ EPub +Name[wa]=Documint EPub Name[x-test]=xxEPub documentxx Name[zh_CN]=EPub 文档 Name[zh_TW]=EPub 文件 @@ -82,6 +84,7 @@ Comment[th]=แบ็คเอนต์เอกสาร EPub สำหรับ Okular Comment[tr]=Okular için EPub arka ucu Comment[uk]=Втулка EPub для Okular +Comment[wa]=Programe fondmint d' Okular po EPub Comment[x-test]=xxEPub backend for Okularxx Comment[zh_CN]=Okular 的 EPub 格式后端 Comment[zh_TW]=Okular 的 EPub 後端 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/epub/okularApplication_epub.desktop new/kdegraphics-4.2.98/okular/generators/epub/okularApplication_epub.desktop --- old/kdegraphics-4.2.95/okular/generators/epub/okularApplication_epub.desktop 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/epub/okularApplication_epub.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/fax/libokularGenerator_fax.desktop new/kdegraphics-4.2.98/okular/generators/fax/libokularGenerator_fax.desktop --- old/kdegraphics-4.2.95/okular/generators/fax/libokularGenerator_fax.desktop 2009-06-23 13:14:13.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/fax/libokularGenerator_fax.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -3,6 +3,7 @@ Name=Fax documents Name[ar]=مستندات الفاكس Name[ca]=Documents de fax +Name[cs]=Faxové dokumenty Name[da]=Fax-dokumenter Name[de]=Fax-Dokumente Name[el]=Έγγραφα φαξ @@ -31,11 +32,13 @@ Name[pt_BR]=Documentos de fax Name[ro]=Documente fax Name[ru]=Факс +Name[sl]=Faksi Name[sr]=Факсови Name[sr@latin]=Faksovi Name[sv]=Telefax-dokument Name[tr]=Faks belgeleri Name[uk]=Документи факсів +Name[wa]=Documints facs Name[x-test]=xxFax documentsxx Name[zh_CN]=Fax 文档 Name[zh_TW]=傳真文件 @@ -70,6 +73,7 @@ Comment[pt_BR]=Infraestrutura de fax G3/G4 para o Okular Comment[ro]=Platformă fax G3/G4 pentru Okular Comment[ru]=Модуль поддержки формата G3/G4 Fax для Okular +Comment[sl]=Hrbtenica za fakse G3/G4 za Okular Comment[sr]=Позадина Г3/Г4 факсова за Окулар Comment[sr@latin]=Pozadina G3/G4 faksova za Okular Comment[sv]=G3/G4 telefax-gränssnitt för Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/fax/okularApplication_fax.desktop new/kdegraphics-4.2.98/okular/generators/fax/okularApplication_fax.desktop --- old/kdegraphics-4.2.95/okular/generators/fax/okularApplication_fax.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/fax/okularApplication_fax.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/fictionbook/generator_fb.cpp new/kdegraphics-4.2.98/okular/generators/fictionbook/generator_fb.cpp --- old/kdegraphics-4.2.95/okular/generators/fictionbook/generator_fb.cpp 2008-03-06 10:25:20.000000000 +0100 +++ new/kdegraphics-4.2.98/okular/generators/fictionbook/generator_fb.cpp 2009-07-08 16:47:08.000000000 +0200 @@ -20,7 +20,7 @@ "okular_fictionbook", "okular_fictionbook", ki18n( "Fiction Book Backend" ), - "0.1", + "0.1.1", ki18n( "A renderer for FictionBook eBooks" ), KAboutData::License_GPL, ki18n( "© 2007-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/fictionbook/okularApplication_fb.desktop new/kdegraphics-4.2.98/okular/generators/fictionbook/okularApplication_fb.desktop --- old/kdegraphics-4.2.95/okular/generators/fictionbook/okularApplication_fb.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/fictionbook/okularApplication_fb.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/kimgio/libokularGenerator_kimgio.desktop new/kdegraphics-4.2.98/okular/generators/kimgio/libokularGenerator_kimgio.desktop --- old/kdegraphics-4.2.95/okular/generators/kimgio/libokularGenerator_kimgio.desktop 2009-06-23 13:14:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/kimgio/libokularGenerator_kimgio.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service Name=KDE Image libraries -Name[ar]=مكتبات الصورة لكيدي +Name[ar]=مكتبات الصورة لكدي Name[bg]=Библиотеки с галерии Name[ca]=Biblioteques d'imatges del KDE Name[cs]=Knihovny obrázků KDE @@ -47,6 +47,7 @@ Name[tr]=KDE Resim kitaplıkları Name[uk]=Бібліотеки зображень KDE Name[vi]=Các thư viện ảnh của KDE +Name[wa]=Livreyes d' imådje di KDE Name[x-test]=xxKDE Image librariesxx Name[zh_CN]=KDE 图像库 Name[zh_TW]=KDE 影像函式庫 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/kimgio/okularApplication_kimgio.desktop new/kdegraphics-4.2.98/okular/generators/kimgio/okularApplication_kimgio.desktop --- old/kdegraphics-4.2.95/okular/generators/kimgio/okularApplication_kimgio.desktop 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/kimgio/okularApplication_kimgio.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/mobipocket/libokularGenerator_mobi.desktop new/kdegraphics-4.2.98/okular/generators/mobipocket/libokularGenerator_mobi.desktop --- old/kdegraphics-4.2.95/okular/generators/mobipocket/libokularGenerator_mobi.desktop 2009-06-23 13:14:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/mobipocket/libokularGenerator_mobi.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -1,25 +1,35 @@ [Desktop Entry] Type=Service Name=Mobipocket document +Name[ar]=مستند Mobipocket Name[ca]=Document Mobipocket +Name[cs]=Mobipocket dokument Name[da]=Mobipocket-dokument Name[de]=Mobipocket-Dokument Name[el]=Έγγραφο Mobipocket Name[es]=Documento Mobipocket Name[et]=Mobipocketi dokument Name[eu]=Mobipocket dokumentua +Name[fr]=Document Mobipocket Name[ga]=Cáipéis Mobipocket Name[gl]=Documento Mobipocket +Name[hu]=Mobipocket-dokumentum Name[is]=Mobipocket skjal +Name[it]=Documento Mobipocket Name[ja]=Mobipocket 文書 Name[km]=ឯកសារ Mobipocket Name[ko]=Mobipocket 문서 +Name[lt]=Mobipocket dokumentas Name[lv]=Mobipocket dokuments Name[nb]=Mobipocket-dokument Name[nds]=Mobipocket-Dokment +Name[nl]=Mobipocket-document Name[nn]=Mobipocket-dokument +Name[pa]=ਮੋਬਾਪਾਕਟ ਡੌਕੂਮੈਂਟ Name[pt]=Documento do Mobipocket Name[pt_BR]=Documento Mobipocket +Name[ru]=Документ Mobipocket +Name[sl]=Dokument Mobipocket Name[sr]=Мобипокет Name[sr@latin]=Mobipocket Name[sv]=Mobipocket-dokument @@ -29,6 +39,7 @@ Name[zh_CN]=Mobipocket 文档 Name[zh_TW]=Mobipocket 文件 Comment=Mobipocket backend for Okular +Comment[ar]=خلفية Mobipocket لأوكلار Comment[ca]=Dorsal de Mobipocket per a l'Okular Comment[da]=Mobipocket-motor til Okular Comment[de]=Ein Anzeigemodul für Mobipocket-Dateien in Okular @@ -36,18 +47,26 @@ Comment[es]=Motor Mobipocket para Okular Comment[et]=Okulari Mobipocketi taustaprogramm Comment[eu]=Okular-en Mobipocket motorra +Comment[fr]=Interface d'Okular pour le format Mobipocket Comment[ga]=Inneall Mobipocket le haghaidh Okular Comment[gl]=Infraestrutura de Mobipocket para Okular +Comment[hu]=Mobipocket-bővítmény az Okularhoz Comment[is]=Mobipocket stuðningur fyrir Okular +Comment[it]=Backend Mobipocket per Okular Comment[ja]=Okular の Mobipocket 用バックエンド Comment[km]=កម្មវិធីខាងក្រោយសម្រាប់ Mobipocket សម្រាប់ Okular Comment[ko]=Okular의 Mobipocket 백엔드 +Comment[lt]=Mobipocket programinė sąsaja, skirta Okular Comment[lv]=Mobipocket Okular aizmugure Comment[nb]=Mobipocket-motor for okular Comment[nds]=Mobipocket-Hülppropgramm för Okular +Comment[nl]=Mobipocket-backend voor Okular Comment[nn]=Mobipocket-motor for Okular +Comment[pa]=ਓਕੁਲਾਰ ਲਈ ਮੋਬਾਪਾਕਟ ਬੈਕਐਂਡ Comment[pt]=Infra-estrutura do Mobipocket para o Okular Comment[pt_BR]=Infraestrutura Mobipocket para o Okular +Comment[ru]=Модуль поддержки формата Mobipocket для Okular +Comment[sl]=Hrbtenica za Mobipocket Okular Comment[sr]=Позадина Мобипокета за Окулар Comment[sr@latin]=Pozadina Mobipocketa za Okular Comment[sv]=Mobipocket-gränssnitt för Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/mobipocket/okularApplication_mobi.desktop new/kdegraphics-4.2.98/okular/generators/mobipocket/okularApplication_mobi.desktop --- old/kdegraphics-4.2.95/okular/generators/mobipocket/okularApplication_mobi.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/mobipocket/okularApplication_mobi.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/ooo/generator_ooo.cpp new/kdegraphics-4.2.98/okular/generators/ooo/generator_ooo.cpp --- old/kdegraphics-4.2.95/okular/generators/ooo/generator_ooo.cpp 2009-01-16 16:04:49.000000000 +0100 +++ new/kdegraphics-4.2.98/okular/generators/ooo/generator_ooo.cpp 2009-07-08 16:47:07.000000000 +0200 @@ -20,7 +20,7 @@ "okular_ooo", "okular_ooo", ki18n( "OpenOffice Document Backend" ), - "0.2", + "0.2.2", ki18n( "A renderer for OpenOffice text documents" ), KAboutData::License_GPL, ki18n( "© 2006-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/ooo/libokularGenerator_ooo.desktop new/kdegraphics-4.2.98/okular/generators/ooo/libokularGenerator_ooo.desktop --- old/kdegraphics-4.2.95/okular/generators/ooo/libokularGenerator_ooo.desktop 2009-06-23 13:14:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/ooo/libokularGenerator_ooo.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -46,6 +46,7 @@ Name[tr]=OpenDocument biçimi Name[uk]=Формат OpenDocument Name[vi]=Tập tin OpenDocument +Name[wa]=Cogne OpenDocument Name[x-test]=xxOpenDocument formatxx Name[zh_CN]=开放文档格式 Name[zh_TW]=OpenDocument 格式 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/ooo/okularApplication_ooo.desktop new/kdegraphics-4.2.98/okular/generators/ooo/okularApplication_ooo.desktop --- old/kdegraphics-4.2.95/okular/generators/ooo/okularApplication_ooo.desktop 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/ooo/okularApplication_ooo.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/plucker/libokularGenerator_plucker.desktop new/kdegraphics-4.2.98/okular/generators/plucker/libokularGenerator_plucker.desktop --- old/kdegraphics-4.2.95/okular/generators/plucker/libokularGenerator_plucker.desktop 2009-06-23 13:14:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/plucker/libokularGenerator_plucker.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -4,6 +4,7 @@ Name[ar]=مستند Plucker Name[bg]=Plucker документ Name[ca]=Document Plucker +Name[cs]=Plucker dokument Name[da]=Plucker-dokument Name[de]=Plucker-Dokument Name[el]=Έγγραφο Plucker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/plucker/okularApplication_plucker.desktop new/kdegraphics-4.2.98/okular/generators/plucker/okularApplication_plucker.desktop --- old/kdegraphics-4.2.95/okular/generators/plucker/okularApplication_plucker.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/plucker/okularApplication_plucker.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/poppler/generator_pdf.cpp new/kdegraphics-4.2.98/okular/generators/poppler/generator_pdf.cpp --- old/kdegraphics-4.2.95/okular/generators/poppler/generator_pdf.cpp 2009-06-24 18:19:41.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/poppler/generator_pdf.cpp 2009-07-21 17:20:56.000000000 +0200 @@ -274,7 +274,7 @@ "okular_poppler", "okular_poppler", ki18n( "PDF Backend" ), - "0.2", + "0.2.1", ki18n( "A PDF file renderer" ), KAboutData::License_GPL, ki18n( "© 2005-2008 Albert Astals Cid" ) @@ -289,7 +289,7 @@ : Generator( parent, args ), pdfdoc( 0 ), ready( true ), pixmapRequest( 0 ), docInfoDirty( true ), docSynopsisDirty( true ), docEmbeddedFilesDirty( true ), nextFontPage( 0 ), - dpiX( Okular::Utils::realDpiX() ), dpiY( Okular::Utils::realDpiY() ) // we want real DPI values for page sizes + dpiX( Okular::Utils::dpiX() ), dpiY( Okular::Utils::dpiY() ) { setFeature( TextExtraction ); setFeature( FontInfo ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/poppler/okularApplication_pdf.desktop new/kdegraphics-4.2.98/okular/generators/poppler/okularApplication_pdf.desktop --- old/kdegraphics-4.2.95/okular/generators/poppler/okularApplication_pdf.desktop 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/poppler/okularApplication_pdf.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/spectre/generator_ghostview.cpp new/kdegraphics-4.2.98/okular/generators/spectre/generator_ghostview.cpp --- old/kdegraphics-4.2.95/okular/generators/spectre/generator_ghostview.cpp 2009-05-06 12:13:23.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/spectre/generator_ghostview.cpp 2009-07-08 16:47:07.000000000 +0200 @@ -39,7 +39,7 @@ "okular_ghostview", "okular_ghostview", ki18n( "PS Backend" ), - "0.1.1", + "0.1.2", ki18n( "A PostScript file renderer." ), KAboutData::License_GPL, ki18n( "© 2007-2008 Albert Astals Cid" ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/spectre/okularApplication_ghostview.desktop new/kdegraphics-4.2.98/okular/generators/spectre/okularApplication_ghostview.desktop --- old/kdegraphics-4.2.95/okular/generators/spectre/okularApplication_ghostview.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/spectre/okularApplication_ghostview.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/tiff/generator_tiff.cpp new/kdegraphics-4.2.98/okular/generators/tiff/generator_tiff.cpp --- old/kdegraphics-4.2.95/okular/generators/tiff/generator_tiff.cpp 2009-06-17 22:05:53.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/tiff/generator_tiff.cpp 2009-07-08 16:47:06.000000000 +0200 @@ -164,7 +164,7 @@ "okular_tiff", "okular_tiff", ki18n( "TIFF Backend" ), - "0.2.3", + "0.2.4", ki18n( "A TIFF backend" ), KAboutData::License_GPL, ki18n( "© 2006-2008 Pino Toscano" ), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/tiff/libokularGenerator_tiff.desktop new/kdegraphics-4.2.98/okular/generators/tiff/libokularGenerator_tiff.desktop --- old/kdegraphics-4.2.95/okular/generators/tiff/libokularGenerator_tiff.desktop 2009-06-23 13:14:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/tiff/libokularGenerator_tiff.desktop 2009-07-08 16:47:06.000000000 +0200 @@ -39,7 +39,7 @@ Name[sr@latin]=Okularova TIFF biblioteka Name[sv]=Okular TIFF-bibliotek Name[th]=ไลบรารีจัดการแฟ้ม TIFF สำหรับ Okular -Name[tr]=Okular için TIFF Kütüphanesi +Name[tr]=Okular için TIFF Kitaplığı Name[uk]=Бібліотека TIFF для Okular Name[x-test]=xxOkular TIFF Libraryxx Name[zh_CN]=Okular TIFF 库 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/tiff/okularApplication_tiff.desktop new/kdegraphics-4.2.98/okular/generators/tiff/okularApplication_tiff.desktop --- old/kdegraphics-4.2.95/okular/generators/tiff/okularApplication_tiff.desktop 2009-05-27 21:53:11.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/tiff/okularApplication_tiff.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/xps/generator_xps.cpp new/kdegraphics-4.2.98/okular/generators/xps/generator_xps.cpp --- old/kdegraphics-4.2.95/okular/generators/xps/generator_xps.cpp 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/xps/generator_xps.cpp 2009-07-08 16:47:09.000000000 +0200 @@ -45,7 +45,7 @@ "okular_xps", "okular_xps", ki18n( "XPS Backend" ), - "0.3", + "0.3.1", ki18n( "An XPS backend" ), KAboutData::License_GPL, ki18n( "© 2006-2007 Brad Hards\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/generators/xps/okularApplication_xps.desktop new/kdegraphics-4.2.98/okular/generators/xps/okularApplication_xps.desktop --- old/kdegraphics-4.2.95/okular/generators/xps/okularApplication_xps.desktop 2009-05-27 21:53:12.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/generators/xps/okularApplication_xps.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -34,8 +34,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -55,6 +56,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/shell/okular.desktop new/kdegraphics-4.2.98/okular/shell/okular.desktop --- old/kdegraphics-4.2.95/okular/shell/okular.desktop 2009-05-27 21:53:10.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/shell/okular.desktop 2009-07-21 17:20:56.000000000 +0200 @@ -33,8 +33,9 @@ GenericName[km]=កម្មវិធីមើលឯកសារ GenericName[ko]=문서 뷰어 GenericName[ku]=Nîşanderê Belgeyan -GenericName[lt]=Dokumentų žiūriklė +GenericName[lt]=Dokumentų žiūryklė GenericName[lv]=Dokumentu skatītājs +GenericName[mai]=दस्ताबेज प्रदर्शक GenericName[nb]=Dokumentviser GenericName[nds]=Dokmentkieker GenericName[ne]=कागजात दर्शक @@ -54,6 +55,7 @@ GenericName[th]=เครื่องมือแสดงเอกสาร GenericName[tr]=Belge Gösterici GenericName[uk]=Переглядач документів +GenericName[wa]=Håyneu d' documints GenericName[x-test]=xxDocument Viewerxx GenericName[zh_CN]=文档查看器 GenericName[zh_TW]=文件檢視器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/okular/shell/shell.cpp new/kdegraphics-4.2.98/okular/shell/shell.cpp --- old/kdegraphics-4.2.95/okular/shell/shell.cpp 2009-05-19 14:06:20.000000000 +0200 +++ new/kdegraphics-4.2.98/okular/shell/shell.cpp 2009-07-08 16:47:04.000000000 +0200 @@ -57,9 +57,14 @@ so we have to find it manually and build up the URL by taking its ref, if any. */ - KUrl url = m_args->url(argIndex); - const QString arg = m_args->arg(argIndex); - const int sharpPos = arg.lastIndexOf(QLatin1Char('#')); + QString arg = m_args->arg(argIndex); + arg.replace(QRegExp("^file:/{1,3}"), "/"); + KUrl url = KCmdLineArgs::makeURL(arg.toUtf8()); + int sharpPos = -1; + if (!url.isLocalFile() || !QFile::exists(url.toLocalFile())) + { + sharpPos = arg.lastIndexOf(QLatin1Char('#')); + } if (sharpPos != -1) { url = KCmdLineArgs::makeURL(arg.left(sharpPos).toUtf8()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/strigi-analyzer/exr/kfile_exr.desktop new/kdegraphics-4.2.98/strigi-analyzer/exr/kfile_exr.desktop --- old/kdegraphics-4.2.95/strigi-analyzer/exr/kfile_exr.desktop 2009-05-27 21:53:07.000000000 +0200 +++ new/kdegraphics-4.2.98/strigi-analyzer/exr/kfile_exr.desktop 2009-07-21 17:20:54.000000000 +0200 @@ -55,6 +55,7 @@ Name[uz]=EXR haqida maʼlumot Name[uz@cyrillic]=EXR ҳақида маълумот Name[vi]=Thông tin EXR +Name[wa]=Informåcion sol documint EXR Name[x-test]=xxEXR Infoxx Name[zh_CN]=EXR 信息 Name[zh_HK]=EXR 資訊 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/thumbnailers/mobi/mobithumbnail.desktop new/kdegraphics-4.2.98/thumbnailers/mobi/mobithumbnail.desktop --- old/kdegraphics-4.2.95/thumbnailers/mobi/mobithumbnail.desktop 2009-06-23 13:14:13.000000000 +0200 +++ new/kdegraphics-4.2.98/thumbnailers/mobi/mobithumbnail.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -1,6 +1,7 @@ [Desktop Entry] Type=Service Name=Mobipocket thumbnailer +Name[ar]=مولد مصغرات Mobipocket Name[ca]=Miniaturitzador de Mobipocket Name[da]=Mobipocket-miniaturer Name[de]=M @@ -8,16 +9,23 @@ Name[es]=Generador de miniaturas Mobipocket Name[et]=Mobipocketi pisipildid Name[eu]=Mobipocket koadro txikia +Name[fr]=Création de miniatures Mobipocket Name[ga]=Mionsamhlóir Mobipocket Name[gl]=Miniaturas de Mobipocket +Name[hu]=Mobipocket betekintő Name[is]=Mobipocket smámyndagerð +Name[it]=Generatore anteprime Mobipocket Name[km]=កម្មវិធីបង្កើតរូបភាពតូចៗរបស់ Mobipocket Name[ko]=Mobipocket 미리 보기 생성기 Name[lv]=Mobipocket sīktēlu veidotājs Name[nb]=Mobipocket minibilder Name[nds]=Mobipocket-Vöransichten +Name[nl]=Mobipocket-miniatuurmaker +Name[nn]=Miniatyrbiletlaging for Mobipocket +Name[pa]=ਮੋਬਾਪਾਕਟ ਥੰਮਨੇਲਰ Name[pt]=Miniaturas para o Mobipocket Name[pt_BR]=Miniatura do Mobipocket +Name[sl]=Ustvarjalnik sličic za Mobipocket Name[sr]=Генератор сличица за Мобипокет Name[sr@latin]=Generator sličica za Mobipocket Name[sv]=Mobipocket miniatyrbilder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.2.95/thumbnailers/raw/rawthumbnail.desktop new/kdegraphics-4.2.98/thumbnailers/raw/rawthumbnail.desktop --- old/kdegraphics-4.2.95/thumbnailers/raw/rawthumbnail.desktop 2009-06-23 13:14:13.000000000 +0200 +++ new/kdegraphics-4.2.98/thumbnailers/raw/rawthumbnail.desktop 2009-07-21 17:20:57.000000000 +0200 @@ -1,21 +1,30 @@ [Desktop Entry] Type=Service Name=RAW Photo Camera files +Name[ar]=الملفات الخامة RAW لآلة التصوير Name[ca]=Fitxers RAW de càmera de fotos +Name[cs]=RAW soubory z fotoaparátu Name[da]=RAW kamera-filer Name[de]=RAW-Fotokamera-Dateien Name[es]=Archivos RAW de cámara fotográfica Name[et]=Kaamera toorfailid +Name[fr]=Fichiers RAW d'appareil photo numérique Name[gl]=Ficheiros RAW de cámara de fotos +Name[hu]=RAW-fájlok Name[is]=RAW myndavélaskrár +Name[it]=File grezzi fotocamera digitale Name[km]=ឯកសារម៉ាស៊ីនថតរូបដើម Name[ko]=RAW 사진 카메라 파일 Name[lv]=RAW fotogrāfiju faili Name[nb]=RAW foto kamerafiler Name[nds]=RAW-Fotokamera-Dateien +Name[nl]=Bestanden met RAW-camera-afbeelding Name[nn]=RAW-kamerafiler +Name[pa]=RAW ਫੋਟੋ ਕੈਮਰਾ ਫਾਇਲਾਂ Name[pt]=Ficheiros de máquinas fotográficas RAW Name[pt_BR]=Arquivos RAW de câmeras fotográficas +Name[ru]=Необработанные Файлы с цифровой камеры (RAW) +Name[sl]=Surove datoteke s fotoaparata Name[sr]=Сирови фајлови с камере Name[sr@latin]=Sirovi fajlovi s kamere Name[sv]=Obehandlade kamerafotofiler ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-voikko for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package OpenOffice_org-voikko for openSUSE:Factory checked in at Tue Jul 28 00:33:01 CEST 2009. -------- --- OpenOffice_org-voikko/OpenOffice_org-voikko.changes 2009-06-22 19:34:20.000000000 +0200 +++ OpenOffice_org-voikko/OpenOffice_org-voikko.changes 2009-07-27 20:15:39.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 27 20:10:21 CEST 2009 - pmladek(a)suse.cz + +- changed the order of linker arguments to fix build in openSUSE Factory; + -Wl,--as-needed is enabled by default there (sf#2827973) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openoffice.org-voikko-3.1-link-as-needed.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-voikko.spec ++++++ --- /var/tmp/diff_new_pack.UEYVxJ/_old 2009-07-28 00:32:50.000000000 +0200 +++ /var/tmp/diff_new_pack.UEYVxJ/_new 2009-07-28 00:32:50.000000000 +0200 @@ -22,12 +22,13 @@ BuildRequires: OpenOffice_org OpenOffice_org-sdk gcc-c++ java-devel libvoikko-devel unzip update-alternatives zip Summary: OpenOffice.org spellchecker/hyphenator for finnish language Version: 3.1 -Release: 2 +Release: 3 License: GPL Group: Productivity/Text/Spell PreReq: coreutils, grep Url: http://voikko.sourceforge.net Source: openoffice.org-voikko-%{version}.tar.bz2 +Patch: openoffice.org-voikko-3.1-link-as-needed.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,6 +38,7 @@ %prep %setup -q -n openoffice.org-voikko-%{version} +%patch %build . %{ooo3}/basis-link/sdk/setsdkenv_unix.sh ++++++ openoffice.org-voikko-3.1-link-as-needed.diff ++++++ --- Makefile +++ Makefile @@ -101,8 +101,12 @@ WARNING_FLAGS+= -fno-strict-aliasing endif endif -LINK_FLAGS=$(COMP_LINK_FLAGS) $(OPT_FLAGS) $(LINKER_FLAGS) $(LINK_LIBS) \ - $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) +# separated generic link flags and linked libs are needed to build with -Wl,--as-needed +# this flag has been enabled by default on openSUSE-11.2 +LINK_FLAGS=$(COMP_LINK_FLAGS) $(OPT_FLAGS) $(LINKER_FLAGS) +ifneq "$(PLATFORM)" "macosx" + LINK_LIBS+=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) +endif VOIKKO_CC_FLAGS=$(OPT_FLAGS) $(WARNING_FLAGS) -Ibuild/hpp -I$(PRJ)/include/stl -I$(PRJ)/include ifdef STANDALONE_EXTENSION_PATH @@ -110,20 +114,20 @@ ifeq "$(PLATFORM)" "windows" STANDALONE_EXTENSION_FILES=mingwm10.dll libglib-2.0-0.dll malaga.dll \ libvoikko-1.dll - LINK_FLAGS += -lvoikko + LINK_LIBS += -lvoikko else ifeq "$(PLATFORM)" "macosx" STANDALONE_EXTENSION_FILES=1 else STANDALONE_EXTENSION_FILES=libmalaga.so.7 libvoikko.so.1 \ voikko-fi_FI.pro voikko-fi_FI.lex_l voikko-fi_FI.mor_l voikko-fi_FI.sym_l - LINK_FLAGS += -lvoikko + LINK_LIBS += -lvoikko endif endif else VOIKKO_CC_DEFINES= STANDALONE_EXTENSION_FILES= - LINK_FLAGS += -lvoikko + LINK_LIBS += -lvoikko endif ifndef ENABLE_GRAMMAR_CHECKER @@ -253,7 +257,7 @@ $(LIBVOIKKO_PATH)/lib/libintl.a -framework CoreFoundation -framework Carbon $(INSTALL_NAME_URELIBS) $@ else - $(LINK) $(LINK_FLAGS) -o $@ $^ + $(LINK) $(LINK_FLAGS) $^ -o $@ $(LINK_LIBS) endif endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libcdaudio for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package libcdaudio for openSUSE:Factory checked in at Tue Jul 28 00:31:29 CEST 2009. -------- --- libcdaudio/libcdaudio.changes 2008-10-07 18:03:31.000000000 +0200 +++ libcdaudio/libcdaudio.changes 2009-07-17 15:30:22.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 17 15:27:26 CEST 2009 - ro(a)suse.de + +- fix potential double-free (bnc#515027) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- buffer-overflow.diff libcdaudio-0.99.12.dif New: ---- libcdaudio-buffer-overflow.diff libcdaudio-double_free.diff libcdaudio-libdir.diff libcdaudio-max_matches.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcdaudio.spec ++++++ --- /var/tmp/diff_new_pack.HzkRQ6/_old 2009-07-28 00:30:33.000000000 +0200 +++ /var/tmp/diff_new_pack.HzkRQ6/_new 2009-07-28 00:30:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcdaudio (Version 0.99.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,12 @@ Group: Productivity/Multimedia/CD/Grabbers Summary: Functions to Control Operation of a CD-ROM When Playing Audio CDs Version: 0.99.12 -Release: 139 +Release: 140 Source: libcdaudio-0.99.12.tar.bz2 -Patch: libcdaudio-0.99.12.dif -Patch1: buffer-overflow.diff +Patch: libcdaudio-max_matches.diff +Patch1: libcdaudio-libdir.diff +Patch2: libcdaudio-buffer-overflow.diff +Patch3: libcdaudio-double_free.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +55,8 @@ %setup -q %patch %patch1 +%patch2 +%patch3 %build CFLAGS="$RPM_OPT_FLAGS" ++++++ libcdaudio-buffer-overflow.diff ++++++ --- src/cddb.c +++ src/cddb.c @@ -1679,7 +1679,7 @@ cddb_read_disc_data(int cd_desc, struct disc_data *outdata) free(file); while(!feof(cddb_data)) { - fgets(inbuffer, 512, cddb_data); + fgets(inbuffer, 256, cddb_data); cddb_process_line(inbuffer, data); } ++++++ libcdaudio-double_free.diff ++++++ --- src/cddb.c +++ src/cddb.c @@ -1976,6 +1976,7 @@ if(cddb_mc_copy_from_data(data, indata) < 0) { free(indata); cddb_mc_free(data); + return -1; } free(indata); ++++++ libcdaudio-libdir.diff ++++++ --- libcdaudio-config.in +++ libcdaudio-config.in @@ -1,6 +1,7 @@ #!/bin/sh prefix=@prefix@ +libdir=@libdir@ exec_prefix=@exec_prefix@ exec_prefix_set=no @@ -49,7 +50,7 @@ echo @LIB_LDADD@ ;; --libs) - libdir=-L${exec_prefix}/lib + libdir=-L${libdir} echo $libdir -lcdaudio @LIBS@ ;; *) ++++++ libcdaudio-max_matches.diff ++++++ --- src/cddb.c +++ src/cddb.c @@ -1052,7 +1052,7 @@ } query->query_matches = 0; - while(!cddb_read_line(sock, inbuffer, 256)) { + while(query->query_matches < MAX_INEXACT_MATCHES && !cddb_read_line(sock, inbuffer, 256)) { slashed = 0; if(strchr(inbuffer, '/') != NULL && parse_disc_artist) { index = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit btrfsprogs for openSUSE:Factory
by root＠Hilbert.suse.de 27 Jul '09

27 Jul '09

Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at Tue Jul 28 00:08:54 CEST 2009. -------- --- btrfsprogs/btrfsprogs.changes 2009-07-20 23:19:46.000000000 +0200 +++ btrfsprogs/btrfsprogs.changes 2009-07-27 13:12:55.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 13:12:39 CEST 2009 - dmueller(a)suse.de + +- move apps to /sbin + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.tp6JLP/_old 2009-07-28 00:07:13.000000000 +0200 +++ /var/tmp/diff_new_pack.tp6JLP/_new 2009-07-28 00:07:13.000000000 +0200 @@ -20,7 +20,7 @@ Name: btrfsprogs Url: http://oss.oracle.com/~mason/btrfs/ Version: 0.19 -Release: 1 +Release: 2 Summary: Btrfs File System Utilities License: GNU General Public License (GPL) Group: System/Filesystems @@ -41,16 +41,16 @@ make CFLAGS="%{optflags}" %install -make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} mandir=%{_mandir} +make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=/sbin mandir=%{_mandir} %files %defattr(-, root, root) -/usr/bin/btrfs-debug-tree -/usr/bin/btrfs-show -/usr/bin/btrfs-vol -/usr/bin/btrfsck -/usr/bin/btrfsctl -/usr/bin/mkfs.btrfs +/sbin/btrfs-debug-tree +/sbin/btrfs-show +/sbin/btrfs-vol +/sbin/btrfsck +/sbin/btrfsctl +/sbin/mkfs.btrfs %_mandir/man8/btrfs-image.8.gz %_mandir/man8/btrfs-show.8.gz %_mandir/man8/btrfsck.8.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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