Merge branch 'debian/master' into debian/experimental

2 files changed, 62 insertions, 52 deletions

diff --git a/debian/changelog b/debian/changelog
index 071ceeb..3338b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,16 @@ gutenprint (5.3.0~pre1-1) experimental; urgency=medium
 
  -- Didier Raboud <odyx@debian.org>  Tue, 07 Nov 2017 14:16:06 +0100
 
+gutenprint (5.2.13-2) unstable; urgency=medium
+
+  * Fix debian/watch to match better on the available versions
+  * Update debian/control syntax with cme
+  * Bump Standards-Version to 4.1.3 without changes needed
+  * Update Vcs-* fields for the move to salsa.d.o
+  * Drop source/local-options
+
+ -- Didier Raboud <odyx@debian.org>  Sat, 10 Feb 2018 15:36:20 +0100
+
 gutenprint (5.2.13-1) unstable; urgency=medium
 
   * New upstream version 5.2.13
diff --git a/debian/control b/debian/control
index 1556542..4d09882 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,34 @@
 Source: gutenprint
-Homepage: http://gimp-print.sourceforge.net/
-Section: graphics
-Priority: optional
 Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
 Uploaders: Didier Raboud <odyx@debian.org>
-Standards-Version: 4.1.1
-Build-Depends:
- debhelper (>= 10.2.5~),
- libcups2-dev,
- libcupsimage2-dev,
- libgimp2.0-dev,
- libreadline-dev,
- libijs-dev,
- libusb-1.0-0-dev [linux-any],
- zlib1g-dev,
- flex,
- gettext,
- chrpath,
-Vcs-Browser: https://anonscm.debian.org/cgit/printing/gutenprint.git
-Vcs-Git: https://alioth.debian.org/anonscm/git/printing/gutenprint.git
+Section: graphics
+Testsuite: autopkgtest
+Priority: optional
+Build-Depends: debhelper (>= 10.2.5~),
+               dh-autoreconf,
+               autotools-dev,
+               libcups2-dev,
+               libcupsimage2-dev,
+               libgimp2.0-dev,
+               libreadline-dev,
+               libijs-dev,
+               libusb-1.0-0-dev [linux-any],
+               zlib1g-dev,
+               flex,
+               gettext,
+               chrpath
+Standards-Version: 4.1.3
+Vcs-Browser: https://salsa.debian.org/printing-team/gutenprint
+Vcs-Git: https://salsa.debian.org/printing-team/gutenprint.git
+Homepage: http://gimp-print.sourceforge.net/
 
 Package: gimp-gutenprint
 Architecture: any
-Depends:
- ${misc:Depends}, ${shlibs:Depends},
- gimp (>= 2.4.0~rc1-1)
-Suggests:
- gutenprint-doc (>= ${source:Version}),
- gutenprint-locales (>= ${source:Version})
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         gimp (>= 2.4.0~rc1-1)
+Suggests: gutenprint-doc (>= ${source:Version}),
+          gutenprint-locales (>= ${source:Version})
 Enhances: gimp
 Description: print plugin for the GIMP
  This package includes the Gutenprint Print plugin for the GIMP.
@@ -41,16 +42,14 @@ Description: print plugin for the GIMP
 
 Package: printer-driver-gutenprint
 Architecture: any
-Depends:
- ${misc:Depends},
- ${perl:Depends},
- ${shlibs:Depends},
- cups (>= 1.3.0),
- cups-client (>= 1.3.0),
- cups-filters (>= 1.0.36) | ghostscript-cups (<< 9.08)
-Suggests:
- gutenprint-doc (>= ${source:Version}),
- gutenprint-locales (>= ${source:Version})
+Depends: ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends},
+         cups (>= 1.3.0),
+         cups-client (>= 1.3.0),
+         cups-filters (>= 1.0.36) | ghostscript-cups (<< 9.08)
+Suggests: gutenprint-doc (>= ${source:Version}),
+          gutenprint-locales (>= ${source:Version})
 Description: printer drivers for CUPS
  This package includes a CUPS driver based on Gutenprint.
  .
@@ -71,10 +70,9 @@ Description: printer drivers for CUPS
 Package: libgutenprint-dev
 Architecture: any
 Section: libdevel
-Depends:
- ${misc:Depends},
- libgutenprint9 (= ${binary:Version}),
- pkg-config
+Depends: ${misc:Depends},
+         libgutenprint9 (= ${binary:Version}),
+         pkg-config
 Suggests: libgutenprint-doc (= ${source:Version})
 Description: development files for the Gutenprint printer driver library
  This package contains the header files for the Gutenprint library,
@@ -93,7 +91,8 @@ Description: development files for the Gutenprint printer driver library
 Package: libgutenprint-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, libjs-jquery (>= 1.7.1)
+Depends: ${misc:Depends},
+         libjs-jquery (>= 1.7.1)
 Suggests: libgutenprint-dev (= ${source:Version})
 Description: documentation for the Gutenprint printer driver library
  This package contains lots of info-files, DVI docs and other
@@ -114,7 +113,9 @@ Package: libgutenprint9
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}, libgutenprint-common (>= ${source:Version})
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgutenprint-common (>= ${source:Version})
 Suggests: gutenprint-locales (>= ${source:Version})
 Description: runtime for the Gutenprint printer driver library
  This package includes the Gutenprint shared library, needed to
@@ -147,11 +148,10 @@ Description: support files for the Gutenprint printer driver library
 Package: libgutenprintui2-dev
 Architecture: any
 Section: libdevel
-Depends:
- ${misc:Depends},
- libgutenprintui2-2 (= ${binary:Version}),
- pkg-config
 Pre-Depends: dpkg (>= 1.17.5)
+Depends: ${misc:Depends},
+         libgutenprintui2-2 (= ${binary:Version}),
+         pkg-config
 Suggests: libgutenprint-doc (= ${source:Version})
 Description: development files for the Gutenprint printer driver user interface library
  This package contains the header files for the libgutenprintui
@@ -172,9 +172,10 @@ Description: development files for the Gutenprint printer driver user interface
 Package: libgutenprintui2-2
 Architecture: any
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: gutenprint-locales (>= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: runtime for the Gutenprint printer driver user interface library
  This package includes the libgutenprintui library, necessary to run
  gimp-gutenprint.  libgutenprintui contains GTK+ widgets which may be
@@ -210,8 +211,8 @@ Package: escputil
 Architecture: any
 Section: utils
 Depends: ${misc:Depends},
- ${shlibs:Depends},
- libgutenprint9 (= ${binary:Version}),
+         ${shlibs:Depends},
+         libgutenprint9 (= ${binary:Version})
 Pre-Depends: dpkg (>= 1.17.5)
 Suggests: gutenprint-locales (>= ${source:Version})
 Description: maintenance utility for Epson Stylus printers
@@ -229,10 +230,9 @@ Package: gutenprint-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests:
- printer-driver-gutenprint (>= ${source:Version}),
- gimp-gutenprint (>= ${source:Version}),
- libjs-jquery (>= 1.7.1)
+Suggests: printer-driver-gutenprint (>= ${source:Version}),
+          gimp-gutenprint (>= ${source:Version}),
+          libjs-jquery (>= 1.7.1)
 Description: users' guide for Gutenprint and CUPS
  This package contains a user guide for programs using the
  Gutenprint library for photographic quality printing.  Currently