diff options
author | Didier Raboud <odyx@debian.org> | 2016-09-24 19:05:20 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2016-09-24 19:05:20 +0200 |
commit | 6b4835fc71686662e0ff059db5880e9341874478 (patch) | |
tree | 8befd234ea1a3f2e816b3829c11da84067dccdcb |
Import ptouch-driver_1.4.2-2.debian.tar.xz
[dgit import tarball ptouch-driver 1.4.2-2 ptouch-driver_1.4.2-2.debian.tar.xz]
-rw-r--r-- | .git-dpm | 8 | ||||
-rw-r--r-- | changelog | 252 | ||||
-rw-r--r-- | compat | 1 | ||||
-rw-r--r-- | control | 24 | ||||
-rw-r--r-- | copyright | 41 | ||||
-rw-r--r-- | gbp.conf | 4 | ||||
-rw-r--r-- | local/apport-hook.py | 11 | ||||
-rw-r--r-- | patches/0001-Add-include-cups-ppd.h-as-CUPS-2.2-moved-some-defini.patch | 22 | ||||
-rw-r--r-- | patches/series | 1 | ||||
-rw-r--r-- | printer-driver-ptouch.install | 4 | ||||
-rw-r--r-- | printer-driver-ptouch.ppd-updater | 2 | ||||
-rwxr-xr-x | rules | 38 | ||||
-rw-r--r-- | source.lintian-overrides | 2 | ||||
-rw-r--r-- | source/format | 1 |
14 files changed, 411 insertions, 0 deletions
diff --git a/.git-dpm b/.git-dpm new file mode 100644 index 0000000..03742f7 --- /dev/null +++ b/.git-dpm @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +a5cd2164661b2b8d7bf3ffc64f0632541088a028 +a5cd2164661b2b8d7bf3ffc64f0632541088a028 +50faa6d5f9c8f6ede9ea173e7278c8e5bfdb9d27 +50faa6d5f9c8f6ede9ea173e7278c8e5bfdb9d27 +ptouch-driver_1.4.2.orig.tar.gz +3a2a85ddfc8099e4b8b29c19ebb25bd0129ae7eb +128417 diff --git a/changelog b/changelog new file mode 100644 index 0000000..b7aca10 --- /dev/null +++ b/changelog @@ -0,0 +1,252 @@ +ptouch-driver (1.4.2-2) unstable; urgency=medium + + * Initialize git-dpm + * Add patch to add 'include <cups/ppd.h>' as CUPS 2.2 moved some definitions + to ppd.h, to fix FTBFS + + -- Didier Raboud <odyx@debian.org> Sat, 24 Sep 2016 19:05:20 +0200 + +ptouch-driver (1.4.2-1) unstable; urgency=medium + + * New 1.4.2 upstream release (LP: #1607917) + - Fix RLE internal errors + - Fix behaviour of Cut After Job option + * Bump S-V to 3.9.8 without changes needed + + -- Didier Raboud <odyx@debian.org> Mon, 01 Aug 2016 10:52:23 +0200 + +ptouch-driver (1.4.1-1) unstable; urgency=medium + + * New 1.4.1 upstream release, functionally equivalent to the previously + uploaded snapshot + + -- Didier Raboud <odyx@debian.org> Sat, 23 Jul 2016 09:29:21 +0200 + +ptouch-driver (1.4-5-gf4ad445-1) unstable; urgency=medium + + * New upstream snapshot + - Add support for Brother QL-570 (LP: #1604036) + + -- Didier Raboud <odyx@debian.org> Thu, 21 Jul 2016 07:38:59 +0200 + +ptouch-driver (1.4-1) unstable; urgency=medium + + * New 1.4 upstream release, functionally equivalent to the previously + uploaded snapshot + + -- Didier Raboud <odyx@debian.org> Thu, 18 Feb 2016 08:35:24 +0100 + +ptouch-driver (1.3+20150410-hg15aad40+cleanup0-1) unstable; urgency=low + + * Snapshot from the new upstream take-over repository, by Philip Pemberton + - Fix the "ESC i A" (enable cutter) command patch to correctly send only on + printers which support it (LP: #1342979) + * Drop all patches, included upstream + * Drop the transitional ptouch-driver package + * Bump to Standards-Version 3.9.6 without changes needed + * Bump debhelper B-D to 9 + * Refresh debian/copyright + * Update homepage to point to the new upstream's + * Add gbp.conf + * Drop debian/watch for now + + -- Didier Raboud <odyx@debian.org> Fri, 04 Sep 2015 09:46:47 +0200 + +ptouch-driver (1.3-8) unstable; urgency=medium + + [ Philip Pemberton ] + * Rewrite the patch to send the 'ESC i A' command to only let rastertoptch + send it to printers that do support it (Closes: #740789, LP: #1287971) + + [ Didier Raboud ] + * Move the repository from collab-maint to printing; update the VCS-* fields + accordingly + + -- Didier Raboud <odyx@debian.org> Thu, 06 Mar 2014 16:23:54 +0100 + +ptouch-driver (1.3-7) unstable; urgency=low + + * Rebuild against pyppd >= 1.0.1 + + -- Didier Raboud <odyx@debian.org> Thu, 12 Sep 2013 21:32:52 +0200 + +ptouch-driver (1.3-6) unstable; urgency=low + + * Upload to unstable. + + -- Didier Raboud <odyx@debian.org> Sun, 19 May 2013 14:45:20 +0200 + +ptouch-driver (1.3-5) experimental; urgency=low + + [ Till Kamppeter ] + * Removed unneeded build dependency on foomatic-db. + + [ Didier Raboud ] + * Bump Standards-Version to 3.9.4 without changes needed. + + -- Didier Raboud <odyx@debian.org> Wed, 26 Sep 2012 14:34:28 +0200 + +ptouch-driver (1.3-4) unstable; urgency=low + + [ Till Kamppeter ] + * Don't install the cups filter in multiarch directories. + (Closes: #681495, LP: #990638) + + -- Didier Raboud <odyx@debian.org> Sat, 14 Jul 2012 02:33:13 +0200 + +ptouch-driver (1.3-3) unstable; urgency=low + + * Update the PPD-updater regexp to cope with latest changes in dh_pyppd; + also bump build-depends. + * Only build PPD files when needed. + + -- Didier Raboud <odyx@debian.org> Mon, 24 Oct 2011 21:27:55 +0200 + +ptouch-driver (1.3-2) unstable; urgency=low + + * Refactoring, action 1: + - rename ptouch-driver to printer-driver-ptouch, add transitional package + and slightly rewrite description. + + * Bump debhelper compat for auto- buildflags. + * Fix typo in debian/copyright. + + -- Didier Raboud <odyx@debian.org> Mon, 24 Oct 2011 11:26:23 +0200 + +ptouch-driver (1.3-1) unstable; urgency=low + + * Initial Debian release (Closes: #555892). + + * Start from the Ubuntu packaging, thanks! + + * Put under Debian Printing Team umbrella, with myself as uploader. + * Convert to 3.0 (quilt) source format. + * Add the Ubuntu apport hook conditionally + * Add VCS-* fields. + * Use dh-autoreconf to have a cleaner build. + * debian/watch: add. + * Use dh_pyppd trough the --with stanza. + * Drop explicit pyppd depends, they come trough dh_pyppd. + * Add DEP-3 headers to all patches. + * Rewrite debian/copyright DEP-5-style. + * Enable parallel building, including specifying the number of threads for + the foomatic compilation. + * Drop unneeded dh_auto_test override. + * Slightly rewrite the "long" description. + * Bump Standards-Version to 3.9.2 without changes needed. + + -- Didier Raboud <odyx@debian.org> Mon, 29 Aug 2011 12:27:35 +0200 + +ptouch-driver (1.3-0ubuntu11) oneiric; 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 + (LP: #829446). + * debian/rules, debian/control: Compress PPD files with pyppd. + * debian/rules, debian/control, debian/postinst, + debian/ptouch-driver.ppd-updater: Let automatic update of the PPDs of + already existing print queues be done by CUPS. + + -- Till Kamppeter <till.kamppeter@gmail.com> Sat, 20 Aug 2011 00:37:23 +0200 + +ptouch-driver (1.3-0ubuntu10) oneiric; 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. + + -- Till Kamppeter <till.kamppeter@gmail.com> Mon, 1 Aug 2011 19:07:23 +0200 + +ptouch-driver (1.3-0ubuntu9) oneiric; urgency=low + + * 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 <till.kamppeter@gmail.com> Thu, 28 Jul 2011 19:28:03 +0200 + +ptouch-driver (1.3-0ubuntu8) oneiric; urgency=low + + * debian/patches/foomatic-data-fixes.patch: Added "-dNOINTERPOLATE" to the + Ghostscript command line. This makes the page rendering by Ghostscript + significantly faster. + + * debian/rules, debian/control, debian/local/pyppd/: Use pyppd from + external package. + + -- Till Kamppeter <till.kamppeter@gmail.com> Sun, 24 Jul 2011 22:34:03 +0200 + +ptouch-driver (1.3-0ubuntu7) maverick; urgency=low + + * debian/local/pyppd/pyppd/: Updated to pyppd 0.4.9. Here we do not suppress + all runtime errors but only IOError and KeyboardInterrupt. This way we do + not suppress errors which are caused by an actual bug (LP: #618017). + + -- Till Kamppeter <till.kamppeter@gmail.com> Wed, 23 Sep 2010 16:07:03 +0200 + +ptouch-driver (1.3-0ubuntu6) maverick; urgency=low + + * debian/local/pyppd/pyppd/pyppd-ppdfile.in: Suppress any kind of runtime + error tracebacks by putting a "try: ... except: pass" construct around the + main function call. This avoids Apport pop-ups when the execution of the + self-extracting compressed PPD file archives gets stopped by the calling + process (LP: #618017). + + -- Till Kamppeter <till.kamppeter@gmail.com> Tue, 21 Sep 2010 20:35:03 +0200 + +ptouch-driver (1.3-0ubuntu5) maverick; urgency=low + + * debian/patches/send-esc-i-A.patch: The code "ESC i A \001" needs to be sent + to the printer so that cutting happens. Thanks to Matthias Urlichs for the + patch (LP: #635249). + + -- Till Kamppeter <till.kamppeter@gmail.com> Mon, 13 Sep 2010 10:00:00 +0200 + +ptouch-driver (1.3-0ubuntu4) maverick; urgency=low + + * debian/control: Added build and runtime dependencies for the compressed + PPD archive. + + -- Till Kamppeter <till.kamppeter@gmail.com> Fri, 3 Sep 2010 20:25:53 +0200 + +ptouch-driver (1.3-0ubuntu3) maverick; urgency=low + + * debian/rules: Make bin/pyppd executable before calling it and create the + empty file pyppd/__init__.py. These properties are not conveyed by the + .diff.gz file. + + -- Till Kamppeter <till.kamppeter@gmail.com> Fri, 3 Sep 2010 17:14:53 +0200 + +ptouch-driver (1.3-0ubuntu2) maverick; urgency=low + + * debian/control, debian/rules, debian/postinst: Provided the PPD files + pre-built in a compressed archive instead of providing Foomatic XML data, + to make the package not depending on foomatic-db. This way we can replace + foomatic-db by a compressed PPD archive. + * debian/local/pyppd/: Added pyppd scripts to generate compressed PPD + archives. + + -- Till Kamppeter <till.kamppeter@gmail.com> Tue, 31 Aug 2010 22:35:53 +0200 + +ptouch-driver (1.3-0ubuntu1) lucid; urgency=low + + [ Till Kamppeter ] + * debian/postinst: Added automatic update of PPD files of already existing + print queues when the package is updated. + * debian/rules: Removed the Foomatic printer XML files, they are already + contained in foomatic-db. + * debian/rules: Suppress running dh_auto_test, it runs often before the + Makefile is created (dh bug?). + * debian/rules, debian/control: Added support for patches. + * debian/control: Set section to "text". + * debian/local/apport-hook.py, debian/rules: Added Apport hook. + * debian/patches/foomatic-data-fixes.patch: Moved the Foomatic data fixes + into a proper patch. + + [ Lars Wirzenius ] + * Initial packaging. + + -- Lars Wirzenius <liw@liw.fi> Wed, 11 Nov 2009 17:14:44 +0200 @@ -0,0 +1 @@ +9 @@ -0,0 +1,24 @@ +Source: ptouch-driver +Maintainer: Debian Printing Team <debian-printing@lists.debian.org> +Uploaders: Didier Raboud <odyx@debian.org> +Section: text +Priority: optional +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 9), + dh-autoreconf, + libcups2-dev, + libcupsimage2-dev, + foomatic-db-engine, + pyppd (>= 1.0.1) +Vcs-Git: https://alioth.debian.org/anonscm/git/printing/ptouch-driver.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=printing/ptouch-driver.git +Homepage: https://bitbucket.org/philpem/printer-driver-ptouch + +Package: printer-driver-ptouch +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ghostscript +Replaces: ptouch-driver (<< 1.3-2~) +Breaks: ptouch-driver (<< 1.3-2~) +Description: printer driver Brother P-touch label printers + The ptouch driver is an open source driver for the Brother P-touch label + printers, from the QL-* and PT-* series. diff --git a/copyright b/copyright new file mode 100644 index 0000000..0410fe8 --- /dev/null +++ b/copyright @@ -0,0 +1,41 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ptouch-driver +Source: https://bitbucket.org/philpem/printer-driver-ptouch/branch/ptouch-driver + +Files: * +Copyright: 2006 Arne John Glenstrup <panic@itu.dk> + 2015 Philip Pemberton <philpem@philpem.me.uk> +License: GPL-2+ + +Files: debian/* +Copyright: 2009 Lars Wirzenius <liw@debian.org> + 2010-2011 Till Kamppeter <till.kamppeter@gmail.com> + 2011-2015 Didier Raboud <odyx@debian.org> +License: GPL-2+ + +Files: debian/local/apport-hook.py +Copyright: 2009 Canonical Ltd. +License: GPL-2+ +Author: Brian Murray <brian@ubuntu.com> + +License: GPL-2+ + 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..47e7402 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +debian-branch = debian/master +upstream-branch = upstream/latest +pristine-tar = True diff --git a/local/apport-hook.py b/local/apport-hook.py new file mode 100644 index 0000000..e97c2a1 --- /dev/null +++ b/local/apport-hook.py @@ -0,0 +1,11 @@ +'''apport package hook for ptouch-driver + +(c) 2009 Canonical Ltd. +Author: Brian Murray <brian@ubuntu.com> +''' + +from apport.hookutils import * + +def add_info(report): + attach_hardware(report) + attach_printing(report) diff --git a/patches/0001-Add-include-cups-ppd.h-as-CUPS-2.2-moved-some-defini.patch b/patches/0001-Add-include-cups-ppd.h-as-CUPS-2.2-moved-some-defini.patch new file mode 100644 index 0000000..266906d --- /dev/null +++ b/patches/0001-Add-include-cups-ppd.h-as-CUPS-2.2-moved-some-defini.patch @@ -0,0 +1,22 @@ +From a5cd2164661b2b8d7bf3ffc64f0632541088a028 Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Sat, 24 Sep 2016 19:04:32 +0200 +Subject: Add 'include <cups/ppd.h>' as CUPS 2.2 moved some definitions to + ppd.h + +--- + rastertoptch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rastertoptch.c b/rastertoptch.c +index 33e7193..9d4db16 100644 +--- a/rastertoptch.c ++++ b/rastertoptch.c +@@ -312,6 +312,7 @@ + #include <math.h> + #include <cups/raster.h> + #include <cups/cups.h> ++#include <cups/ppd.h> + + #if STDC_HEADERS + # include <string.h> diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..6cf7bfe --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +0001-Add-include-cups-ppd.h-as-CUPS-2.2-moved-some-defini.patch diff --git a/printer-driver-ptouch.install b/printer-driver-ptouch.install new file mode 100644 index 0000000..2b1e24a --- /dev/null +++ b/printer-driver-ptouch.install @@ -0,0 +1,4 @@ +# Install the ppd updater data file so that CUPS can update the +# PPDs of the already existing queues after each update of the +# ptouch-driver package +debian/printer-driver-ptouch.ppd-updater usr/share/cups/ppd-updaters/ diff --git a/printer-driver-ptouch.ppd-updater b/printer-driver-ptouch.ppd-updater new file mode 100644 index 0000000..6309db3 --- /dev/null +++ b/printer-driver-ptouch.ppd-updater @@ -0,0 +1,2 @@ +DRIVER_REGEXP='^ptouch:' +GENNICKNAME_REGEXP='' @@ -0,0 +1,38 @@ +#!/usr/bin/make -f + +derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") || echo "no") + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else + # Faster when testing on modern desktops, 1 task takes less than a full CPU + NUMJOBS = 4 +endif + +%: + dh $@ --with autoreconf --with pyppd --parallel + +override_dh_auto_clean: + dh_auto_clean + rm -rf foomatic-db + +override_dh_auto_configure: + dh_auto_configure -- --libdir=/usr/lib + +override_dh_auto_install: +ifneq (,$(filter printer-driver-ptouch, $(shell dh_listpackages))) + dh_auto_install --destdir=debian/printer-driver-ptouch/ + + # Pre-build PPD files + mkdir $(CURDIR)/foomatic-db + cp -r $(CURDIR)/debian/printer-driver-ptouch/usr/share/foomatic/* $(CURDIR)/foomatic-db/ + echo '#' > $(CURDIR)/foomatic-db/db/oldprinterids + rm -rf $(CURDIR)/debian/printer-driver-ptouch/usr/share/foomatic + mkdir -p $(CURDIR)/debian/printer-driver-ptouch/usr/share/ppd + FOOMATICDB=$(CURDIR)/foomatic-db foomatic-compiledb -j $(NUMJOBS) -t ppd -d $(CURDIR)/debian/printer-driver-ptouch/usr/share/ppd/ptouch-driver `ls -1 $(CURDIR)/foomatic-db/db/source/driver/*ptouch*.xml | perl -p -e 's:^.*db/source/driver/(\S*)\.xml\s*$$:\1\n:'` + +ifeq ($(derives_from_ubuntu),yes) + # Install Apport hook + install -D -m 644 debian/local/apport-hook.py $(CURDIR)/debian/ptouch-driver/usr/share/apport/package-hooks/source_ptouch-driver.py +endif +endif diff --git a/source.lintian-overrides b/source.lintian-overrides new file mode 100644 index 0000000..27e97b8 --- /dev/null +++ b/source.lintian-overrides @@ -0,0 +1,2 @@ +# This is needed for "auto-buildflags" +package-needs-versioned-debhelper-build-depends 9 diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) |