diff options
-rw-r--r-- | debian/NEWS | 4 | ||||
-rw-r--r-- | debian/changelog | 85 | ||||
-rw-r--r-- | debian/foomatic-filters.postinst.in (renamed from debian/foomatic-filters.postinst) | 10 | ||||
-rwxr-xr-x | debian/rules | 12 |
4 files changed, 102 insertions, 9 deletions
diff --git a/debian/NEWS b/debian/NEWS index 346cecb..2ee5103 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -foomatic-filters (4.0.5-1~exp0) unstable; urgency=low +foomatic-filters (4.0.5-1) experimental; urgency=low The PostScript accounting code insertion for cups is now enabled by default. @@ -7,4 +7,4 @@ foomatic-filters (4.0.5-1~exp0) unstable; urgency=low reconfiguring this package or by editing /etc/foomatic/filter.conf directly. - -- Didier Raboud <didier@raboud.com> Tue, 10 Aug 2010 21:17:24 +0200 + -- Didier Raboud <didier@raboud.com> Tue, 10 Aug 2010 17:54:34 +0200 diff --git a/debian/changelog b/debian/changelog index 4ad50ca..bed2454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,87 @@ foomatic-filters (4.0.5-1~exp0) experimental; urgency=low -- Didier Raboud <didier@raboud.com> Tue, 10 Aug 2010 21:26:06 +0200 +foomatic-filters (4.0.5-0ubuntu3) maverick; urgency=low + + [ Till Kamppeter ] + * debian/patches/unhtmlify-segfault.patch: Made sure that the unhtmlify() + function does not write the zero byte to mark the string end beyond the + buffer. Also use a much larger buffer for parsing + "*FoomaticRIPOptionPrototype:" in the PPD file (Upstream bug #515). + * debian/patches/strncpy-tochar-use-isempty.patch: In strncpy_tochar() use + the isempty() function to check whether the input string is empty + (Upstream bug #514). + + [ Translation updates ] + * Italian (Luca Monducci, Closes: #593957) + * Russian (Yuri Kozlov, Closes: #593907) + * Swedish (Martin Bagge, Closes: #594078) + + [ Didier Raboud ] + * Substitute the fallacious use of dpkg-vendor in the postinst by build-time + distro detection. + + -- Till Kamppeter <till.kamppeter@gmail.com> Wed, 1 Sep 2010 00:43:03 +0200 + +foomatic-filters (4.0.5-0ubuntu2) maverick; urgency=low + + [ Didier Raboud ] + * Document the default change in NEWS. + * Remove the big warning in the debconf template. + * Packaging fixes (Closes: #235829, #254682) + * Bump Standards to 3.9.1.0 + + -- Till Kamppeter <till.kamppeter@gmail.com> Tue, 10 Aug 2010 19:18:03 +0200 + +foomatic-filters (4.0.5-0ubuntu1) maverick; urgency=low + + [ Till Kamppeter ] + * New upstream release (Closes: #539676) + - Made some string variables longer to avoid space problems. + - Let foomatic-rip actually error out if something goes wrong. It simply + continued or closed silently (exit status 0) in many cases (LP: #570522). + - Corrections in the documentation, especially removed remainders of the + need of libgs in former versions. + - Fixed several causes of segmentation faults, especially also for + spooler-less printing. + - Fixed support for '0's as placeholders for a custom paper size in the + prototype. + - Made custom page size settings embedded in incoming PostScript be + correctly recognized also if the initial comment is + "%% FoomaticRIPOptionSetting: PageSize=Custom", without the size and + unit parameters. + * debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch: + Removed backported upstream fix. + + [ Didier Raboud ] + * Merge from Ubuntu: + - Install the apport hook on Ubuntu + - Merge the changelog entries. + - Merge the patch (see 4.0.4-0ubuntu2 changelog entry). + - Merge most package relationships. + - Merge package descriptions (Closes: #467380) + - Turn on the insertion of PostScript code for CUPS' page accounting by + default (LP: #119403). + - Removed dependency on libgs to avoid license conflicts in the future + and to make packaging easier. + + * Add myself to Uploaders as I'll help Chris in maintaining foomatic-filters. + * Putting under Debian Printing Group umbrella. + * Convert to 3.0 (quilt) source format. + * Convert to tiny dh7 style. + * debian/watch: update. + * s/cupsys/cups/ everywhere (Closes: #511748) + * Use db_settitle instead of deprecated db_title in the debconf templates, + thanks to Frans Pop. (Closes: #560316) + * Maintainer scripts cleanup thanks to lintian + * Add Vcs-* fields with new packaging repository. + * Update README.Debian. + * Bump Standards to 3.9.0.0 + - Rework some Conflicts/Breaks + - Update debian/copyright + + -- Till Kamppeter <till.kamppeter@gmail.com> Tue, 10 Aug 2010 18:59:03 +0200 + foomatic-filters (4.0.4-0ubuntu2) maverick; urgency=low * debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch: @@ -108,7 +189,7 @@ foomatic-filters (4.0.4-0ubuntu2) maverick; urgency=low This patch contains the changes which are planned to be introduced in Foomatic 4.0.5, so this can be considered a test release for 4.0.5. - -- Till Kampeter <till.kamppeter@gmail.com> Tue, 8 Jun 2010 17:47:03 +0200 + -- Till Kamppeter <till.kamppeter@gmail.com> Tue, 8 Jun 2010 17:47:03 +0200 foomatic-filters (4.0.4-0ubuntu1) lucid; urgency=low @@ -135,7 +216,7 @@ foomatic-filters (4.0.4-0ubuntu1) lucid; urgency=low * debian/control: Removed build dependency on libgs-dev, foomatic-rip does not need libgs any more. - -- Till Kampeter <till.kamppeter@gmail.com> Mon, 15 Feb 2010 17:14:03 +0100 + -- Till Kamppeter <till.kamppeter@gmail.com> Mon, 15 Feb 2010 17:14:03 +0100 foomatic-filters (4.0.3-0ubuntu4) lucid; urgency=low diff --git a/debian/foomatic-filters.postinst b/debian/foomatic-filters.postinst.in index 63578d1..2a5d21d 100644 --- a/debian/foomatic-filters.postinst +++ b/debian/foomatic-filters.postinst.in @@ -47,11 +47,11 @@ else ps_accounting="ps_accounting: 0" fi -# Since foomatic-filters 4.0.5-1 in Debian, the default for inserting -# PostScript code for CUPS' page accounting changed. This functionality -# is now activated by default as for problematic drivers it can be -# deactivated individually -if dpkg --compare-versions "$2" lt-nl "4.0.5-1" ; then +# Since foomatic-filters #FF_PS_DEFAULT_CHANGE_VERSION# in #MOTHER_DISTRO#, +# the default for inserting PostScript code for CUPS' page accounting changed. +# This functionality is now activated by default as for problematic drivers it +# can be deactivated individually. +if dpkg --compare-versions "$2" lt-nl "#FF_PS_DEFAULT_CHANGE_VERSION#"; then ps_accounting="ps_accounting: 1" RET=true db_set foomatic-filters/ps_accounting true diff --git a/debian/rules b/debian/rules index 81e1f00..5a2eaf6 100755 --- a/debian/rules +++ b/debian/rules @@ -22,3 +22,15 @@ override_dh_install: ifeq ($(derives_from_ubuntu),yes) install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/foomatic-filters/usr/share/apport/package-hooks/source_foomatic-filters.py endif + + # Prepare the postinst with distro-specific versions + cp debian/foomatic-filters.postinst.in debian/foomatic-filters.postinst +ifeq ($(derives_from_ubuntu),yes) + # We derive from Ubuntu, the ps_accounting default change was made in version 3.0.2-20070719-0ubuntu1 + sed -i -e "s/#MOTHER_DISTRO#/Ubuntu/g" debian/foomatic-filters.postinst + sed -i -e "s/#FF_PS_DEFAULT_CHANGE_VERSION#/3.0.2-20070719-0ubuntu1/g" debian/foomatic-filters.postinst +else + # We derive from Debian, the ps_accounting default change was made in version 4.0.5-1 + sed -i -e "s/#MOTHER_DISTRO#/Debian/g" debian/foomatic-filters.postinst + sed -i -e "s/#FF_PS_DEFAULT_CHANGE_VERSION#/4.0.5-1/g" debian/foomatic-filters.postinst +endif |