diff -Nru m2300w-0.51/debian/changelog m2300w-0.51/debian/changelog --- m2300w-0.51/debian/changelog 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/changelog 2011-10-24 19:12:55.000000000 +0000 @@ -1,47 +1,82 @@ -m2300w (0.51-0ubuntu15) oneiric; urgency=low +m2300w (0.51-7) unstable; urgency=low - * debian/rules: Added PPD files for the KONICA MINOLTA versions of the - magicolor 2300W/2400W (LP: #250583). - * debian/rules, debian/control: Compress PPD files with pyppd. - * debian/rules, debian/control, debian/m2300w.postinst, - debian/m2300w.ppd-updater: Let automatic update of the PPDs of already - existing print queues be done by CUPS. + * Bump Build-Dependency on pyppd to ensure that the compressed PPDs archive + is correctly named. - -- Till Kamppeter Fri, 19 Aug 2011 20:37:23 +0200 + -- Didier Raboud Mon, 24 Oct 2011 21:12:45 +0200 -m2300w (0.51-0ubuntu14) oneiric; urgency=low +m2300w (0.51-6) unstable; urgency=low - * debian/control: Versioned build dependency on foomatic-db to assure that - the Ubuntu build server installs the physical package foomatic-db and - not foomatic-db-compressed-ppds which only provides foomatic-db. + * Use << and not >> for the transitional relationships. - -- Till Kamppeter Fri, 19 Aug 2011 18:10:23 +0200 + -- Didier Raboud Fri, 21 Oct 2011 17:22:52 +0200 -m2300w (0.51-0ubuntu13) oneiric; urgency=low +m2300w (0.51-5) unstable; urgency=low - * debian/control: Changed build dependency on foomatic-db-xml back to - foomatic-db and added "Build-Conflicts: foomatic-db-compressed-ppds" - instead to assure that the Foomatic XML database is present during - package build and not only the compressed archive of the Foomatic PPD - files. + * Refactoring, action 1: + - rename m2300w to printer-driver-m2300w, add transitional package. - -- Till Kamppeter Mon, 1 Aug 2011 19:07:23 +0200 + * Fix short description typo, thanks to Vincent Blut (Closes: 639180) + * Slightly rewrite descriptions. + * Bump debhelper compat to 9 for auto- buildflags. + - Bump debhelper B-D. + - Add source lintian override. + * Only recommend cups-ppdc. -m2300w (0.51-0ubuntu12) oneiric; urgency=low + -- Didier Raboud Fri, 21 Oct 2011 17:04:16 +0200 - * debian/control: Changed build dependency on foomatic-db to foomatic-db-xml - to assure that the Foomatic XML database is present and not only the - compressed archive of the Foomatic PPD files. - - -- Till Kamppeter Thu, 28 Jul 2011 19:21:23 +0200 - -m2300w (0.51-0ubuntu11) oneiric; urgency=low +m2300w (0.51-4) unstable; urgency=low + [ Till Kamppeter ] + * Update the ppd-updater driver regexp. + * Added "Build-Conflicts: foomatic-db-compressed-ppds" to assure that the + Foomatic XML database is present during package build and not only the + compressed archive of the Foomatic PPD files. * debian/patches/20_use_ghostscript_with_nointerpolate.dpatch: Added - "-dNOINTERPOLATE" to the Ghostscript command line. This makes the - page rendering by Ghostscript significantly faster. + "-dNOINTERPOLATE" to the Ghostscript command line. This makes the page + rendering by Ghostscript significantly faster. + * Add PPD files for the KONICA MINOLTA versions of the magicolor + 2300W/2400W. (LP: #250583) + + -- Didier Raboud Wed, 24 Aug 2011 17:45:37 +0200 + +m2300w (0.51-3) unstable; urgency=low + + * Use the new dh_pyppd. + - Drop the explicit pyppd call. + - Install the PPDs before dh_pyppd. + - Version Build-Depends on pyppd. + - Drop the explicit depends due to pyppd usage. + * Drop the PPD-updater postinst and use CUPS' trigger instead. + + -- Didier Raboud Sat, 20 Aug 2011 13:49:51 +0200 + +m2300w (0.51-2) unstable; urgency=low + + * Compress PPDs using pyppd. + + -- Didier Raboud Fri, 17 Jun 2011 23:12:13 +0200 + +m2300w (0.51-1) unstable; urgency=low + + * Initial upload to Debian (Closes: #629906) + - Put under Debian Printing Team umbrella and add myself as Uploader. + - Start from Ubuntu packaging; thanks! + + * Demote cups and cups-client to Recommends. + * Remove cups Build-Depends. + * Convert to source format 3.0 (quilt), convert dpatch'es to quilt patches. + * Move homepage URL to its proper field. + * Convert rules to dh7 tiny style; bump dh compat to 7 and B-D on debhelper + to >= 7.0.50~. + * Add misc:Depends to the binary package dependencies. + * Update debian/copyright; fix GPL version symlink. + * Use Breaks+Replaces instead of Provides+Replaces+Conflicts. + * Install the apport hook depending on the target distribution. + * Add Vcs-* fields. + * Bump Standards-Version to 3.9.2 without more changes needed. - -- Till Kamppeter Sun, 24 Jul 2011 22:04:23 +0200 + -- Didier Raboud Thu, 09 Jun 2011 15:25:04 +0200 m2300w (0.51-0ubuntu10) natty; urgency=low @@ -81,14 +116,14 @@ * debian/local/apport-hook.py, debian/rules: Added apport hook (LP: #338442). -- Till Kamppeter Thu, 26 Mar 2009 16:57:50 +0100 - + m2300w (0.51-0ubuntu6) jaunty; urgency=low * debian/m2300w.postinst: Added automatic updating of the PPD files of the already existing CUPS queues which use this driver. -- Till Kamppeter Wed, 18 Feb 2008 10:57:50 +0100 - + m2300w (0.51-0ubuntu5) intrepid; urgency=low * debian/rules: Add "*cupsFilter" line to accept PDF input data to the PPDs diff -Nru m2300w-0.51/debian/compat m2300w-0.51/debian/compat --- m2300w-0.51/debian/compat 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/compat 2011-10-21 14:59:00.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru m2300w-0.51/debian/control m2300w-0.51/debian/control --- m2300w-0.51/debian/control 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/control 2011-10-24 19:12:01.000000000 +0000 @@ -1,28 +1,37 @@ Source: m2300w Section: text Priority: optional -Maintainer: Ubuntu Core Developers -XSBC-Original-Maintainer: Till Kamppeter -Build-Depends: debhelper (>= 5.0.0), groff, dpatch, ghostscript, cups, foomatic-db (>= 20000101), foomatic-db-engine, foomatic-filters (>= 4.0.0~bzr156), pyppd (>= 0.4.9-5) +Maintainer: Debian Printing Team +Uploaders: Didier Raboud , Till Kamppeter +Build-Depends: debhelper (>= 8.9.0~), groff, ghostscript, foomatic-db, foomatic-db-engine, foomatic-filters (>= 4.0.0~bzr156), pyppd (>= 0.4.9-6~) Build-Conflicts: foomatic-db-compressed-ppds -Standards-Version: 3.7.2 +Standards-Version: 3.9.2.0 +Vcs-Git: git://anonscm.debian.org/collab-maint/m2300w.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/m2300w.git +Homepage: http://m2300w.sf.net/ -Package: m2300w +Package: printer-driver-m2300w Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, foomatic-filters (>= 4.0.0~bzr156) +Depends: ${misc:Depends}, ${shlibs:Depends}, foomatic-filters (>= 4.0.0~bzr156) +Recommends: cups-ppdc Suggests: psutils -Replaces: m2300w-ppds -Provides: m2300w-ppds -Conflicts: m2300w-ppds -Description: Driver for the Minolta magicolor 2300W/24000W color laser printers - The m2300w driver is an open source Linux driver for the - Konica Minolta magicolor 2300W and 2400W color laser printers. +Replaces: m2300w-ppds, m2300w (<< 0.51-5~) +Breaks: m2300w-ppds, m2300w (<< 0.51-5~) +Description: printer driver for Minolta magicolor 2300W/2400W color laser printers + The m2300w driver is a driver for the Konica Minolta magicolor 2300W and + 2400W color laser printers. . The driver is basically intended for being used in conjunction with "foomatic" (see http://www.openprinting.org/foomatic.html), which is a database-driven system for integrating free software printer drivers with common spoolers under Unix, like CUPS, LPRng, LPD, GNUlpr, PPR, PDQ, CPS, and direct printing. - . - Home Page: http://sourceforge.net/projects/m2300w/ +Package: m2300w +Depends: printer-driver-m2300w, ${misc:Depends} +Architecture: all +Section: oldlibs +Priority: extra +Description: transitional dummy package for m2300w printer driver + This is a transitional dummy package to transition to uniformly named + printer-driver-m2300w. diff -Nru m2300w-0.51/debian/copyright m2300w-0.51/debian/copyright --- m2300w-0.51/debian/copyright 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/copyright 2011-08-21 20:36:35.000000000 +0000 @@ -21,4 +21,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is: + + Copyright (C) 2007,2008,2009 Till Kamppeter + Copyright (C) 2011 Didier Raboud + +and is licensed under the GPLv2+, as m2300w itself, see above. diff -Nru m2300w-0.51/debian/docs m2300w-0.51/debian/docs --- m2300w-0.51/debian/docs 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -README -README.ghostscript diff -Nru m2300w-0.51/debian/m2300w.ppd-updater m2300w-0.51/debian/m2300w.ppd-updater --- m2300w-0.51/debian/m2300w.ppd-updater 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/m2300w.ppd-updater 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -DRIVER_REGEXP='^m2300w:' -GENNICKNAME_REGEXP='' diff -Nru m2300w-0.51/debian/patches/00list m2300w-0.51/debian/patches/00list --- m2300w-0.51/debian/patches/00list 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -10_ppd_for_2400w_fails_cupstestppd.dpatch -20_use_ghostscript_with_nointerpolate.dpatch diff -Nru m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.diff m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.diff --- m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.diff 1970-01-01 00:00:00.000000000 +0000 +++ m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.diff 2011-08-21 20:36:35.000000000 +0000 @@ -0,0 +1,23 @@ +Description: PPD for the Minolta magicolor 2400W was not passing cupstestppd. +Author: Till Kamppeter +Last-Update: 2007-03-14 + +--- a/ppd/magicolor_2400W-m2400w.ppd ++++ b/ppd/magicolor_2400W-m2400w.ppd +@@ -139,11 +139,11 @@ + *OpenUI *Resolution/Resolution: PickOne + *FoomaticRIPOption Resolution: enum CmdLine A + *OrderDependency: 100 AnySetup *Resolution +-*DefaultResolution: 1200x600 +-*Resolution 1200x600/1200x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x600" +-*FoomaticRIPOptionSetting Resolution=1200x600: "-r 2 " +-*Resolution 2400x600/2400x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=2400x600" +-*FoomaticRIPOptionSetting Resolution=2400x600: "-r 3 " ++*DefaultResolution: 1200x600dpi ++*Resolution 1200x600dpi/1200x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x600dpi" ++*FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r 2 " ++*Resolution 2400x600dpi/2400x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=2400x600dpi" ++*FoomaticRIPOptionSetting Resolution=2400x600dpi: "-r 3 " + *CloseUI: *Resolution + + *OpenUI *Multipage/Multipage: PickOne diff -Nru m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.dpatch m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.dpatch --- m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.dpatch 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/patches/10_ppd_for_2400w_fails_cupstestppd.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_ppd_for_2400w_fails_cupstestppd.patch.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad m2300w-0.51~/ppd/magicolor_2400W-m2400w.ppd m2300w-0.51/ppd/magicolor_2400W-m2400w.ppd ---- m2300w-0.51~/ppd/magicolor_2400W-m2400w.ppd 2005-10-06 00:39:31.000000000 +0100 -+++ m2300w-0.51/ppd/magicolor_2400W-m2400w.ppd 2007-03-14 18:27:33.000000000 +0000 -@@ -139,11 +139,11 @@ - *OpenUI *Resolution/Resolution: PickOne - *FoomaticRIPOption Resolution: enum CmdLine A - *OrderDependency: 100 AnySetup *Resolution --*DefaultResolution: 1200x600 --*Resolution 1200x600/1200x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x600" --*FoomaticRIPOptionSetting Resolution=1200x600: "-r 2 " --*Resolution 2400x600/2400x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=2400x600" --*FoomaticRIPOptionSetting Resolution=2400x600: "-r 3 " -+*DefaultResolution: 1200x600dpi -+*Resolution 1200x600dpi/1200x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x600dpi" -+*FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r 2 " -+*Resolution 2400x600dpi/2400x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=2400x600dpi" -+*FoomaticRIPOptionSetting Resolution=2400x600dpi: "-r 3 " - *CloseUI: *Resolution - - *OpenUI *Multipage/Multipage: PickOne diff -Nru m2300w-0.51/debian/patches/20_use_ghostscript_with_nointerpolate.dpatch m2300w-0.51/debian/patches/20_use_ghostscript_with_nointerpolate.dpatch --- m2300w-0.51/debian/patches/20_use_ghostscript_with_nointerpolate.dpatch 2012-02-15 08:48:39.000000000 +0000 +++ m2300w-0.51/debian/patches/20_use_ghostscript_with_nointerpolate.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_use_ghostscript_with_nointerpolate.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' m2300w-0.51~/src/m2300w-wrapper.in m2300w-0.51/src/m2300w-wrapper.in ---- m2300w-0.51~/src/m2300w-wrapper.in 2005-10-06 21:55:04.000000000 +0200 -+++ m2300w-0.51/src/m2300w-wrapper.in 2011-07-24 22:03:12.094877216 +0200 -@@ -465,7 +465,7 @@ - GSBIN=gs - fi - --GS="$GSBIN -q -dBATCH -dSAFER -dQUIET -dNOPAUSE -dMaxBitmap=134217728" -+GS="$GSBIN -q -dBATCH -dSAFER -dQUIET -dNOPAUSE -dNOINTERPOLATE -dMaxBitmap=134217728" - - cat >> /tmp/m2300w.log < +Last-Update: 2009-06-24 +--- a/src/m2300w-wrapper.in ++++ b/src/m2300w-wrapper.in +@@ -465,7 +465,7 @@ + GSBIN=gs + fi + +-GS="$GSBIN -q -dBATCH -dSAFER -dQUIET -dNOPAUSE -dMaxBitmap=134217728" ++GS="$GSBIN -q -dBATCH -dSAFER -dQUIET -dNOPAUSE -dNOINTERPOLATE -dMaxBitmap=134217728" + + cat >> /tmp/m2300w.log < $(CURDIR)/debian/m2300w/usr/share/ppd/m2300w/KONICA_MINOLTA-magicolor_2300W-m2300w.ppd - perl -p -e 's/Minolta/KONICA MINOLTA/g' $(CURDIR)/debian/m2300w/usr/share/ppd/m2300w/Minolta-magicolor_2400W-m2400w.ppd > $(CURDIR)/debian/m2300w/usr/share/ppd/m2300w/KONICA_MINOLTA-magicolor_2400W-m2400w.ppd - dh_pyppd -pm2300w - rm -rf $(CURDIR)/debian/m2300w/usr/share/cups - # Install the ppd updater data file so that CUPS can update the - # PPDs of the already existing queues after each update of the - # m2300w package - install -D -m 644 debian/m2300w.ppd-updater $(CURDIR)/debian/m2300w/usr/share/cups/ppd-updaters/m2300w - # Install Apport hook - install -D -m 644 debian/local/apport-hook.py $(CURDIR)/debian/m2300w/usr/share/apport/package-hooks/source_m2300w.py - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_install: + dh_install + # Install the two PPDs and their second version counterpart. + mkdir -p $(CURDIR)/debian/printer-driver-m2300w/usr/share/ppd/m2300w + for n in 2300 2400; do \ + mv $(CURDIR)/debian/tmp/usr/share/cups/model/Minolta/magicolor_$${n}W-m$${n}w.ppd $(CURDIR)/debian/printer-driver-m2300w/usr/share/ppd/m2300w/Minolta-magicolor_$${n}W-m$${n}w.ppd ; \ + perl -p -e 's/Minolta/KONICA MINOLTA/g' $(CURDIR)/debian/printer-driver-m2300w/usr/share/ppd/m2300w/Minolta-magicolor_$${n}W-m$${n}w.ppd > $(CURDIR)/debian/printer-driver-m2300w/usr/share/ppd/m2300w/KONICA_MINOLTA-magicolor_$${n}W-m$${n}w.ppd ; \ + done +ifeq ($(derives_from_ubuntu),yes) + # Install the apport hook on Ubuntu and derivatives + install -D -m 644 debian/local/apport-hook.py $(CURDIR)/debian/printer-driver-m2300w/usr/share/apport/package-hooks/source_m2300w.py +endif diff -Nru m2300w-0.51/debian/source/format m2300w-0.51/debian/source/format --- m2300w-0.51/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ m2300w-0.51/debian/source/format 2012-02-15 08:48:40.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru m2300w-0.51/debian/source.lintian-overrides m2300w-0.51/debian/source.lintian-overrides --- m2300w-0.51/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ m2300w-0.51/debian/source.lintian-overrides 2011-10-21 15:00:29.000000000 +0000 @@ -0,0 +1,2 @@ +# This is needed for "auto-buildflags" +package-needs-versioned-debhelper-build-depends 9