New maintainerdebian/4.0.17-4

8 files changed, 286 insertions, 42 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..527834c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.c
+*.h
+build/*
+Makefile
+.valencia
+.pc
+.bzr
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 7a73c88..435405d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+foomatic-filters (4.0.17-4) unstable; urgency=medium
+
+  * pdf.h
+    - decl. of print_pdf 
+      change startpos from int to size_t ( Closes: #749637 )
+  * new debian/source/option
+    - compression to xz and level to 9
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Thu, 29 May 2014 10:14:37 +0200
+
+foomatic-filters (4.0.17-3) unstable; urgency=medium
+
+  * convert debian/copyright to 1.0
+  * Add upstream changelog
+  * Add patch 0001-spelling-errors.diff
+      - spelling in manpage
+      - spelling in sources
+  * Bump Standards-Version to 3.9.5
+  * New Maintainer (Closes: #746381)
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 06 May 2014 10:49:00 +0200
+
 foomatic-filters (4.0.17-2) unstable; urgency=medium
 
   [ Till Kamppeter ]
diff --git a/debian/control b/debian/control
index c560d32..8fff273 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,18 @@
 Source: foomatic-filters
 Section: text
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 9~), po-debconf, perl, libcups2-dev, pkg-config, libdbus-1-dev
+Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Build-Depends: 
+ debhelper (>= 9), 
+ libcups2-dev,
+ libdbus-1-dev,
+ perl, 
+ pkg-config, 
+ po-debconf 
 Homepage: http://www.openprinting.org/
-Vcs-Git: git://git.debian.org/collab-maint/foomatic-filters.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/foomatic-filters.git
-Standards-Version: 3.9.3.0
+Vcs-Git: git://anonscm.debian.org/collab-maint/foomatic-filters.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/foomatic-filters.git
+Standards-Version: 3.9.5
 
 Package: foomatic-filters
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 1079728..cdea61b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,46 +1,77 @@
-This package was debianized by Chris Lawrence <lawrencc@debian.org> on
-Sun, 13 Apr 2003 20:44:09 -0500.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: foomatic-filters
+Upstream-Contact:  Mailinglist <printing-foomatic@lists.linux-foundation.org>
+Source: http://www.openprinting.org/download/foomatic/
 
-It was downloaded from http://www.openprinting.org/download/foomatic/
+Files: test/tcm.sh
+       test/tetapi.sh
+Copyright: 1990 X/Open Company Limited (X/Open)
+           1996 X/Open Company Limited / owners
+           1990 Unix International (UI)
+           1990 Open Software Foundation (OSF)]
+License: MIT
 
-Upstream Authors:
-  Original founder: Grant Taylor <gtaylor@picante.com>
-  Current maintainer: Till Kamppeter <till.kamppeter@gmail.com>
+License: MIT
+ All rights reserved.  No part of this source code may be reproduced,
+ stored in a retrieval system, or transmitted, in any form or by any
+ means, electronic, mechanical, photocopying, recording or otherwise,
+ except as stated in the end-user licence agreement, without the prior
+ permission of the copyright owners.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of OSF, UI or X/Open not be used in 
+ advertising or publicity pertaining to distribution of the software 
+ without specific, written prior permission.  OSF, UI and X/Open make 
+ no representations about the suitability of this software for any purpose.  
+ It is provided "as is" without express or implied warranty.
+ .
+ OSF, UI and X/Open DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO 
+ EVENT SHALL OSF, UI or X/Open BE LIABLE FOR ANY SPECIAL, INDIRECT OR 
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF 
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR 
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
+ PERFORMANCE OF THIS SOFTWARE.
 
-Copyright:
 
-  test/tcm.sh
-  test/tetapi.sh
-    Copyright: 1990 X/Open Company Limited (X/Open)
-    Copyright: 1996 X/Open Company Limited / owners
-    Copyright: 1990 Unix International (UI)
-    Copyright: 1990 Open Software Foundation (OSF)]
+Files: *
+Copyright: 2008 Till Kamppeter <till.kamppeter@gmail.com>
+           2008 Lars Uebernickel <larsuebernickel@gmx.de>
+License: GPL-2.0+
 
-  test/shfuncs.sh
-  test/lsbfuncs.sh
-    Copyright: 1998-2001 The Open Group / owners
-  
-  All other files are: 
-    Copyright: 2008 Till Kamppeter <till.kamppeter@gmail.com>
-    Copyright: 2008 Lars Uebernickel <larsuebernickel@gmx.de>
+Files: test/shfuncs.sh
+       test/lsbfuncs.sh
+Copyright: 1998-2001 The Open Group / owners
+License: GPL-2.0+
 
+Files: debian/*
+Copyright: 2003 Chris Lawrence <lawrencc@debian.org> 
+           2014 Jörg Frings-Fürst <debian@jff-webhosting.net>
+License: GPL-2.0+
 
-License:
+License: GPL-2.0+
+ 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'.
 
-   Foomatic-rip 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.
 
-   Foomatic-rip 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 Lesser General Public
-   License along with this library; if not, write to the
-   Free Software 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-2'.
diff --git a/debian/patches/0001-spelling-errors.diff b/debian/patches/0001-spelling-errors.diff
new file mode 100644
index 0000000..23f0e30
--- /dev/null
+++ b/debian/patches/0001-spelling-errors.diff
@@ -0,0 +1,153 @@
+Description: some typo in sources and manpage
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Reviewed-by: 
+Last-Update: 2014-05-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: foomatic-filters-4.0.17/foomaticrip.c
+===================================================================
+--- foomatic-filters-4.0.17.orig/foomaticrip.c	2014-05-04 22:52:54.590181105 +0200
++++ foomatic-filters-4.0.17/foomaticrip.c	2014-05-04 22:52:54.586181022 +0200
+@@ -1633,7 +1633,7 @@
+         dstrcpy(postpipe, "| cat - > $LPDDEV");
+ 
+     if (postpipe->len)
+-        _log("Ouput will be redirected to:\n%s\n", postpipe);
++        _log("Output will be redirected to:\n%s\n", postpipe);
+ 
+ 
+     /* Print documentation page when asked for */
+Index: foomatic-filters-4.0.17/foomatic-rip.1.in
+===================================================================
+--- foomatic-filters-4.0.17.orig/foomatic-rip.1.in	2014-05-04 22:52:54.590181105 +0200
++++ foomatic-filters-4.0.17/foomatic-rip.1.in	2014-05-04 22:54:02.235583784 +0200
+@@ -18,69 +18,82 @@
+ .BI \fBfoomatic-rip\fR\ \fI<jobid>\fR \ \fI<user>\fR \ \fI<jobtitle>\fR \ \fI<numcopies>\fR \ \fI<options>\fR \ \fB[\fI<file>\fB]\fR 
+ 
+ .SS \fRLPRng filter:
+-.BI \fBfoomatic-rip\fR\ --lprng\  \fB[\fB-J\fI<jobtitle>\fB]\fR   \fB[\fB-Z\fI<option>\fB=\fI<value>\fB[,\fI<option>\fB=\fI<value>\fB[, \ \fB...]]\fR \ \fI<ppdfile>\fR
++.BI \fBfoomatic-rip\fR\ --lprng\  \fB[\fB-J\fI<jobtitle>\fB]\fR \ 
++\fB[\fB-Z\fI<option>\fB=\fI<value>\ 
++\fB[,\fI<option>\fB=\fI<value>\fB \ 
++\ [, \ \fB...]]\fR \ \fI<ppdfile>\fR
+ .br
+ 
+-.BI \fBfoomatic-rip\fR\ \ \fB[\fB-J\fI<jobtitle>\fB]\fR   \fB[\fB-Z\fI<option>\fB=\fI<value>\fB[,\fI<option>\fB=\fI<value>\fB[, \ \fB...]]\fR
++.BI \fBfoomatic-rip\fR\ \ \fB[\fB-J\fI<jobtitle>\fB]\fR   
++\fB[\fB-Z\fI<option>\fB=\fI<value>
++\fB[,\fI<option>\fB=\fI<value>\fB[, \ \fB...]]\fR
+ .br
+ (printcap :pdd=<ppdfile>)
+ 
+-.BI \fBfoomatic-rip\fR\ \fB--ppd\fR \ \fI<ppdfile>\fR   \fB[\fB-J\fI<jobtitle>\fB]\fR \ \fB[\fB-Z\fI<option>\fB=\fI<value>\fB[,\fI<option>\fB=\fI<value>\fB[, \ \fB...]]\fR
++.BI \fBfoomatic-rip\fR\ \fB--ppd\fR \ \fI<ppdfile>\fR   \fB[\fB-J\fI<jobtitle>\fB]\fR 
++\fB[\fB-Z\fI<option>\fB=\fI<value> 
++\fB[,\fI<option>\fB=\fI<value>\fB[, \ \fB...]]\fR
+ 
+ .SS \fRLPD/GNUlpr filter:
+-.BI \fBfoomatic-rip\fR\ \fB[\fB-w\fR\ \fI<number>\fB]\fR\ \fB[\fB-l\fR\ \fI<number>\fB]\fR\ \fB[\fB-x\fR\ \fI<number>\fB]\fR\ \fB[\fB-y\fR\ \fI<number>\fB]\fR\ \fB[\fB-i\fR\ \fI<number>\fB]\fR\ \fB[\fB-c\fB]\fR\ \fB[\fB-n\fR\ \fI<string>\fB]\fR\ \fB[\fB-h\fR\ \fI<string>\fB]\fR\ \fB[\fB-j|-J\fR\ \fI<jobtitle>\fB|\fI<options>\fB]\fR\ \fI<ppdfile>\fR
++.BI \fBfoomatic-rip\fR\ \fB[\fB-w\fR\ \fI<number>\fB]\fR\ \fB[\fB-l\fR\ \fI<number>\fB]\fR\ 
++\fB[\fB-x\fR\ \fI<number>\fB]\fR\ \fB[\fB-y\fR\ \fI<number>\fB]\fR\ 
++\fB[\fB-i\fR\ \fI<number>\fB]\fR\ \fB[\fB-c\fB]\fR\ \fB[\fB-n\fR\ \fI<string>\fB]\fR\ 
++\fB[\fB-h\fR\ \fI<string>\fB]\fR\ \fB[\fB-j|-J\fR\ \fI<jobtitle>\fB|\fI<options>\fB]\fR\ \fI<ppdfile>\fR
+ 
+ .SS \fRPPR RIP:
+ .BI \fBfoomatic-rip\fR\ \fB[\fI<option>\fB=\fI<value>\fR \ [...]]
+ 
+ .SS \fRPPR interface:
+-.BI \fBfoomatic-rip\fR\ \fI<queue>\fR \ \fI<destaddress>\fR \ \fI<options>\fR \ \fI<jobbreak>\fR \ \fI<feedback>\fR \ \fI<codes>\fR \ \fI<jobname>\fR \ \fI<routing>\fR \ \fI<for>\fR \ \fI<filetype>\fR \ \fB[\fI<file>\fB]\fR 
++.BI \fBfoomatic-rip\fR\ \fI<queue>\fR \ \fI<destaddress>\fR \ \fI<options>\fR \ \fI<jobbreak>\fR \ 
++\fI<feedback>\fR \ \fI<codes>\fR \ \fI<jobname>\fR \ \fI<routing>\fR \ \fI<for>\fR \ \fI<filetype>\fR \ \fB[\fI<file>\fB]\fR 
+ 
+ .SS \fRPDQ driver file generation:
+-.BI foomatic-rip\ \fB[\fB--ppd\fR \ \fI<ppdfile>\fB]\fR \ [\fB-o\fR \ \fI<option>\fB=\fI<value>\fR \ [...]] \ \fB--genpdq|--appendpdq|--genrawpdq|--appendrawpdq\fR
++.BI foomatic-rip\ \fB[\fB--ppd\fR \ \fI<ppdfile>\fB]\fR \ [\fB-o\fR \ 
++\fI<option>\fB=\fI<value>\fR \ [...]] \ \fB--genpdq|--appendpdq|--genrawpdq|--appendrawpdq\fR
+ 
+ .SS \fRPDQ filter:
+ .BI foomatic-rip\ \fB--pdq\fR\ \fB--ppd\fR \ \fI<ppdfile>\fR \fB]\fR \ [\fB-o\fR \ \fI<option>\fB=\fI<value>\fR \ [...]] \ \fI<file>\fR
+ 
+ .SS \fRCPS (newer versions) filter:
+-.BI \fBfoomatic-rip\fR\ \fB--cps\fR\ \fB-P\fR \ \fI<printer>\fR \ [\fB-J\fR\ \fI<jobtitle>\fR ] \ [\fB-o\fR \ \fI<option>\fB=\fI<value>\fR \ [...]] \ \fB[\fI<files>\fB]\fR
++.BI \fBfoomatic-rip\fR\ \fB--cps\fR\ \fB-P\fR \ \fI<printer>\fR \ 
++[\fB-J\fR\ \fI<jobtitle>\fR ] \ [\fB-o\fR \ \fI<option>\fB=\fI<value>\fR \ [...]] \ \fB[\fI<files>\fB]\fR
+ 
+ .SH DESCRIPTION
+ foomatic-rip is a universal print filter which works with every known free
+ software printer spooler. It has the following features:
+ 
+-.Topic 
++.P 
+ It translates PostScript and PDF (and also other file formats) from standard
+ input to the printer's native language (usually put to standard
+ output).
+ 
+-.Topic
++.P
+ The translation is done with an external renderer, usually Ghostscript
+ (\fBgs(1)\fR). If no translation is needed (PostScript printer) the
+ renderer's command line reduces to \fBcat(1)\fR. The way how this
+ translation is done is described in a \fBPPD file\fR.
+ 
+-.Topic
++.P
+ Printer capabilities, how to handle user options, and how to build the
+ renderer command line is always described by \fBPPD files\fR, these
+ PPD files usually come from \fBFoomatic\fR or can be the ones supplied by
+ the manufacturers of PostScript printers. The PPD files are the same
+ for all spoolers.
+ 
+-.Topic
++.P
+ foomatic-rip works with every known spooler (\fBCUPS\fR, \fBLPRng\fR,
+ \fBLPD\fR, \fBGNUlpr\fR, \fBPPR\fR, \fBPDQ\fR, \fBCPS\fR, and
+ \fBwithout spooler\fR). It auto-detects the spooler from which it was
+ called by the command line options and environment variables which
+ were supplied by the spooler.
+ 
+-.Topic
++.P
+ Non-PostScript/PDF files are translated to PostScript before they are
+ passed to the renderer. This is usually done by \fBa2ps(1)\fR,
+ \fBenscript(1)\fR, or \fBmpage(1)\fR. foomatic-rip auto-detects which
+ program is installed, but manual configuration is also possible.
+ 
+-.Topic
++.P
+ foomatic-rip does not only apply option settings supplied by the user
+ through the command line of the printing command, but also searches
+ the entire job for embedded option settings (only PostScript
+@@ -133,7 +146,7 @@
+ \fBfoomatic-rip\fR will print from standard input unless at least one file to
+ be printed is specified on the command line.
+ If your printer PPD file is stored as \fI@sysconfdir@/direct/<printer>.ppd\fR
+-or \fI~/.foomatic/direct/<printer>.ppd\fR you can use it by simply specifying "-P \fI<printer>\fR".
++or \fI~/.foomatic/direct/<printer>.ppd\fR you can use it by simply specifying "\-P \fI<printer>\fR".
+ 
+ Put a line
+ 
+@@ -146,7 +159,7 @@
+ \fB"\fR are not allowed in the \fI<command>\fR, replace them as
+ follows:
+ 
+-.CodeSkip
++.P
+ .nf
+ .B Character	Replacement
+ .B ---------------------
+@@ -173,12 +186,12 @@
+ for a TCP/Socket/JetDirect printer with the host name \fBprinter\fR
+ listening on port \fB9100\fR you need this:
+ 
+-\fB*FoomaticRIPPostPipe: "| /usr/bin/nc -w 1 printer 9100"\fR
++\fB*FoomaticRIPPostPipe: "| /usr/bin/nc \-w 1 printer 9100"\fR
+ 
+-Note the "-w 1" in the "nc" command line, it makes "nc" exiting
++Note the "\-w 1" in the "nc" command line, it makes "nc" exiting
+ immediately after the data is transferred to the printer.
+ 
+-\fB*FoomaticRIPPostPipe: "| rlpr -Plp@printserver"\fR
++\fB*FoomaticRIPPostPipe: "| rlpr \-Plp@printserver"\fR
+ 
+ directs your jobs to the LPD printer queue \fBlp\fR on the machine
+ named \fBprintserver\fR.
diff --git a/debian/patches/0002-pdf_header.patch b/debian/patches/0002-pdf_header.patch
new file mode 100644
index 0000000..104dc0b
--- /dev/null
+++ b/debian/patches/0002-pdf_header.patch
@@ -0,0 +1,21 @@
+Description: wrong type in header
+ <long description that can span multiple lines, optional>
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749637
+Forwarded: yes via ml
+Last-Update: 2014-05-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/pdf.h
+===================================================================
+--- trunk.orig/pdf.h	2012-07-02 16:50:46.000000000 +0200
++++ trunk/pdf.h	2014-05-29 10:18:49.263943792 +0200
+@@ -24,7 +24,7 @@
+ #ifndef pdf_h
+ #define pdf_h
+ 
+-int print_pdf(FILE *s, const char *alreadyread, size_t len, const char *filename, int startpos);
++int print_pdf(FILE *s, const char *alreadyread, size_t len, const char *filename, size_t startpos);
+ 
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d4a5c6d..2ea9c4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+0002-pdf_header.patch
+0001-spelling-errors.diff
 fixed-segfault-when-creating-logfile.patch
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..22a4de9
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = xz
+compression-level = 9