diff -Nru tea4cups-3.13~alpha0+svn3565/clean.sh tea4cups-3.14~alpha0+svn3576/clean.sh --- tea4cups-3.13~alpha0+svn3565/clean.sh 2013-01-04 22:51:15.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/clean.sh 2018-08-23 00:29:57.000000000 +0000 @@ -2,7 +2,7 @@ # Tea4CUPS : Tee for CUPS # -# (c) 2005-2013 Jerome Alet +# (c) 2005-2018 Jerome Alet # (c) 2005 Peter Stuge # 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 @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: clean.sh 3565 2013-01-04 22:51:15Z jerome $ +# $Id: clean.sh 3576 2018-08-23 00:29:57Z jerome $ # # # Use this to clean the tree from temporary files diff -Nru tea4cups-3.13~alpha0+svn3565/CREDITS tea4cups-3.14~alpha0+svn3576/CREDITS --- tea4cups-3.13~alpha0+svn3565/CREDITS 2013-01-04 22:51:15.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/CREDITS 2018-08-23 00:29:57.000000000 +0000 @@ -1,8 +1,8 @@ -# $Id: CREDITS 3565 2013-01-04 22:51:15Z jerome $ +# $Id: CREDITS 3576 2018-08-23 00:29:57Z jerome $ Tea4CUPS : Tee for CUPS -(c) 2005-2013 Jerome Alet +(c) 2005-2018 Jerome Alet (c) 2005 Peter Stuge 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 @@ -42,6 +42,9 @@ - Peter Stuge : rewrote most of the subprocess management stuff. - Frank Koormann : fixed a problem with Python 2.1 + - Rainer Dorsch and Daniel (?) : fixed a problem with the job + billing IPP attribute being an integer. Root cause still + unknown... ============================================================== diff -Nru tea4cups-3.13~alpha0+svn3565/debian/changelog tea4cups-3.14~alpha0+svn3576/debian/changelog --- tea4cups-3.13~alpha0+svn3565/debian/changelog 2018-02-10 16:22:44.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/debian/changelog 2018-09-03 06:43:28.000000000 +0000 @@ -1,3 +1,18 @@ +tea4cups (3.14~alpha0+svn3576-1) unstable; urgency=medium + + * New upstream SVN snapshot. + - Fixes a problem where the job billing attribute sometimes is an integer. + (Closes: #905986). + * debian/rules: + + Create repacked orig tarball in ../ rather than in ./. + * debian/control: + + Bump Standards-Version: to 4.2.1. No changes needed. + * debian/copyright: + + Use secure URI for copyright format reference. + + Update copyright attributions. + + -- Mike Gabriel Mon, 03 Sep 2018 08:43:28 +0200 + tea4cups (3.13~alpha0+svn3565-4) unstable; urgency=medium * Team upload diff -Nru tea4cups-3.13~alpha0+svn3565/debian/control tea4cups-3.14~alpha0+svn3576/debian/control --- tea4cups-3.13~alpha0+svn3565/debian/control 2018-02-10 16:22:16.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/debian/control 2018-09-03 06:43:28.000000000 +0000 @@ -8,7 +8,7 @@ python, subversion, svn2cl | subversion-tools (<< 1.7.5) -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/printing-team/tea4cups Vcs-Git: https://salsa.debian.org/printing-team/tea4cups.git Homepage: http://www.pykota.com/software/tea4cups diff -Nru tea4cups-3.13~alpha0+svn3565/debian/copyright tea4cups-3.14~alpha0+svn3576/debian/copyright --- tea4cups-3.13~alpha0+svn3565/debian/copyright 2018-02-10 16:22:16.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/debian/copyright 2018-09-03 06:43:28.000000000 +0000 @@ -1,10 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Tea4CUPS Upstream-Contact: Jerome Alet Source: http://www.pykota.com/software/tea4cups/download Files: * -Copyright: 2005-2013, Jerome Alet +Copyright: 2005-2018, Jerome Alet 2005 Peter Stuge License: GPL-2+ diff -Nru tea4cups-3.13~alpha0+svn3565/debian/.git-dpm tea4cups-3.14~alpha0+svn3576/debian/.git-dpm --- tea4cups-3.13~alpha0+svn3565/debian/.git-dpm 2018-02-10 16:22:17.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/debian/.git-dpm 2018-09-03 06:43:28.000000000 +0000 @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -c6a3ee76e9385058742545684bda2edc3d92ded5 -c6a3ee76e9385058742545684bda2edc3d92ded5 -4eb2c6ec36bbe8a941ee8882ce227830a2a9a427 -4eb2c6ec36bbe8a941ee8882ce227830a2a9a427 -tea4cups_3.13~alpha0+svn3565.orig.tar.xz -30daec79a75854a06e6d2d6d5ea87803985f2161 -24880 +1de58f35e626835fb37ce64e1bc38383735a43e0 +1de58f35e626835fb37ce64e1bc38383735a43e0 +0edeef60965b54aa3640ee129619f53d25b0c5e8 +0edeef60965b54aa3640ee129619f53d25b0c5e8 +tea4cups_3.14~alpha0+svn3576.orig.tar.xz +cb2d92d42e814140755ec699a43c0050762de566 +24984 diff -Nru tea4cups-3.13~alpha0+svn3565/debian/patches/0001-Disable-debug-mode-in-tea4cups.conf.patch tea4cups-3.14~alpha0+svn3576/debian/patches/0001-Disable-debug-mode-in-tea4cups.conf.patch --- tea4cups-3.13~alpha0+svn3565/debian/patches/0001-Disable-debug-mode-in-tea4cups.conf.patch 2018-02-10 16:22:17.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/debian/patches/0001-Disable-debug-mode-in-tea4cups.conf.patch 2018-09-03 06:43:28.000000000 +0000 @@ -1,4 +1,4 @@ -From c6a3ee76e9385058742545684bda2edc3d92ded5 Mon Sep 17 00:00:00 2001 +From 1de58f35e626835fb37ce64e1bc38383735a43e0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 10 Feb 2018 17:22:16 +0100 Subject: Disable debug mode in tea4cups.conf @@ -8,7 +8,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tea4cups.conf b/tea4cups.conf -index e4a80d1..1ead197 100644 +index 8e29980..ab7f5b7 100644 --- a/tea4cups.conf +++ b/tea4cups.conf @@ -29,7 +29,7 @@ diff -Nru tea4cups-3.13~alpha0+svn3565/debian/rules tea4cups-3.14~alpha0+svn3576/debian/rules --- tea4cups-3.13~alpha0+svn3565/debian/rules 2018-02-10 16:22:16.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/debian/rules 2018-09-03 06:43:28.000000000 +0000 @@ -26,5 +26,5 @@ || $(RM) -r $(PKG)-$(VER) @echo "# Packing..." find -L $(PKG)-$(VER) -xdev -type f -print | sort \ - | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \ + | XZ_OPT="-6v" tar -caf "../$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \ && $(RM) -r "$(PKG)-$(VER)" diff -Nru tea4cups-3.13~alpha0+svn3565/NEWS tea4cups-3.14~alpha0+svn3576/NEWS --- tea4cups-3.13~alpha0+svn3565/NEWS 2013-01-04 22:51:15.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/NEWS 2018-08-23 00:29:57.000000000 +0000 @@ -1,8 +1,8 @@ -# $Id: NEWS 3565 2013-01-04 22:51:15Z jerome $ +# $Id: NEWS 3576 2018-08-23 00:29:57Z jerome $ Tea4CUPS : Tee for CUPS -(c) 2005-2013 Jerome Alet +(c) 2005-2018 Jerome Alet (c) 2005 Peter Stuge 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 @@ -22,6 +22,10 @@ Tea4CUPS News : + * 3.14alpha (2018-08-23) : + + - Fixes a problem where the job billing attribute sometimes is an integer. + * 3.13alpha (2006-11-07) : - Backported locking mechanism from PyKota. diff -Nru tea4cups-3.13~alpha0+svn3565/README tea4cups-3.14~alpha0+svn3576/README --- tea4cups-3.13~alpha0+svn3565/README 2013-01-04 21:51:19.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/README 2018-08-23 00:29:57.000000000 +0000 @@ -1,8 +1,8 @@ -# $Id: README 3559 2013-01-04 21:51:19Z jerome $ +# $Id: README 3576 2018-08-23 00:29:57Z jerome $ Tea4CUPS : Tee for CUPS -(c) 2005-2013 Jerome Alet +(c) 2005-2018 Jerome Alet (c) 2005 Peter Stuge 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 diff -Nru tea4cups-3.13~alpha0+svn3565/tea4cups tea4cups-3.14~alpha0+svn3576/tea4cups --- tea4cups-3.13~alpha0+svn3565/tea4cups 2013-01-04 22:51:15.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/tea4cups 2018-08-23 00:18:54.000000000 +0000 @@ -3,7 +3,7 @@ # Tea4CUPS : Tee for CUPS # -# (c) 2005-2013 Jerome Alet +# (c) 2005-2018 Jerome Alet # (c) 2005 Peter Stuge # 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 @@ -19,7 +19,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $Id: tea4cups 3565 2013-01-04 22:51:15Z jerome $ +# $Id: tea4cups 3575 2018-08-23 00:18:54Z jerome $ # # @@ -28,7 +28,7 @@ Licensing terms : - (c) 2005-2010 Jerome Alet + (c) 2005-2018 Jerome Alet (c) 2005 Peter Stuge 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 @@ -87,7 +87,7 @@ import urllib2 from struct import pack, unpack -__version__ = "3.13alpha_unofficial" +__version__ = "3.14alpha_unofficial" class TeeError(Exception): """Base exception for Tea4CUPS related stuff.""" @@ -1167,6 +1167,10 @@ if type(jbing) == type([]) : jbing = jbing[-1] (dummy, self.JobBilling) = jbing + try : + self.JobBilling = str(self.JobBilling) # In some cases it seems to be an integer : bug in pkipplib or something else ??? + except : + pass def parseIPPRequestFile(self) : """Parses the IPP message file and returns a tuple (filename, parsedvalue).""" diff -Nru tea4cups-3.13~alpha0+svn3565/tea4cups.conf tea4cups-3.14~alpha0+svn3576/tea4cups.conf --- tea4cups-3.13~alpha0+svn3565/tea4cups.conf 2013-01-04 22:51:15.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/tea4cups.conf 2018-08-23 00:29:57.000000000 +0000 @@ -1,8 +1,8 @@ -# $Id: tea4cups.conf 3565 2013-01-04 22:51:15Z jerome $ +# $Id: tea4cups.conf 3576 2018-08-23 00:29:57Z jerome $ # # Tea4CUPS : Tee for CUPS # -# (c) 2005-2013 Jerome Alet +# (c) 2005-2018 Jerome Alet # (c) 2005 Peter Stuge # 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 diff -Nru tea4cups-3.13~alpha0+svn3565/TODO tea4cups-3.14~alpha0+svn3576/TODO --- tea4cups-3.13~alpha0+svn3565/TODO 2013-01-04 22:51:15.000000000 +0000 +++ tea4cups-3.14~alpha0+svn3576/TODO 2018-08-23 00:29:57.000000000 +0000 @@ -1,8 +1,8 @@ -# $Id: TODO 3565 2013-01-04 22:51:15Z jerome $ +# $Id: TODO 3576 2018-08-23 00:29:57Z jerome $ Tea4CUPS : Tee for CUPS -(c) 2005-2013 Jerome Alet +(c) 2005-2018 Jerome Alet (c) 2005 Peter Stuge 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