Merge branch 'release/debian/4.0.17-11'debian/4.0.17-11

6 files changed, 46 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index 7276d49..f0b37d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+foomatic-filters (4.0.17-11) unstable; urgency=medium
+
+  * debian/changelog:
+    - Remove trailing whitespaces.
+  * debian/control:
+    - Change to my new email address.
+    - Change VCS-* to point to the new repository.
+  * debian/copyright:
+    - Change to my new email address.
+    - Use secure URI.
+    - Add year 2018 to me.
+  * debian/rules:
+    - Remove trailing whitespaces.
+  * debian/watch:
+    - Use secure URI.
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - Bump minimum debhelper version in debian/control to >= 11.
+  * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 03 Oct 2018 17:49:16 +0200
+
 foomatic-filters (4.0.17-10) unstable; urgency=medium
 
   * New README.source to explain the branching model used.
@@ -89,7 +111,7 @@ foomatic-filters (4.0.17-5) unstable; urgency=medium
 foomatic-filters (4.0.17-4) unstable; urgency=medium
 
   * pdf.h
-    - decl. of print_pdf 
+    - decl. of print_pdf
       change startpos from int to size_t ( Closes: #749637 )
   * new debian/source/option
     - compression to xz and level to 9
@@ -651,10 +673,10 @@ foomatic-filters (4.0.0-0ubuntu9) jaunty; urgency=low
 
   * debian/patches/23_prioritize-ppd-options-over-cups-options-on-command-line-fix-custom-options.patch:
     If there are printing system options (like "media" of CUPS) and PPD
-    options (like "PageSize") on the command line and they do the same thing 
+    options (like "PageSize") on the command line and they do the same thing
     (like choosing the paper size) let the setting of the PPD option always
     have priority, as this is expected for a CUPS filter (see CUPS STR #3148).
-    This is done by treating the printing system options before the PPD 
+    This is done by treating the printing system options before the PPD
     options (LP: #338999).
     Custom page sizes were not accepted if one of the three parameters
     "WidthOffset", "HeightOffset", or "Orientation" of the "PageSize" option
@@ -733,7 +755,7 @@ foomatic-filters (4.0.0-0ubuntu1) jaunty; urgency=low
        PostScript (LP: #299918)
      - Made merging of PJL options of the PPD and of the driver correctly
        working.
-     - Corrected the insertion of the "%%PageSetup" sections. 
+     - Corrected the insertion of the "%%PageSetup" sections.
      - Inserted PostScript option settings from pstops were not corrected
        with custom option settings done on the command line (numerical,
        string, password).
@@ -840,11 +862,11 @@ foomatic-filters (4.0.0~bzr158-0ubuntu1) intrepid; urgency=low
      - Conversion of PDF to PostScript in the case that the driver does not
        support PDF input did not work due to a bug in handling the
        subprocesses (Upstream bug #153).
-     - foomatic-rip inserted the -sOutputFile GhostScript command line 
+     - foomatic-rip inserted the -sOutputFile GhostScript command line
        argument at the wrong position when printing a PDF file (not from
        stdin), which made Ghostscript crashing.
      - Option settings can be given in the PPD file before the option is
-       "declared", which led foomatic-rip to think that there are 
+       "declared", which led foomatic-rip to think that there are
        PostScript options (the default) in the PPD and the driver could not
        understand PDF input. Now, foomatic-rip checks for PostScript
        options after the whole PPD has been read (Upstream bug #154).
@@ -888,8 +910,8 @@ foomatic-filters (4.0.0~bzr148-0ubuntu1) intrepid; urgency=low
        valid according to the PPD spec, and is used by some HP PPDs.
      - Allow choice names starting with "From". Even if they do not
        point to a valid composite option.
-     - Parse more complex command lines correctly when looking for 
-       the "gs" executable to optimize Ghostscript command lines 
+     - Parse more complex command lines correctly when looking for
+       the "gs" executable to optimize Ghostscript command lines
        for the needs of foomatic-rip.
 
  -- Till Kamppeter <till.kamppeter@gmail.com>  Tue, 24 Jun 2008 08:25:55 +0200
@@ -1023,7 +1045,7 @@ foomatic-filters (3.0.2-20080211-1) unstable; urgency=low
     - vi (Closes: #427022, #446892)
   * Remove debconf handling of Ghostscript interpreter; no longer
     necessary due to end of gs-* packages.  (Closes: #447086)
-  
+
  -- Chris Lawrence <lawrencc@debian.org>  Thu, 21 Feb 2008 14:17:18 -0600
 
 foomatic-filters (3.0.2-20071204-0ubuntu2) hardy; urgency=low
@@ -1061,9 +1083,9 @@ foomatic-filters (3.0.2-20071204-0ubuntu1) hardy; urgency=low
          "-o sides={one|two}-sided[-{long|short}-edge]" was supplied,
          the "Duplex" option could be set to "0", "LongEdge", or
          "ShortEdge", which do not exist in the "Duplex" options in
-         PPD files (Thanks to Ricoh Japan for reporting this bug). 
-       o Now all of "LongEdge", "DuplexNoTumble", or "ShortEdge", 
-         "DuplexTumble", are converted to each other if supplied as 
+         PPD files (Thanks to Ricoh Japan for reporting this bug).
+       o Now all of "LongEdge", "DuplexNoTumble", or "ShortEdge",
+         "DuplexTumble", are converted to each other if supplied as
          value to an enumerated choice option (usually "Duplex") and
          this value is not in the list of choices.
        o Reset the best score for finding the narrowest page range
@@ -1074,12 +1096,12 @@ foomatic-filters (3.0.2-20071204-0ubuntu1) hardy; urgency=low
          numerical, string) in the PPD file, the first choice from
          the list was set as default and not "0".
        o When assigning a non-integer number to an integer option,
-         the "%%BeginFeature: ..." line of the option inserted into 
+         the "%%BeginFeature: ..." line of the option inserted into
          the PostScript data stream still contained the non-integer
          value. Only the value in the code piece was converted to
          integer.
        o If a non-integer "*FoomaticRIPDefault..." was given for an
-         integer option it was not converted to integer. 
+         integer option it was not converted to integer.
        o Boolean options had "0" and "1" as values in the
          "%%BeginFeature: ..." lines and not "False" and "True".
        o PPD-supplied JCL/PJL options did not get merged with
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 4b08396..a531461 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,19 @@
 Source: foomatic-filters
 Section: text
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  autoconf,
- debhelper (>= 10),
+ debhelper (>= 11),
  libcups2-dev,
  libdbus-1-dev,
  perl,
  pkg-config,
  po-debconf
 Homepage: https://wiki.linuxfoundation.org/openprinting/start
-Vcs-Git: git://anonscm.debian.org/collab-maint/foomatic-filters.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/foomatic-filters.git
-Standards-Version: 4.1.0
+Vcs-Git: git://jff.email/opt/git/foomatic-filters.git
+Vcs-Browser: https://jff.email/cgit/foomatic-filters.git
+Standards-Version: 4.2.1
 
 Package: foomatic-filters
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index d4f49f2..06cebfe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-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: foomatic-filters
 Upstream-Contact:  Mailinglist <printing-foomatic@lists.linux-foundation.org>
-Source: http://www.openprinting.org/download/foomatic/
+Source: https://www.openprinting.org/download/foomatic/
 
 Files: *
 Copyright: 2008-2015 Till Kamppeter <till.kamppeter@gmail.com>
@@ -23,7 +23,7 @@ License: GPL-2.0+
 
 Files: debian/*
 Copyright: 2003      Chris Lawrence <lawrencc@debian.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2.0+
 
 License: GPL-2.0+
diff --git a/debian/rules b/debian/rules
index f94a633..1a5c24d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,5 +37,3 @@ override_dh_clean:
 override_dh_perl:
 	# Perl scripts from this package don't use any perl modules, so call dh_perl with "-d" to avoid the unnecessary perl dependency
 	dh_perl -d
-
-
diff --git a/debian/watch b/debian/watch
index 7ce5d1e..535c7fb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-http://www.openprinting.org/download/foomatic/foomatic-filters-([\d\.]+)\.tar\.gz
+https://www.openprinting.org/download/foomatic/foomatic-filters-([\d\.]+)\.tar\.gz