May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit wxWidgets-3_0 for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2014-05-06 14:04:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_0 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxWidgets-3_0" Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0.changes 2014-04-17 14:11:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0.changes 2014-05-06 14:04:00.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 21:53:59 UTC 2014 - jengelh(a)inai.de + +- Remove unused "ansi" configuration: wxWidgets 3 in Unicode mode + supports both char* and wchar_t*. + +------------------------------------------------------------------- Old: ---- wxWidgets-3_0-ansi.spec.disabled ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-3_0.spec ++++++ ++++ 1040 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0.spec ++++ and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0.spec -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit whois for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package whois for openSUSE:Factory checked in at 2014-05-06 14:03:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/whois (Old) and /work/SRC/openSUSE:Factory/.whois.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "whois" Changes: -------- --- /work/SRC/openSUSE:Factory/whois/whois.changes 2014-01-13 10:56:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.whois.new/whois.changes 2014-05-06 14:03:53.000000000 +0200 @@ -1,0 +2,15 @@ +Sat May 3 10:05:59 UTC 2014 - andreas.stieger(a)gmx.de + +- whois 5.1.2: + * Always query whois.nic.$TLD for the "new" gTLDs, because the + ICANN contract requires that it works. + * Added the .aw and .zm TLD servers. + * Updated the .mk, .tc and .vu TLD servers. + * Added more ASN entries for Japan and Korea. + * Fixed some invalid ASN and networks entries which would never + be matched +- drop whois-5.0.25-nb.patch, committed upstream +- update upstream developer signing key +- use parallel build + +------------------------------------------------------------------- Old: ---- whois-5.0.25-nb.patch whois_5.1.1.tar.xz New: ---- whois_5.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whois.spec ++++++ --- /var/tmp/diff_new_pack.tOd9rY/_old 2014-05-06 14:03:54.000000000 +0200 +++ /var/tmp/diff_new_pack.tOd9rY/_new 2014-05-06 14:03:54.000000000 +0200 @@ -17,27 +17,25 @@ Name: whois -Version: 5.1.1 +Version: 5.1.2 Release: 0 Summary: Intelligent WHOIS client License: GPL-2.0+ Group: Productivity/Networking/Other Url: http://www.linux.it/~md/software/ Source: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz -Source2: http://db.debian.org/fetchkey.cgi?fingerprint=1F2232EEE56FD048EAEFE47F1467F… +# https://db.debian.org/ - Debian login "md", md(a)linux.it +# https://db.debian.org/search.cgi?id=&authtoken=&cn=&sn=&uid=md&ircnick=&fin… +Source2: https://db.debian.org/fetchkey.cgi?fingerprint=6791403B68AE2690517C42EAE6FF… # rename .dsc to not build the package in OBS Source3: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.dsc#/%{na… -Patch1: whois-5.0.25-nb.patch BuildRequires: libidn-devel BuildRequires: xz +Provides: ripe-whois-tools +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} <= 1140 BuildRequires: libxcrypt-devel %endif -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif -Provides: ripe-whois-tools -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package provides a commandline client for the WHOIS (RFC 3912) @@ -49,18 +47,15 @@ password encryption function crypt(3). %prep -%{?gpg_verify: %gpg_verify %{S:3}} # the signature is on the Debian .dsc. Extract the checksums and verify against source -echo "`grep -A1 "Files:" %{S:3} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{S:0}" | md5sum -c -echo "`grep -A1 "Checksums-Sha1" %{S:3} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{S:0}" | sha1sum -c -echo "`grep -A1 "Checksums-Sha256" %{S:3} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{S:0}" | sha256sum -c +echo "`grep -A1 "Files:" %{SOURCE3} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{SOURCE0}" | md5sum -c +echo "`grep -A1 "Checksums-Sha1" %{SOURCE3} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{SOURCE0}" | sha1sum -c +echo "`grep -A1 "Checksums-Sha256" %{SOURCE3} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{SOURCE0}" | sha256sum -c %setup -q -%patch1 -p1 -rename no nb po/no.* %build -make all mkpasswd HAVE_LIBIDN=1 HAVE_ICONV=1 \ +make all mkpasswd HAVE_LIBIDN=1 HAVE_ICONV=1 %{?_smp_mflags} \ %if 0%{?suse_version} <= 1140 HAVE_XCRYPT=1 \ %else @@ -69,14 +64,11 @@ CFLAGS="%{optflags}" %install -mkdir -p %{buildroot}{/usr/bin,%{_mandir}/man1} +mkdir -p %{buildroot}{%{_prefix}/bin,%{_mandir}/man1} make BASEDIR=%{buildroot} mandir=%{_mandir} prefix=/usr \ install install-mkpasswd install-pos %find_lang %{name} -%clean -rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root) %doc README debian/changelog debian/copyright ++++++ whois.asc ++++++ --- /var/tmp/diff_new_pack.tOd9rY/_old 2014-05-06 14:03:54.000000000 +0200 +++ /var/tmp/diff_new_pack.tOd9rY/_new 2014-05-06 14:03:54.000000000 +0200 @@ -1,29 +1,36 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 Format: 3.0 (native) Source: whois Binary: whois Architecture: any -Version: 5.1.1 +Version: 5.1.2 Maintainer: Marco d'Itri <md(a)linux.it> Standards-Version: 3.9.5 Vcs-Browser: https://github.com/rfc1036/whois Vcs-Git: git://github.com/rfc1036/whois.git Build-Depends: debhelper (>= 5), gettext, libidn11-dev Package-List: - whois deb net standard + whois deb net standard arch=any Checksums-Sha1: - 7df2e70a0acba59b65aaa95c9950d6a750811827 73832 whois_5.1.1.tar.xz + 627c7437f663657db903e0cf4ee0cc1369f63e96 75696 whois_5.1.2.tar.xz Checksums-Sha256: - 69fb4c3d964603967d18b931c2275e678eed5c33af0a74c41198e1b46a520644 73832 whois_5.1.1.tar.xz + 021f76910e772fa569e299210b36e2eeb20b56dc9ca29edb7e83a21b560a5403 75696 whois_5.1.2.tar.xz Files: - aa4561134a03e22e2d759748ca676a97 73832 whois_5.1.1.tar.xz + a103596a4da3f1795fccbd9432c59ec9 75696 whois_5.1.2.tar.xz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iEYEARECAAYFAlLQiPUACgkQFGfw2OHuP7EWjgCgjv/HF+iJjajROFQvRXJVFxmS -TG8AoJDIiykAH2QxgozfWudxhBH9Nzjt -=3v9I +iQGcBAEBCAAGBQJTY40/AAoJECv1pcEixPek7q8MAIJmhRpmIEnv4WCdZahVyxmP +sWRaw3i/yNnTFTMbDxT96JhEdFLgwGgoCnwGiS3wol4O8VBT8m6yfCDocbyuVCUT +pGWCzShCPJuPQnoScsd99jzPWyF+lI5M6VB8NHm1ucuPWjneJNUynucLHa7YLiBn +OPsH9V02s71mPBMb5UchNdNk/H2dDE2Hag8fFq8eiuYJqghUBsR2q64tGhXOGiKA +to+Xz5B7CjAQdHUXKByT/RyMu79DNFpEDptQYADuMz4/DWeJGWCmxdstASGou327 +eSfEIPiqI7T/ZrrFPozeQ7anRmHYrwum2bBjTRVEWhMzf/ZBh0hUaUeAhsph3isG +fyv8AdAfF6b6xE5GhBj6VMuelym5PldDKHiTmyHbX1x+LQuUevIrmQ8EjYrA0wDc +sBelBBWSwqY/n4MyLE57wwLKJM7EgybwHuqTe5cdUQRlu2o99xurEebpm5su2A38 +xZSu5tQQgrptM15NU5SjYayLnoMiNxEhek1FnZ+RyA== +=rHvB -----END PGP SIGNATURE----- ++++++ whois.keyring ++++++ --- /var/tmp/diff_new_pack.tOd9rY/_old 2014-05-06 14:03:54.000000000 +0200 +++ /var/tmp/diff_new_pack.tOd9rY/_new 2014-05-06 14:03:54.000000000 +0200 @@ -1,295 +1,204 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.12 (GNU/Linux) -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 -V30xlQ02F/MIh7HNYJVb1+4u -=8SRT +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 +7PMS3F6lN90S +=smGT -----END PGP PUBLIC KEY BLOCK----- ++++++ whois_5.1.1.tar.xz -> whois_5.1.2.tar.xz ++++++ ++++ 2021 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ucode-intel for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package ucode-intel for openSUSE:Factory checked in at 2014-05-06 14:03:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ucode-intel (Old) and /work/SRC/openSUSE:Factory/.ucode-intel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ucode-intel" Changes: -------- --- /work/SRC/openSUSE:Factory/ucode-intel/ucode-intel.changes 2014-04-12 21:44:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ucode-intel.new/ucode-intel.changes 2014-05-06 14:03:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 5 15:45:49 UTC 2014 - trenn(a)suse.de + +- Update to Intel microcode version 20140430 (bnc#876073) + +------------------------------------------------------------------- Old: ---- microcode-20140122.tgz New: ---- microcode-20140430.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ucode-intel.spec ++++++ --- /var/tmp/diff_new_pack.XxaYjw/_old 2014-05-06 14:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.XxaYjw/_new 2014-05-06 14:03:50.000000000 +0200 @@ -16,8 +16,9 @@ # + Name: ucode-intel -Version: 20140122 +Version: 20140430 Release: 0 Summary: Microcode Updates for Intel x86/x86-64 CPUs License: SUSE-Firmware ++++++ microcode-20140122.tgz -> microcode-20140430.tgz ++++++ ++++ 2429 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemtap for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2014-05-06 14:03:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemtap" Changes: -------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap-docs.changes 2013-12-22 19:37:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap-docs.changes 2014-05-06 14:03:30.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 2 19:50:28 UTC 2014 - tonyj(a)suse.com + +- Update to version 2.5. See systemtap.spec for changelog +- Drop patch: langref.tex-add-option-to-babel-setup.patch (upstream) +- Patch systemtap-docs-autoconf-version.diff was still present + despite being "dropped" in 2.4, really delete it + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2013-11-22 19:09:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2014-05-06 14:03:30.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 2 19:48:19 UTC 2014 - tonyj(a)suse.com + +- Update to version 2.5 + Changelog: + 2.5: https://sourceware.org/ml/systemtap/2014-q2/msg00103.html + +------------------------------------------------------------------- Old: ---- langref.tex-add-option-to-babel-setup.patch systemtap-2.4.tar.gz systemtap-docs-autoconf-version.diff New: ---- systemtap-2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-docs.spec ++++++ --- /var/tmp/diff_new_pack.mKnNWY/_old 2014-05-06 14:03:31.000000000 +0200 +++ /var/tmp/diff_new_pack.mKnNWY/_new 2014-05-06 14:03:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package systemtap-docs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -37,7 +37,7 @@ BuildRequires: tex(float.sty) BuildRequires: tex(fullpage.sty) -Version: 2.4 +Version: 2.5 Release: 0 Summary: Documents and examples for systemtap License: GPL-2.0+ @@ -47,7 +47,6 @@ Source2: README-BEFORE-ADDING-PATCHES Patch1: systemtap-docdir-fix.diff Patch2: systemtap-xmlto-fop.diff -Patch3: langref.tex-add-option-to-babel-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,7 +58,6 @@ %setup -n systemtap-%{version} -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build # fix interpreter ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.mKnNWY/_old 2014-05-06 14:03:31.000000000 +0200 +++ /var/tmp/diff_new_pack.mKnNWY/_new 2014-05-06 14:03:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package systemtap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -27,7 +27,7 @@ BuildRequires: pkg-config BuildRequires: sqlite-devel BuildRequires: systemd -Version: 2.4 +Version: 2.5 Release: 0 Summary: Instrumentation System License: GPL-2.0+ @@ -139,6 +139,7 @@ %{_libexecdir}/%{name}/stap-env %{_libexecdir}/%{name}/stap-authorize-cert %{_mandir}/man8/staprun.8* +%{_mandir}/man8/systemtap.8* %{_mandir}/man8/stapsh.8* %files server ++++++ systemtap-2.4.tar.gz -> systemtap-2.5.tar.gz ++++++ ++++ 82497 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sblim-sfcb for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package sblim-sfcb for openSUSE:Factory checked in at 2014-05-06 14:03:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-sfcb (Old) and /work/SRC/openSUSE:Factory/.sblim-sfcb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-sfcb" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-sfcb/sblim-sfcb.changes 2014-03-30 12:28:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-sfcb.new/sblim-sfcb.changes 2014-05-06 14:03:24.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 25 10:02:31 UTC 2014 - kkaempf(a)suse.com + +- Ensure cmpi-provider-register is present (bnc#874811) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-sfcb.spec ++++++ --- /var/tmp/diff_new_pack.GBJeeK/_old 2014-05-06 14:03:25.000000000 +0200 +++ /var/tmp/diff_new_pack.GBJeeK/_new 2014-05-06 14:03:25.000000000 +0200 @@ -96,7 +96,9 @@ Requires: pam # Added NWP - dependency on cim-schema instead of inbuilt schema Requires: cim-schema -PreReq: /usr/sbin/groupadd /usr/sbin/groupmod +PreReq: /usr/sbin/groupadd +PreReq: /usr/sbin/groupmod +PreReq: cmpi-provider-register > 1.0 %description Small Footprint CIM Broker (sfcb) is a CIM server conforming to the CIM -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sax3 for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package sax3 for openSUSE:Factory checked in at 2014-05-06 14:03:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sax3 (Old) and /work/SRC/openSUSE:Factory/.sax3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sax3" Changes: -------- --- /work/SRC/openSUSE:Factory/sax3/sax3.changes 2013-05-27 10:01:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sax3.new/sax3.changes 2014-05-06 14:03:18.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 5 15:57:20 UTC 2014 - manugupt1(a)gmail.com + +- sax3-keyboard text domain was incorrect. Updated it for sax3-keyboard + +---------------------------------- --------------------------------- +Sun May 4 12:46:08 UTC 2014 - manugupt1(a)gmail.com + +- Translation Support added for sax3 modules along with PO files +- Logs are much more beautiful for some modules + +------------------------------------------------------------------- Old: ---- sax3-0.1.1.tar.gz New: ---- sax3-0.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax3.spec ++++++ --- /var/tmp/diff_new_pack.ccbMsF/_old 2014-05-06 14:03:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ccbMsF/_new 2014-05-06 14:03:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: sax3 -Version: 0.1.1 +Version: 0.1.2 Release: 0 Summary: A Graphical Configuration Tool for X License: GPL-3.0 ++++++ sax3-0.1.1.tar.gz -> sax3-0.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/COPYING.GPL-3.0 new/sax3-0.1.2/COPYING.GPL-3.0 --- old/sax3-0.1.1/COPYING.GPL-3.0 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/COPYING.GPL-3.0 2014-05-05 17:54:08.000000000 +0200 @@ -1,5 +1,638 @@ - SaX3 - openSUSE Advanced X Configuration Utility - Copyright (C) 2011 Manu Gupta<manugupt1(a)opensuse.org> + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,3 +647,28 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/CMakeLists.txt new/sax3-0.1.2/src/CMakeLists.txt --- old/sax3-0.1.1/src/CMakeLists.txt 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/src/CMakeLists.txt 2014-05-05 17:54:07.000000000 +0200 @@ -4,6 +4,7 @@ add_subdirectory(res) add_subdirectory(modules.d) add_subdirectory(man) +add_subdirectory(translation) add_library(sax3-yuif SHARED ui/yuifactory.cxx ui/yui.cxx) add_executable(sax3 main.cxx) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/keyboard.cxx new/sax3-0.1.2/src/keyboard.cxx --- old/sax3-0.1.1/src/keyboard.cxx 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/src/keyboard.cxx 2014-05-05 17:54:07.000000000 +0200 @@ -624,8 +624,8 @@ int main(){ setlocale(LC_ALL,""); - bindtextdomain("sax3","/usr/share/locale"); - textdomain("sax3"); + bindtextdomain("sax3-keyboard","/usr/share/locale"); + textdomain("sax3-keyboard"); keyboard * kb = new keyboard(); kb->drawLayout(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/main.cxx new/sax3-0.1.2/src/main.cxx --- old/sax3-0.1.1/src/main.cxx 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/src/main.cxx 2014-05-05 17:54:07.000000000 +0200 @@ -16,6 +16,7 @@ #include "ui/yuifactory.h" #define _(STRING) gettext(STRING) +#define LOG_TAG "[SaX3]" using namespace std; @@ -39,7 +40,6 @@ vector<UI::yPushButton*> button; vector<UI::yImage*> image; vector<string> execs; -// UI::yImage image;UI::yPushButton button; protected: void makeEntry(char s1[],char s2[],char s3[]){ strcpy(getEntry,s1); @@ -58,17 +58,15 @@ aug_set(aug,"/augeas/load/Desktop/lens", "Desktop.lns"); aug_set(aug,"/augeas/load/Desktop/incl[last()+1]","/usr/share/sax3/modules.d/*"); err = aug_load(aug); - cout<<"------------------------------------------------------------------<<<"<<err<<">>>"; + cout<<LOG_TAG<<" Desktop Lens Loading status is "<<err<<"(0 indicates success)"<<endl; if(dp!=NULL){ - cout<<"DP IF"; while(ep = readdir(dp)){ if(strcmp(ep->d_name,".") && strcmp(ep->d_name,"..")){ - cout<<"__________________________________________________________"<<err<<endl; UI::yHLayout * hLayout = factory->createHLayout(mainLayout); getEntry = new char[300]; makeEntry("/files/usr/share/sax3/modules.d/",ep->d_name,"/*/Icon"); err = aug_get(aug,getEntry,&value); - cout<<getEntry; + cout<<LOG_TAG<<getEntry<<" : "<<err<<" (1 indicates success, 0 is cannot retreive, -1 is too bad)"<<endl; if(err==1) image.push_back(factory->createImage(hLayout,_(value))); delete getEntry; @@ -76,6 +74,8 @@ getEntry = new char[100]; makeEntry("/files/usr/share/sax3/modules.d/",ep->d_name,"/*/Name"); err = aug_get(aug,getEntry,&value); + cout<<LOG_TAG<<getEntry<<" : "<<err<<" (1 indicates success, 0 is cannot retreive, -1 is too bad)"<<endl; + cout<<LOG_TAG<<"[VALUE]"<<value<<endl; if(err==1) button.push_back(factory->createPushButton(hLayout,_(value))); delete getEntry; @@ -83,10 +83,9 @@ getEntry = new char[100]; makeEntry("/files/usr/share/sax3/modules.d/",ep->d_name,"/*/Exec"); err = aug_get(aug,getEntry,&value); + cout<<LOG_TAG<<getEntry<<" : "<<err<<" (1 indicates success, 0 is cannot retreive, -1 is too bad)"<<endl; if(err==1) execs.push_back(value); - -// cout<<value<<endl; delete getEntry; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/monitors.cxx new/sax3-0.1.2/src/monitors.cxx --- old/sax3-0.1.1/src/monitors.cxx 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/src/monitors.cxx 2014-05-05 17:54:07.000000000 +0200 @@ -6,12 +6,16 @@ #include<stdio.h> #include<fstream> #include<vector> +#include<locale.h> +#include<libintl.h> + extern "C"{ #include<augeas.h> } #include"ui/yuifactory.h" +#define _(STRING) gettext(STRING) using namespace std; class Monitors{ @@ -180,38 +184,38 @@ void Monitors::initUI(){ dialog = factory->createDialog(60,12); vL1 = factory->createVLayout(dialog); - driverCombo = factory->createComboBox(vL1,"Select the driver"); + driverCombo = factory->createComboBox(vL1,_("Select the driver")); fillUpDriverCombo(); vL2 = factory->createVLayout(vL1); hL1 = factory->createHLayout(vL2); - resolutionCombo = factory->createComboBox(hL1,"Select resolution"); + resolutionCombo = factory->createComboBox(hL1,_("Select resolution")); fillUpResolutionCombo(); - depthCombo = factory->createComboBox(hL1,"Depth"); + depthCombo = factory->createComboBox(hL1,_("Depth")); fillUpDepthCombo(); - enableAdvance = factory->createCheckBox(vL1,"Enable Advanced Settings",false); + enableAdvance = factory->createCheckBox(vL1,_("Enable Advanced Settings"),false); hL2 = factory->createHLayout(vL1); - horizontalLow = factory->createIntField(hL2,"Horizontal Sync Rate(min value)",30,100,50); + horizontalLow = factory->createIntField(hL2,_("Horizontal Sync Rate(min value)"),30,100,50); horizontalLow->setDisabled(); - horizontalHigh = factory->createIntField(hL2,"Horizontal Sync Rate(max value)",30,100,50); + horizontalHigh = factory->createIntField(hL2,_("Horizontal Sync Rate(max value)"),30,100,50); horizontalHigh->setDisabled(); hL3 = factory->createHLayout(vL1); - verticalLow = factory->createIntField(hL3,"Vertical Refresh Rate(min value)",50,120,70); + verticalLow = factory->createIntField(hL3,_("Vertical Refresh Rate(min value)"),50,120,70); verticalLow->setDisabled(); - verticalHigh = factory->createIntField(hL3,"Vertical Refresh Rate(max value)",50,120,70); + verticalHigh = factory->createIntField(hL3,_("Vertical Refresh Rate(max value)"),50,120,70); verticalHigh->setDisabled(); - customCVT = factory->createCheckBox(vL1,"I want my own CVT",false); + customCVT = factory->createCheckBox(vL1,_("I want my own CVT"),false); hL5 = factory->createHLayout(vL1); - xAxis = factory->createIntField(hL5,"X Axis",400,1280,4000); + xAxis = factory->createIntField(hL5,_("X Axis"),400,1280,4000); xAxis->setDisabled(); - yAxis = factory->createIntField(hL5,"Y Axis",400,1280,3000); + yAxis = factory->createIntField(hL5,_("Y Axis"),400,1280,3000); yAxis->setDisabled(); - refreshRate = factory->createIntField(hL5,"Refresh Rate",20,60,200); + refreshRate = factory->createIntField(hL5,_("Refresh Rate"),20,60,200); refreshRate->setDisabled(); hL4 = factory->createHLayout(vL1); - ok = factory->createPushButton(hL4,"Ok"); - cancel = factory->createPushButton(hL4,"Cancel"); + ok = factory->createPushButton(hL4,_("Ok")); + cancel = factory->createPushButton(hL4,_("Cancel")); } bool Monitors::respondToEvent(){ @@ -369,6 +373,9 @@ int main(){ + setlocale(LC_ALL,""); + bindtextdomain("sax3-monitor","/usr/share/locale"); + textdomain("sax3-monitor"); Monitors * m = new Monitors(); m->detectDrivers(); m->detectResolution(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/mouse.cxx new/sax3-0.1.2/src/mouse.cxx --- old/sax3-0.1.1/src/mouse.cxx 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/src/mouse.cxx 2014-05-05 17:54:07.000000000 +0200 @@ -4,12 +4,17 @@ #include<fstream> #include<string.h> #include<cstdio> +#include<libintl.h> +#include<locale.h> + extern "C"{ #include<augeas.h> } #include "ui/yuifactory.h" +#define _(STRING) gettext(STRING) + using namespace std; class Mouse{ @@ -304,31 +309,31 @@ vl1 = factory->createVLayout(dialog); hl1 = factory->createHLayout(vl1); - mouseList = factory->createComboBox(vl1,"Auto Detected Mouse"); + mouseList = factory->createComboBox(vl1,_("Auto Detected Mouse")); fillUpMouseList(); - button3Label = factory->createLabel(vl1,"3 button Emulation Options"); + button3Label = factory->createLabel(vl1,_("3 button Emulation Options")); enableButton3Layout = factory->createHLayout(vl1); - enableButton3Label = factory->createLabel(enableButton3Layout,"Enable 3 Buttons"); + enableButton3Label = factory->createLabel(enableButton3Layout,_("Enable 3 Buttons")); button3 = factory->createRadioButtonGroup(enableButton3Layout); - button3->addButton("Yes"); - button3->addButton("No"); - timeout = factory->createIntField(vl1,"3 Button Timeout",0,1000,50); + button3->addButton(_("Yes")); + button3->addButton(_("No")); + timeout = factory->createIntField(vl1,_("3 Button Timeout"),0,1000,50); timeout->setDisabled(); - wheelLabel = factory->createLabel(vl1,"Wheel Emulation Options"); + wheelLabel = factory->createLabel(vl1,_("Wheel Emulation Options")); enableWheelLayout = factory->createHLayout(vl1); - enableWheelLabel = factory->createLabel(enableWheelLayout,"Enable Wheel Emulation"); + enableWheelLabel = factory->createLabel(enableWheelLayout,_("Enable Wheel Emulation")); wheel = factory->createRadioButtonGroup(enableWheelLayout); - wheel->addButton("Yes"); - wheel->addButton("No"); - wheeltimeout = factory->createIntField(vl1,"Wheel Button Timeout",0,1000,200); + wheel->addButton(_("Yes")); + wheel->addButton(_("No")); + wheeltimeout = factory->createIntField(vl1,_("Wheel Button Timeout"),0,1000,200); wheeltimeout->setDisabled(); - InvX = factory->createCheckBox(vl1,"Invert X Axis",false); - InvY = factory->createCheckBox(vl1,"Invert Y Axis",false); + InvX = factory->createCheckBox(vl1,_("Invert X Axis"),false); + InvY = factory->createCheckBox(vl1,_("Invert Y Axis"),false); - AngleOffset = factory->createIntField(vl1,"Angle Offset in degrees",0,360,0); + AngleOffset = factory->createIntField(vl1,_("Angle Offset in degrees"),0,360,0); buttonLayout = factory->createHLayout(vl1); - okButton = factory->createPushButton(buttonLayout,"Save"); - cancelButton = factory->createPushButton(buttonLayout,"Close"); + okButton = factory->createPushButton(buttonLayout,_("Save")); + cancelButton = factory->createPushButton(buttonLayout,_("Close")); } Mouse::~Mouse(){ delete cancelButton; @@ -507,6 +512,9 @@ int main(){ + setlocale(LC_ALL,""); + bindtextdomain("sax3-mouse","/usr/share/locale"); + textdomain("sax3-mouse"); Mouse * m = new Mouse(); m->autodetect(); m->initUI(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/touchpad.cxx new/sax3-0.1.2/src/touchpad.cxx --- old/sax3-0.1.1/src/touchpad.cxx 2013-04-19 09:35:03.000000000 +0200 +++ new/sax3-0.1.2/src/touchpad.cxx 2014-05-05 17:54:07.000000000 +0200 @@ -4,12 +4,17 @@ #include<fstream> #include<string.h> #include<cstdio> +#include<locale.h> +#include<libintl.h> extern "C"{ #include<augeas.h> } #include "ui/yuifactory.h" +#define _(STRING) gettext(STRING) +#define LOG_TAG "[SaX3-Touchpad]" + using namespace std; class touchpad{ @@ -39,10 +44,10 @@ touchpad::touchpad(){ factory = new UI::YUIFactory(); aug=NULL;root=NULL;flag=0;loadpath=NULL; - cout<<"Loading AUgeas"; + cout<<LOG_TAG<<"Loading Augeas"<<endl; aug = aug_init(root,loadpath,flag); if(aug==NULL){ - cout<<"AUGEAS NOT LOADED"; + cout<<LOG_TAG<<"AUGEAS NOT LOADED"<<endl; } } @@ -50,47 +55,47 @@ dialog = factory->createDialog(20,20); vL1 = factory->createVLayout(dialog); thL1 = factory->createHLayout(vL1); - TapButton1 = factory->createCheckBox(thL1,"Emulate Mouse Button 1",false); - TapButton1Click = factory->createComboBox(thL1,"No Of Clicks"); + TapButton1 = factory->createCheckBox(thL1,_("Emulate Mouse Button 1"),false); + TapButton1Click = factory->createComboBox(thL1,_("No Of Clicks")); TapButton1Click->setDisabled(); TapButton1Click->addItem("1"); TapButton1Click->addItem("2"); TapButton1Click->addItem("3"); thL2 = factory->createHLayout(vL1); - TapButton2 = factory->createCheckBox(thL2,"Emulate Mouse Button 2",false); - TapButton2Click = factory->createComboBox(thL2,"No Of Clicks"); + TapButton2 = factory->createCheckBox(thL2,_("Emulate Mouse Button 2"),false); + TapButton2Click = factory->createComboBox(thL2,_("No Of Clicks")); TapButton2Click->setDisabled(); TapButton2Click->addItem("2"); TapButton2Click->addItem("1"); TapButton2Click->addItem("3"); thL3 = factory->createHLayout(vL1); - TapButton3 = factory->createCheckBox(thL3,"Emulate Mouse Button 3",false); - TapButton3Click = factory->createComboBox(thL3,"No Of Clicks"); + TapButton3 = factory->createCheckBox(thL3,_("Emulate Mouse Button 3"),false); + TapButton3Click = factory->createComboBox(thL3,_("No Of Clicks")); TapButton3Click->setDisabled(); TapButton3Click->addItem("3"); TapButton3Click->addItem("2"); TapButton3Click->addItem("1"); - VerticalEdgeScroll = factory->createCheckBox(vL1,"Enable Vertical Edge Scrolling",true); - HorizontalEdgeScroll = factory->createCheckBox(vL1,"Enable horizontal Edge Scrolling",true); - VerticalTwoFingerScroll = factory->createCheckBox(vL1,"Enable 2 finger Vertical Scroll",true); - HorizontalTwoFingerScroll = factory->createCheckBox(vL1,"Enable 2 finger Horizontal Scroll",true); - CircularScroll = factory->createCheckBox(vL1,"Enable Circular Scrolling",false); - CircularLocation = factory->createComboBox(vL1,"Circular Scrolling Location"); - CircularLocation->addItem("Top Edges"); - CircularLocation->addItem("Top Right Corner"); - CircularLocation->addItem("Right Edge "); - CircularLocation->addItem("Bottom Right Corner"); - CircularLocation->addItem("Bottom Edge"); - CircularLocation->addItem("Bottom Left Corner"); - CircularLocation->addItem("Left Edges"); - CircularLocation->addItem("Top Left Corner"); + VerticalEdgeScroll = factory->createCheckBox(vL1,_("Enable Vertical Edge Scrolling"),true); + HorizontalEdgeScroll = factory->createCheckBox(vL1,_("Enable horizontal Edge Scrolling"),true); + VerticalTwoFingerScroll = factory->createCheckBox(vL1,_("Enable 2 finger Vertical Scroll"),true); + HorizontalTwoFingerScroll = factory->createCheckBox(vL1,_("Enable 2 finger Horizontal Scroll"),true); + CircularScroll = factory->createCheckBox(vL1,_("Enable Circular Scrolling"),false); + CircularLocation = factory->createComboBox(vL1,_("Circular Scrolling Location")); + CircularLocation->addItem(_("Top Edges")); + CircularLocation->addItem(_("Top Right Corner")); + CircularLocation->addItem(_("Right Edge ")); + CircularLocation->addItem(_("Bottom Right Corner")); + CircularLocation->addItem(_("Bottom Edge")); + CircularLocation->addItem(_("Bottom Left Corner")); + CircularLocation->addItem(_("Left Edges")); + CircularLocation->addItem(_("Top Left Corner")); CircularLocation->setDisabled(); hL1 = factory->createHLayout(vL1); - okButton = factory->createPushButton(hL1,"Ok"); - cancelButton = factory->createPushButton(hL1,"Cancel"); + okButton = factory->createPushButton(hL1,_("Ok")); + cancelButton = factory->createPushButton(hL1,_("Cancel")); } void touchpad::respondToEvent(){ @@ -268,9 +273,12 @@ } int main(){ - touchpad * t = new touchpad(); - t->initUI(); - t->respondToEvent(); - delete t; - return 0; + setlocale(LC_ALL,""); + bindtextdomain("sax3-touchpad","/usr/share/locale/"); + textdomain("sax3-touchpad"); + touchpad * t = new touchpad(); + t->initUI(); + t->respondToEvent(); + delete t; + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/translation/CMakeLists.txt new/sax3-0.1.2/src/translation/CMakeLists.txt --- old/sax3-0.1.1/src/translation/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/sax3-0.1.2/src/translation/CMakeLists.txt 2014-05-05 17:54:07.000000000 +0200 @@ -0,0 +1,3 @@ +#FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.desktop") +#INSTALL(FILES ${files} DESTINATION /usr/share/sax3/modules.d) +install(FILES sax3-touchpad.po sax3-keyboard.po sax3-mouse.po sax3-monitor.po DESTINATION /usr/share/sax3/translation) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/translation/Makefile new/sax3-0.1.2/src/translation/Makefile --- old/sax3-0.1.1/src/translation/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/sax3-0.1.2/src/translation/Makefile 2014-05-05 17:54:07.000000000 +0200 @@ -0,0 +1,171 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.0 + +# Default target executed when no arguments are given to make. +default_target: all +.PHONY : default_target + +# Allow only one "make -f Makefile2" at a time, but pass parallelism. +.NOTPARALLEL: +.PHONY : .NOTPARALLEL + +#============================================================================= +# Special targets provided by cmake. + +# Disable implicit rules so canonical targets will work. +.SUFFIXES: + +# Remove some rules from gmake that .SUFFIXES does not remove. +SUFFIXES = + +.SUFFIXES: .hpux_make_needs_suffix_list + +# Suppress display of executed commands. +$(VERBOSE).SILENT: + +# A target that is always out of date. +cmake_force: +.PHONY : cmake_force + +#============================================================================= +# Set environment variables for the build. + +# The shell in which to execute make rules. +SHELL = /bin/sh + +# The CMake executable. +CMAKE_COMMAND = /usr/bin/cmake + +# The command to remove a file. +RM = /usr/bin/cmake -E remove -f + +# Escaping for special characters. +EQUALS = = + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /home/manugupt1/Programming/sax3 + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/manugupt1/Programming/sax3 + +#============================================================================= +# Targets provided globally by CMake. + +# Special rule for the target edit_cache +edit_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." + /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) +.PHONY : edit_cache + +# Special rule for the target edit_cache +edit_cache/fast: edit_cache +.PHONY : edit_cache/fast + +# Special rule for the target install +install: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." + /usr/bin/cmake -P cmake_install.cmake +.PHONY : install + +# Special rule for the target install +install/fast: preinstall/fast + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." + /usr/bin/cmake -P cmake_install.cmake +.PHONY : install/fast + +# Special rule for the target install/local +install/local: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." + /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake +.PHONY : install/local + +# Special rule for the target install/local +install/local/fast: install/local +.PHONY : install/local/fast + +# Special rule for the target install/strip +install/strip: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." + /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake +.PHONY : install/strip + +# Special rule for the target install/strip +install/strip/fast: install/strip +.PHONY : install/strip/fast + +# Special rule for the target list_install_components +list_install_components: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\"" +.PHONY : list_install_components + +# Special rule for the target list_install_components +list_install_components/fast: list_install_components +.PHONY : list_install_components/fast + +# Special rule for the target rebuild_cache +rebuild_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." + /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) +.PHONY : rebuild_cache + +# Special rule for the target rebuild_cache +rebuild_cache/fast: rebuild_cache +.PHONY : rebuild_cache/fast + +# The main all target +all: cmake_check_build_system + cd /home/manugupt1/Programming/sax3 && $(CMAKE_COMMAND) -E cmake_progress_start /home/manugupt1/Programming/sax3/CMakeFiles /home/manugupt1/Programming/sax3/src/translation/CMakeFiles/progress.marks + cd /home/manugupt1/Programming/sax3 && $(MAKE) -f CMakeFiles/Makefile2 src/translation/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/manugupt1/Programming/sax3/CMakeFiles 0 +.PHONY : all + +# The main clean target +clean: + cd /home/manugupt1/Programming/sax3 && $(MAKE) -f CMakeFiles/Makefile2 src/translation/clean +.PHONY : clean + +# The main clean target +clean/fast: clean +.PHONY : clean/fast + +# Prepare targets for installation. +preinstall: all + cd /home/manugupt1/Programming/sax3 && $(MAKE) -f CMakeFiles/Makefile2 src/translation/preinstall +.PHONY : preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /home/manugupt1/Programming/sax3 && $(MAKE) -f CMakeFiles/Makefile2 src/translation/preinstall +.PHONY : preinstall/fast + +# clear depends +depend: + cd /home/manugupt1/Programming/sax3 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +.PHONY : depend + +# Help Target +help: + @echo "The following are some of the valid targets for this Makefile:" + @echo "... all (the default if no target is provided)" + @echo "... clean" + @echo "... depend" + @echo "... edit_cache" + @echo "... install" + @echo "... install/local" + @echo "... install/strip" + @echo "... list_install_components" + @echo "... rebuild_cache" +.PHONY : help + + + +#============================================================================= +# Special targets to cleanup operation of make. + +# Special rule to run CMake to check the build system integrity. +# No rule that depends on this can have commands that come from listfiles +# because they might be regenerated. +cmake_check_build_system: + cd /home/manugupt1/Programming/sax3 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +.PHONY : cmake_check_build_system + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/translation/sax3-keyboard.po new/sax3-0.1.2/src/translation/sax3-keyboard.po --- old/sax3-0.1.1/src/translation/sax3-keyboard.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sax3-0.1.2/src/translation/sax3-keyboard.po 2014-05-05 17:54:07.000000000 +0200 @@ -0,0 +1,74 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-04 17:29+0530\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: keyboard.cxx:155 keyboard.cxx:190 +msgid "&Cancel" +msgstr "" + +#: keyboard.cxx:173 +msgid "&Down" +msgstr "" + +#: keyboard.cxx:154 keyboard.cxx:189 +msgid "&Ok" +msgstr "" + +#: keyboard.cxx:188 +msgid "&Simple Mode" +msgstr "" + +#: keyboard.cxx:172 +msgid "&Up" +msgstr "" + +#: keyboard.cxx:168 keyboard.cxx:183 +msgid "Add" +msgstr "" + +#: keyboard.cxx:179 +msgid "Category" +msgstr "" + +#: keyboard.cxx:186 +msgid "Delete Selected Group" +msgstr "" + +#: keyboard.cxx:174 +msgid "Delete selected Layout & Variant" +msgstr "" + +#: keyboard.cxx:153 +msgid "E&xpert Mode" +msgstr "" + +#: keyboard.cxx:181 +msgid "Relevant Options" +msgstr "" + +#: keyboard.cxx:166 +msgid "Select Layout Variant" +msgstr "" + +#: keyboard.cxx:175 +msgid "Select your Model" +msgstr "" + +#: keyboard.cxx:150 keyboard.cxx:164 +msgid "Select your keyboard Layout" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/translation/sax3-monitor.po new/sax3-0.1.2/src/translation/sax3-monitor.po --- old/sax3-0.1.1/src/translation/sax3-monitor.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sax3-0.1.2/src/translation/sax3-monitor.po 2014-05-05 17:54:07.000000000 +0200 @@ -0,0 +1,74 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-04 17:42+0530\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: monitors.cxx:218 +msgid "Cancel" +msgstr "" + +#: monitors.cxx:193 +msgid "Depth" +msgstr "" + +#: monitors.cxx:195 +msgid "Enable Advanced Settings" +msgstr "" + +#: monitors.cxx:200 +msgid "Horizontal Sync Rate(max value)" +msgstr "" + +#: monitors.cxx:198 +msgid "Horizontal Sync Rate(min value)" +msgstr "" + +#: monitors.cxx:208 +msgid "I want my own CVT" +msgstr "" + +#: monitors.cxx:217 +msgid "Ok" +msgstr "" + +#: monitors.cxx:214 +msgid "Refresh Rate" +msgstr "" + +#: monitors.cxx:191 +msgid "Select resolution" +msgstr "" + +#: monitors.cxx:187 +msgid "Select the driver" +msgstr "" + +#: monitors.cxx:205 +msgid "Vertical Refresh Rate(max value)" +msgstr "" + +#: monitors.cxx:203 +msgid "Vertical Refresh Rate(min value)" +msgstr "" + +#: monitors.cxx:210 +msgid "X Axis" +msgstr "" + +#: monitors.cxx:212 +msgid "Y Axis" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/translation/sax3-mouse.po new/sax3-0.1.2/src/translation/sax3-mouse.po --- old/sax3-0.1.1/src/translation/sax3-mouse.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sax3-0.1.2/src/translation/sax3-mouse.po 2014-05-05 17:54:07.000000000 +0200 @@ -0,0 +1,74 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-04 17:42+0530\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: mouse.cxx:320 +msgid "3 Button Timeout" +msgstr "" + +#: mouse.cxx:314 +msgid "3 button Emulation Options" +msgstr "" + +#: mouse.cxx:333 +msgid "Angle Offset in degrees" +msgstr "" + +#: mouse.cxx:312 +msgid "Auto Detected Mouse" +msgstr "" + +#: mouse.cxx:336 +msgid "Close" +msgstr "" + +#: mouse.cxx:316 +msgid "Enable 3 Buttons" +msgstr "" + +#: mouse.cxx:324 +msgid "Enable Wheel Emulation" +msgstr "" + +#: mouse.cxx:330 +msgid "Invert X Axis" +msgstr "" + +#: mouse.cxx:331 +msgid "Invert Y Axis" +msgstr "" + +#: mouse.cxx:319 mouse.cxx:327 +msgid "No" +msgstr "" + +#: mouse.cxx:335 +msgid "Save" +msgstr "" + +#: mouse.cxx:328 +msgid "Wheel Button Timeout" +msgstr "" + +#: mouse.cxx:322 +msgid "Wheel Emulation Options" +msgstr "" + +#: mouse.cxx:318 mouse.cxx:326 +msgid "Yes" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sax3-0.1.1/src/translation/sax3-touchpad.po new/sax3-0.1.2/src/translation/sax3-touchpad.po --- old/sax3-0.1.1/src/translation/sax3-touchpad.po 1970-01-01 01:00:00.000000000 +0100 +++ new/sax3-0.1.2/src/translation/sax3-touchpad.po 2014-05-05 17:54:07.000000000 +0200 @@ -0,0 +1,98 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-04 17:42+0530\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: touchpad.cxx:91 +msgid "Bottom Edge" +msgstr "" + +#: touchpad.cxx:92 +msgid "Bottom Left Corner" +msgstr "" + +#: touchpad.cxx:90 +msgid "Bottom Right Corner" +msgstr "" + +#: touchpad.cxx:98 +msgid "Cancel" +msgstr "" + +#: touchpad.cxx:86 +msgid "Circular Scrolling Location" +msgstr "" + +#: touchpad.cxx:58 +msgid "Emulate Mouse Button 1" +msgstr "" + +#: touchpad.cxx:66 +msgid "Emulate Mouse Button 2" +msgstr "" + +#: touchpad.cxx:74 +msgid "Emulate Mouse Button 3" +msgstr "" + +#: touchpad.cxx:84 +msgid "Enable 2 finger Horizontal Scroll" +msgstr "" + +#: touchpad.cxx:83 +msgid "Enable 2 finger Vertical Scroll" +msgstr "" + +#: touchpad.cxx:85 +msgid "Enable Circular Scrolling" +msgstr "" + +#: touchpad.cxx:81 +msgid "Enable Vertical Edge Scrolling" +msgstr "" + +#: touchpad.cxx:82 +msgid "Enable horizontal Edge Scrolling" +msgstr "" + +#: touchpad.cxx:93 +msgid "Left Edges" +msgstr "" + +#: touchpad.cxx:59 touchpad.cxx:67 touchpad.cxx:75 +msgid "No Of Clicks" +msgstr "" + +#: touchpad.cxx:97 +msgid "Ok" +msgstr "" + +#: touchpad.cxx:89 +msgid "Right Edge " +msgstr "" + +#: touchpad.cxx:87 +msgid "Top Edges" +msgstr "" + +#: touchpad.cxx:94 +msgid "Top Left Corner" +msgstr "" + +#: touchpad.cxx:88 +msgid "Top Right Corner" +msgstr "" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit salt for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-05-06 14:03:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2014-04-30 15:12:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-05-06 14:03:04.000000000 +0200 @@ -1,0 +2,18 @@ +Mon May 5 18:19:29 UTC 2014 - aboe76(a)gmail.com + +- Updated to 2014.1.4 + - Fix setup.py dependency issue (issue 12031) + - Fix handling for IOErrors under certain circumstances (issue 11783 and issue 11853) + - Fix fatal exception when `/proc/1/cgroup` is not readable (issue 11619) + - Fix os grains for OpenSolaris (issue 11907) + - Fix `lvs.zero` module argument pass-through (issue 9001) + - Fix bug in `debian_ip` interaction with `network.system` state (issue 11164) + - Remove bad binary package verification code (issue 12177) + - Fix traceback in solaris package installation (issue 12237) + - Fix `file.directory` state symlink handling (issue 12209) + - Remove `external_ip` grain + - Fix `file.managed` makedirs issues (issue 10446) + - Fix hang on non-existent Windows drive letter for `file` module (issue 9880) + - Fix salt minion caching all users on the server (issue 9743) + +------------------------------------------------------------------- Old: ---- salt-2014.1.3.tar.gz New: ---- salt-2014.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.K0JUnN/_old 2014-05-06 14:03:05.000000000 +0200 +++ /var/tmp/diff_new_pack.K0JUnN/_new 2014-05-06 14:03:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: salt -Version: 2014.1.3 +Version: 2014.1.4 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 ++++++ salt-2014.1.3.tar.gz -> salt-2014.1.4.tar.gz ++++++ ++++ 3624 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rng-tools for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package rng-tools for openSUSE:Factory checked in at 2014-05-06 14:02:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rng-tools (Old) and /work/SRC/openSUSE:Factory/.rng-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rng-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/rng-tools/rng-tools.changes 2013-12-30 10:39:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rng-tools.new/rng-tools.changes 2014-05-06 14:02:59.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 30 03:54:36 UTC 2014 - crrodriguez(a)opensuse.org + +- Fix automagic startup with udev/systemd virtio-rng KERNEL + name is hw_random not hwrng.. + +------------------------------------------------------------------- +Wed Apr 30 03:15:22 UTC 2014 - crrodriguez(a)opensuse.org + +- in some parallel universe --fill-watermark took a percentage + value, not in this incarnation at least, where it takes + an integer. just use the sane builtin default + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rng-tools.spec ++++++ --- /var/tmp/diff_new_pack.z4AzTx/_old 2014-05-06 14:03:00.000000000 +0200 +++ /var/tmp/diff_new_pack.z4AzTx/_new 2014-05-06 14:03:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rng-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++++++ 90-hwrng.rules ++++++ --- /var/tmp/diff_new_pack.z4AzTx/_old 2014-05-06 14:03:00.000000000 +0200 +++ /var/tmp/diff_new_pack.z4AzTx/_new 2014-05-06 14:03:00.000000000 +0200 @@ -1 +1,2 @@ -ACTION=="add", KERNEL=="hwrng", SUBSYSTEM=="misc", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rng-tools.service" +ACTION=="add", KERNEL=="hwrng|hw_random", SUBSYSTEM=="misc", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rng-tools.service" + ++++++ rng-tools.service ++++++ --- /var/tmp/diff_new_pack.z4AzTx/_old 2014-05-06 14:03:00.000000000 +0200 +++ /var/tmp/diff_new_pack.z4AzTx/_new 2014-05-06 14:03:00.000000000 +0200 @@ -3,7 +3,7 @@ [Service] CapabilityBoundingSet=CAP_SYS_ADMIN -ExecStart=/usr/sbin/rngd --foreground --fill-watermark=90% +ExecStart=/usr/sbin/rngd --foreground [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rabbitmq-server for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package rabbitmq-server for openSUSE:Factory checked in at 2014-05-06 14:02:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old) and /work/SRC/openSUSE:Factory/.rabbitmq-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rabbitmq-server" Changes: -------- --- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes 2014-04-20 11:36:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rabbitmq-server.new/rabbitmq-server.changes 2014-05-06 14:02:54.000000000 +0200 @@ -1,0 +2,13 @@ +Mon May 5 12:49:05 UTC 2014 - dmueller(a)suse.com + +- update to 3.3.1: + * Bug fixes + * Security fixes to MQTT and shovel + * see http://www.rabbitmq.com/release-notes/README-3.3.1.txt + +------------------------------------------------------------------- +Wed Apr 30 00:08:33 UTC 2014 - dmueller(a)suse.com + +- do not install init script on systemd distros + +------------------------------------------------------------------- Old: ---- rabbitmq-server-3.3.0.tar.gz New: ---- rabbitmq-server-3.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rabbitmq-server.spec ++++++ --- /var/tmp/diff_new_pack.DHTOHh/_old 2014-05-06 14:02:56.000000000 +0200 +++ /var/tmp/diff_new_pack.DHTOHh/_new 2014-05-06 14:02:56.000000000 +0200 @@ -24,7 +24,7 @@ %endif Name: rabbitmq-server -Version: 3.3.0 +Version: 3.3.1 Release: 0 Summary: The RabbitMQ Server License: MPL-1.1 @@ -119,14 +119,15 @@ DOC_INSTALL_DIR=%{buildroot}/%{_docdir} \ VERSION=%{version} +%if 0%{?have_systemd} +install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service +%else # Install init scripts install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/rabbitmq-server mkdir -p %{buildroot}%{_sbindir} ln -sf %{_initddir}/rabbitmq-server %{buildroot}%{_sbindir}/rcrabbitmq-server mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/ install -p -D -m 644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rabbitmq-server -%if 0%{?have_systemd} -install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service %endif # Install wrapper scripts @@ -185,23 +186,26 @@ exit 0 %post -%fillup_and_insserv rabbitmq-server %if 0%{?have_systemd} %service_add_post %{name}.service systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf +%else +%fillup_and_insserv rabbitmq-server %endif %preun -%stop_on_removal rabbitmq-server %if 0%{?have_systemd} %service_del_preun %{name}.service +%else +%stop_on_removal rabbitmq-server %endif %postun -%restart_on_update rabbitmq-server -%insserv_cleanup %if 0%{?have_systemd} %service_del_postun %{name}.service +%else +%restart_on_update rabbitmq-server +%insserv_cleanup %endif %files -f ../filelist.%{name}.rpm @@ -213,11 +217,12 @@ %{_rabbit_libdir}/bin %dir %{_rabbit_libdir}/lib %{_rabbit_erllibdir} -%{_initddir}/rabbitmq-server -%{_sbindir}/rcrabbitmq-server %if 0%{?have_systemd} %{_unitdir}/%{name}.service /usr/lib/tmpfiles.d/rabbitmq-server.conf +%else +%{_sbindir}/rcrabbitmq-server +%{_initddir}/rabbitmq-server %endif %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d ++++++ rabbitmq-server-3.3.0.tar.gz -> rabbitmq-server-3.3.1.tar.gz ++++++ ++++ 2690 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit quilt for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2014-05-06 14:02:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "quilt" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-04-26 06:06:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-05-06 14:02:47.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Apr 25 18:16:09 CEST 2014 - jdelvare(a)suse.de + +- quilt-bash_completion-fix-completion-of-patch-names.patch: Fix + bash completion of patch names (bnc#872719) +- quilt-boost-the-speed-of-series-applied-and-unapplied.patch: + Performance boost for series, applied and unapplied commands + (bnc#872719) +- quilt-enable-patch-wrapper-test.patch: Re-enable testing of + patch-wrapper (bnc#872719) +- quilt-files-return-nothing-if-there-are-no-files.patch: Fix quilt + files output when there are no files (bnc#872719) +- quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch: Fix + quilt diff -z on file names including spaces (bnc#872719) +- quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch: + Fix patches heuristic for unapplied patches with timestamps + (bnc#872719) +- quilt-patches-optimize-processing-of-unapplied-patches.patch, + quilt-patches-optimize-the-multiple-files-case.patch: Fix + performance regression in quilt patches (bnc#872719) +- quilt-refresh-fix-error-message.patch: Fix refresh error message + (bnc#872719) + +------------------------------------------------------------------- New: ---- quilt-bash_completion-fix-completion-of-patch-names.patch quilt-boost-the-speed-of-series-applied-and-unapplied.patch quilt-enable-patch-wrapper-test.patch quilt-files-return-nothing-if-there-are-no-files.patch quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch quilt-patches-optimize-processing-of-unapplied-patches.patch quilt-patches-optimize-the-multiple-files-case.patch quilt-refresh-fix-error-message.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.sg4auw/_old 2014-05-06 14:02:48.000000000 +0200 +++ /var/tmp/diff_new_pack.sg4auw/_new 2014-05-06 14:02:48.000000000 +0200 @@ -44,6 +44,15 @@ Patch3: patch-wrapper-rpm.diff Patch4: setup-check-for-rpmbuild.patch Patch5: suse-workaround-pseudo-release.patch +Patch6: quilt-bash_completion-fix-completion-of-patch-names.patch +Patch7: quilt-refresh-fix-error-message.patch +Patch8: quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch +Patch9: quilt-files-return-nothing-if-there-are-no-files.patch +Patch10: quilt-patches-optimize-processing-of-unapplied-patches.patch +Patch11: quilt-patches-optimize-the-multiple-files-case.patch +Patch12: quilt-boost-the-speed-of-series-applied-and-unapplied.patch +Patch13: quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch +Patch14: quilt-enable-patch-wrapper-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Recommends: procmail @@ -68,6 +77,15 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build # --with-rpmbuild=/usr/lib/rpm/rpmb: ++++++ quilt-bash_completion-fix-completion-of-patch-names.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Tue, 7 Jan 2014 16:56:16 +0100 Subject: bash_completion: Fix completion of patch names Patch-mainline: yes Git-commit: f535e6f731668035a3fa2472628ba82146ea7262 References: bnc#872719 When the user's quilt configuration file (~/.quiltrc or /etc/quilt.quiltrc) contains QUILT_PATCHES_PREFIX=yes (and the default /etc/quilt.quiltrc does), bash completion chokes on patch names. This is because quilt series, applied and unapplied return relative patch names instead of the expected absolute patch names. This can be solved by skipping configuration files when quilt is called from the bash completion script. This fixes bug #27111: https://savannah.nongnu.org/bugs/index.php?27111 diff --git a/bash_completion b/bash_completion index 19736cb..0918598 100644 --- a/bash_completion +++ b/bash_completion @@ -6,6 +6,11 @@ # This file is part of the distribution of quilt, and is distributed under # the same licence than quilt itself +# WARNING: This script doesn't read user or system quiltrc files, and assumes +# that QUILT_PC is left unchanged. If you have changed QUILT_PC and want +# completion to work then you must set QUILT_PC in your global environment +# (for example in ~/.profile) and not just in your quiltrc file. + if type quilt &> /dev/null ; then if ! type _expand &> /dev/null ; then @@ -123,7 +128,7 @@ _quilt_completion() add) case $prev in -P) - COMPREPLY=( $( compgen -W "$(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; *) _quilt_comfile @@ -134,7 +139,7 @@ _quilt_completion() annotate) case $prev in -P) - COMPREPLY=( $( compgen -W "$(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; *) _quilt_comfile @@ -143,10 +148,10 @@ _quilt_completion() esac ;; applied) - COMPREPLY=( $( compgen -W "-h $(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-h $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; delete) - COMPREPLY=( $( compgen -W "-n -r -h --backup $(quilt series)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-n -r -h --backup $(quilt --quiltrc - series)" -- $cur ) ) ;; diff) case $prev in @@ -154,7 +159,7 @@ _quilt_completion() COMPREPLY=( $( compgen -W "0 1" -- $cur ) ) ;; -P|--combine) - COMPREPLY=( $( compgen -W "$(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; --diff|-U|-C) ;; @@ -171,10 +176,10 @@ _quilt_completion() files) case $prev in --combine) - COMPREPLY=( $( compgen -W "$(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; *) - COMPREPLY=( $( compgen -W "-a -l -v -h --combine $(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-a -l -v -h --combine $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; esac ;; @@ -198,7 +203,7 @@ _quilt_completion() COMPREPLY=( $( compgen -W "files" -- $cur ) ) ;; *) - COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; esac ;; @@ -207,7 +212,7 @@ _quilt_completion() COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) ) ;; header) - COMPREPLY=( $( compgen -W "-a -e -h -r --backup --strip-diffstat --strip-trailing-whitespace $(quilt series)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-a -e -h -r --backup --strip-diffstat --strip-trailing-whitespace $(quilt --quiltrc - series)" -- $cur ) ) ;; import) case $prev in @@ -229,17 +234,17 @@ _quilt_completion() COMPREPLY=( $( compgen -W "-m --prefix --mbox --send --sender --from --subject --to --cc --bcc" -- $cur ) ) ;; next|previous) - COMPREPLY=( $( compgen -W "$(quilt series)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - series)" -- $cur ) ) ;; patches) _quilt_comfile COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-v -h" -- $cur ) ) ;; pop) - COMPREPLY=( $( compgen -W "-a -f -R -q -v -h $(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-a -f -R -q -v -h $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; push) - COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --interactive --color $(quilt unapplied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --interactive --color $(quilt --quiltrc - unapplied 2>/dev/null)" -- $cur ) ) ;; refresh) case $prev in @@ -249,14 +254,14 @@ _quilt_completion() -U|-C) ;; *) - COMPREPLY=( $( compgen -W "-p -u -U -c -C -f -h $(quilt applied 2>/dev/null) --no-timestamps --no-index --diffstat --sort --backup --strip-trailing-whitespace" -- $cur ) ) + COMPREPLY=( $( compgen -W "-p -u -U -c -C -f -h $(quilt --quiltrc - applied 2>/dev/null) --no-timestamps --no-index --diffstat --sort --backup --strip-trailing-whitespace" -- $cur ) ) ;; esac ;; remove|revert) case $prev in -P) - COMPREPLY=( $( compgen -W "$(quilt applied 2>/dev/null)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) ;; *) _quilt_comfile @@ -267,7 +272,7 @@ _quilt_completion() rename) case $prev in -P) - COMPREPLY=( $( compgen -W "$(quilt series)" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(quilt --quiltrc - series)" -- $cur ) ) ;; *) COMPREPLY=( $( compgen -W "-P -h" -- $cur ) ) @@ -292,7 +297,7 @@ _quilt_completion() COMPREPLY=( $( compgen -W "-d -h" -- $cur ) ) ;; unapplied) - COMPREPLY=( $( compgen -W "-h $(quilt series)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-h $(quilt --quiltrc - series)" -- $cur ) ) ;; fork|new|top|upgrade) ;; ++++++ quilt-boost-the-speed-of-series-applied-and-unapplied.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Sun, 2 Mar 2014 16:29:24 +0100 Subject: Boost the speed of the series, applied and unapplied commands Patch-mainline: yes Git-commit: e052a2d22569f56a30285716da11b4e0a1eed052 References: bnc#872719 The current implementation of the series, applied and unapplied commands performs rather poorly, especially on large patch sets. To make things worse, bash completion makes use of these commands, so it becomes next to unusable on large patch sets. Instead of looping over each patch, use the power of printf to print everything in one go. Performance gains on a 15k patch series are breathtaking: series: 189.4 s -> 0.6 s series -v: 92.9 s -> 0.6 s applied: 3.5 s -> 0.1 s unapplied: 3.9 s -> 0.1 s --- quilt/applied.in | 5 +---- quilt/scripts/patchfns.in | 8 ++++++++ quilt/series.in | 9 ++++----- quilt/unapplied.in | 10 ++-------- 4 files changed, 15 insertions(+), 17 deletions(-) --- a/quilt/applied.in +++ b/quilt/applied.in @@ -61,10 +61,7 @@ patch=$(find_applied_patch "$1") || exit setup_pager -for patch in $(applied_before "$patch") $patch -do - echo "$(print_patch $patch)" -done +printf "$(patch_format)\n" $(applied_before "$patch") "$patch" ### Local Variables: ### mode: shell-script --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -976,6 +976,14 @@ print_patch() { echo -n "${QUILT_PATCHES_PREFIX:+$SUBDIR_DOWN$QUILT_PATCHES/}$1" } +# Generate a format suitable to print patch names with printf +patch_format() +{ + local prefix=${QUILT_PATCHES_PREFIX:+$SUBDIR_DOWN$QUILT_PATCHES/} + + echo -n "${prefix/\%/%%}%s" +} + setup_colors() { local C=diff_hdr=32:diff_add=36:diff_mod=35:diff_rem=35:diff_hunk=33:diff_ctx=35:diff_cctx=33:patch_offs=33:patch_fuzz=35:patch_fail=31:series_app=32:series_top=33:series_una=00:clear=00 --- a/quilt/series.in +++ b/quilt/series.in @@ -40,12 +40,11 @@ cat_patches() { local color=$1 prefix=$2 shift 2 - local patch - for patch in "$@" - do - echo "$color$prefix$(print_patch "$patch")$color_clear" - done + if [ $# -ge 1 ] + then + printf "$color$prefix$(patch_format)$color_clear\n" "$@" + fi } options=`getopt -o vh --long color:: -- "$@"` --- a/quilt/unapplied.in +++ b/quilt/unapplied.in @@ -67,14 +67,8 @@ fi setup_pager -( - echo "$patch" - patches_after "$patch" -) \ -| while read patch -do - echo "$(print_patch $patch)" -done +printf "$(patch_format)\n" "$patch" $(patches_after "$patch") + ### Local Variables: ### mode: shell-script ### End: ++++++ quilt-enable-patch-wrapper-test.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Wed, 16 Apr 2014 11:44:55 +0200 Subject: Re-enable patch-wrapper test Patch-mainline: yes Git-commit: 293c4ddbf61f69a5cfb3a71f89cb3e48d3ccda7e References: bnc#872719 The patch-wrapper test was unconditionally disabled by commit 97200435 ("Only run test/patch-wrapper.test if the --with-patch-wrapper config option is used.") Re-enable this test when the --with-patch-wrapper config option is actually used. --- Makefile.in | 3 +++ 1 file changed, 3 insertions(+) --- a/Makefile.in +++ b/Makefile.in @@ -120,6 +120,9 @@ NON_EXEC_IN := doc/quilt.1 doc/README qu GIT_DESC := $(shell ./git-desc | sed -e 's:^v::') TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) +ifneq ($(PATCH_WRAPPER),) +TESTS += test/patch-wrapper.test +endif DIRT += test/.depend $(wildcard test/.*.ok) # Settings for running the uninstalled version of quilt in the source tree: ++++++ quilt-files-return-nothing-if-there-are-no-files.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Fri, 14 Feb 2014 15:52:57 +0100 Subject: files: Return nothing if there are no files Patch-mainline: yes Git-commit: 4d8358ae52ce574920c7f3aba7453f305fabf1ba References: bnc#872719 "quilt files" returns a blank line if no files are included in the patch. This could easily break constructs such as "quilt files | wc -l". Let "quilt files" return nothing at all if there are no files in the patch. diff --git a/quilt/files.in b/quilt/files.in index 6e107ee..355fa21 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -128,7 +128,7 @@ list_files_in_patch() fi # Note: If opt_labels is set, then use_status is not set. IFS= - echo $(files_in_patch "$patch") | + files_in_patch "$patch" | sort | while read file do diff --git a/test/example1.test b/test/example1.test index ec73b81..7eaa228 100644 --- a/test/example1.test +++ b/test/example1.test @@ -12,6 +12,7 @@ http://the-tech.mit.edu/Shakespeare/midsummer/full.html $ quilt new flower.diff > Patch %{P}flower.diff is now on top + $ quilt files $ quilt add Oberon.txt > File Oberon.txt added to patch %{P}flower.diff ++++++ quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Mon, 10 Feb 2014 13:11:34 +0100 Subject: patchfns: Fix "quilt diff -z" on files with spaces in their names Patch-mainline: yes Git-commit: 6051b9347f59f761ef744cb7cc813d5eadd86b55 References: bnc#872719 Before this fix, "quilt diff -z" would fail on files with spaces in their names, with the following error message: Failed to copy files to temporary directory --- quilt/scripts/patchfns.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -887,7 +887,7 @@ apply_patch_temporarily() local prefix=$QUILT_PC/$patch/ [ ${prefix:0:1} == / ] || prefix=$PWD/$prefix if ! ( cd $workdir && \ - $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s ${@:--} ) + $QUILT_DIR/scripts/backup-files -B $prefix -r -k -s "${@:--}" ) then printf $"Failed to copy files to temporary directory\n" >&2 return 1 ++++++ quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Wed, 9 Apr 2014 10:17:09 +0200 Subject: patches: Fix heuristic for unapplied patches with timestamps Patch-mainline: yes Git-commit: 6c8254913549bea07fe62124324a68af773188f8 References: bnc#872719 The heuristic to find file names in unapplied patches fails miserably on all patches with timestamps. We have to consider everything past the last tab as the timestamp and strip it. The timestamp itself will contain spaces so we can't split on that. This fixes a regression introduced by commit 4df47975. It's hard to believe this has been broken for over 4 years and nobody ever noticed. --- quilt/patches.in | 2 +- test/timestamps.test | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) --- a/quilt/patches.in +++ b/quilt/patches.in @@ -74,7 +74,7 @@ touched_by_patch() | awk ' /^(\+\+\+|---)[ \t]/ { sub(/^(\+\+\+|---)[ \t]/, "") - sub(/[ \t][^ \t]*$/, "") + sub(/\t[^\t]*$/, "") sub(/^\/dev\/null/, "") for (i=0; i<'$strip'; i++) sub(/^[^\/]*\//, "") --- /dev/null +++ b/test/timestamps.test @@ -0,0 +1,46 @@ +# Test how quilt behaves when patches include timestamps + +$ mkdir patches + +$ cat > patches/series +< unified-create.patch +< unified-update.patch +< unified-delete.patch + +$ cat > patches/unified-create.patch +< diff -ruN a/file b/file +< --- a/file 1970-01-01 01:00:00.000000000 +0100 +< +++ b/file 2014-01-15 11:19:43.000000000 +0100 +< @@ -0,0 +1 @@ +< +new line + +$ cat > patches/unified-update.patch +< diff -ruN a/file b/file +< --- a/file 2014-01-15 11:19:43.000000000 +0100 +< +++ b/file 2014-01-15 11:20:17.000000000 +0100 +< @@ -1 +1 @@ +< -new line +< +updated line + +$ cat > patches/unified-delete.patch +< diff -ruN a/file b/file +< --- a/file 2014-01-15 11:20:17.000000000 +0100 +< +++ b/file 1970-01-01 01:00:00.000000000 +0100 +< @@ -1 +0,0 @@ +< -updated line + +$ quilt patches file +> patches/unified-create.patch +> patches/unified-update.patch +> patches/unified-delete.patch + +$ quilt push -qa +> Applying patch patches/unified-create.patch +> Applying patch patches/unified-update.patch +> Applying patch patches/unified-delete.patch +> Now at patch patches/unified-delete.patch + +$ quilt patches file +> patches/unified-create.patch +> patches/unified-update.patch +> patches/unified-delete.patch ++++++ quilt-patches-optimize-processing-of-unapplied-patches.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Sat, 15 Feb 2014 18:43:41 +0100 Subject: patches: Optimize processing of unapplied patches Patch-mainline: yes Git-commit: 1b95644e3a00f07a6711c881d2dcdac14206a57e References: bnc#872719 * Don't check for $strip = ab twice, once is enough. * Quote the file names to be suitable in regular expressions only once, instead of doing it again for every patch. This fixes a performance regression introduced in 8ebb056d ("patches: Add support for multiple files"), sorry about that. These two simple changes bring a huge performance boost on unapplied patches, of about 50% in the single file case and growing as you add files. diff --git a/quilt/patches.in b/quilt/patches.in index 3f3caed..6ec5e01 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -70,7 +70,6 @@ scan_applied() touched_by_patch() { local strip=$1 patch=$2 - [ $strip = ab ] && strip=1 cat_file $(patch_file_name $patch) \ | awk ' /^(\+\+\+|---)[ \t]/ { @@ -89,7 +88,14 @@ scan_unapplied() { local color=$1 prefix=$2 strip shift 2 - local patch file file_bre match + local patch file match + local -a files_bre + + # Quote each file name only once + for file in "${opt_files[@]}" + do + files_bre[${#files_bre[@]}]=$(quote_bre "$file") + done for patch in "$@" do @@ -97,11 +103,10 @@ scan_unapplied() [ "$strip" = ab ] && strip=1 match= - for file in "${opt_files[@]}" + for file in "${files_bre[@]}" do - file_bre="$(quote_bre "$file")" if touched_by_patch $strip $patch \ - | grep -q "^$file_bre\$" + | grep -q "^$file\$" then match=1 break ++++++ quilt-patches-optimize-the-multiple-files-case.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Sat, 15 Feb 2014 18:43:48 +0100 Subject: patches: Optimize the multiple files case Patch-mainline: yes Git-commit: aadae7a30499c318ae18cb6b216f1d7fe60e49b7 References: bnc#872719 I didn't put too many thoughts when adding support for multiple files to the "patches" command. The nested loop approach turns out to be very inefficient for unapplied patches. Get rid of the innermost loop by building a single pattern matching all filenames at once. That way, performance no longer depends on the number of files (as far as unapplied patches are concerned.) diff --git a/quilt/patches.in b/quilt/patches.in index 6ec5e01..89c5b86 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -88,7 +88,7 @@ scan_unapplied() { local color=$1 prefix=$2 strip shift 2 - local patch file match + local patch file local -a files_bre # Quote each file name only once @@ -97,23 +97,19 @@ scan_unapplied() files_bre[${#files_bre[@]}]=$(quote_bre "$file") done + # "Or" all files in a single pattern + file=\\$$(array_join \\\| "${files_bre[@]}")\\$ + for patch in "$@" do strip=$(patch_strip_level $patch) [ "$strip" = ab ] && strip=1 - match= - for file in "${files_bre[@]}" - do - if touched_by_patch $strip $patch \ - | grep -q "^$file\$" - then - match=1 - break - fi - done - - [ -z "$match" ] || echo "$color$prefix$(print_patch $patch)$color_clear" + if touched_by_patch $strip "$patch" \ + | grep -q "^$file\$" + then + echo "$color$prefix$(print_patch $patch)$color_clear" + fi done } diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 42e8de8..e00c819 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -76,6 +76,20 @@ trap run_exit_handlers EXIT # ======================================================== +# Join multiple stings using the given separator. +array_join() +{ + local sep=$1 str=$2 + shift 2 + + printf %s "$str" + + for str in "$@" + do + printf %s%s "$sep" "$str" + done +} + # Quote a string for use in a basic regular expression. quote_bre() { ++++++ quilt-refresh-fix-error-message.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Date: Thu, 6 Feb 2014 08:50:34 +0100 Subject: refresh: Fix error message Patch-mainline: yes Git-commit: 5df0d39bcd087190fe414bef9a7e4055c941bc76 References: bnc#872719 The message was not updated when support for -pab was added. diff --git a/quilt/refresh.in b/quilt/refresh.in index 97b81a6..41d43a7 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -199,7 +199,8 @@ ab) num_strip_level=1 ;; *) - printf $"Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\n" "$opt_strip_level" >&2 + printf $"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\n" \ + "$opt_strip_level" >&2 exit 1 ;; esac -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0