r52071 - in /packages/experimental/system-config-printer/debian: ./ patches/

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu Feb 23 19:59:14 UTC 2017 

Author: bigon
Date: Thu Feb 23 19:59:14 2017
New Revision: 52071

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52071
Log:
* New upstream release.
  - Drop debian/patches/0008-fix-device-sorting.patch,
    debian/patches/0009-fix-udev-add-printer-shbang.patch: Merged upstream
  - debian/patches/0007-fix-pk-package-name.patch: Refreshed
* Switch to dh sequences from cdbs
* Do not install smburi.py and debug.py in python3-cupshelpers anymore, this
  doesn't seem needed anymore
* Bump debhelper compatibility to version 10
* Drop debian/patches/03_install_layout.patch, this doesn't seem needed
  anymore and adjust debian/python3-cupshelpers.install

Removed:
    packages/experimental/system-config-printer/debian/patches/0008-fix-device-sorting.patch
    packages/experimental/system-config-printer/debian/patches/0009-fix-udev-add-printer-shbang.patch
    packages/experimental/system-config-printer/debian/patches/03_install_layout.patch
Modified:
    packages/experimental/system-config-printer/debian/changelog
    packages/experimental/system-config-printer/debian/compat
    packages/experimental/system-config-printer/debian/control
    packages/experimental/system-config-printer/debian/control.in
    packages/experimental/system-config-printer/debian/patches/0007-fix-pk-package-name.patch
    packages/experimental/system-config-printer/debian/patches/series
    packages/experimental/system-config-printer/debian/python3-cupshelpers.install
    packages/experimental/system-config-printer/debian/rules

Modified: packages/experimental/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/changelog?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/changelog	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/changelog	[utf-8] Thu Feb 23 19:59:14 2017
@@ -1,3 +1,18 @@
+system-config-printer (1.5.9-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Drop debian/patches/0008-fix-device-sorting.patch,
+      debian/patches/0009-fix-udev-add-printer-shbang.patch: Merged upstream
+    - debian/patches/0007-fix-pk-package-name.patch: Refreshed
+  * Switch to dh sequences from cdbs
+  * Do not install smburi.py and debug.py in python3-cupshelpers anymore, this
+    doesn't seem needed anymore
+  * Bump debhelper compatibility to version 10
+  * Drop debian/patches/03_install_layout.patch, this doesn't seem needed
+    anymore and adjust debian/python3-cupshelpers.install
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 23 Feb 2017 20:58:35 +0100
+
 system-config-printer (1.5.7-3) unstable; urgency=medium
 
   * debian/patches/0010-no-start-printer-applet-gnome.patch: Do not start the

Modified: packages/experimental/system-config-printer/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/compat?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/compat	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/compat	[utf-8] Thu Feb 23 19:59:14 2017
@@ -1 +1 @@
-9
+10

Modified: packages/experimental/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/control?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/control	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/control	[utf-8] Thu Feb 23 19:59:14 2017
@@ -7,9 +7,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Shachnev <mitya57 at debian.org>, Laurent Bigonville <bigon at debian.org>, Guido Günther <agx at sigxcpu.org>
-Build-Depends: autotools-dev,
-               cdbs (>= 0.4.90~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
+               dh-python,
                desktop-file-utils (>= 0.13),
                gnome-pkg-tools,
                intltool,

Modified: packages/experimental/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/control.in?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/control.in	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/control.in	[utf-8] Thu Feb 23 19:59:14 2017
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@, Guido Günther <agx at sigxcpu.org>
-Build-Depends: autotools-dev,
-               cdbs (>= 0.4.90~),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
+               dh-python,
                desktop-file-utils (>= 0.13),
                gnome-pkg-tools,
                intltool,

Modified: packages/experimental/system-config-printer/debian/patches/0007-fix-pk-package-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/0007-fix-pk-package-name.patch?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/0007-fix-pk-package-name.patch	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/patches/0007-fix-pk-package-name.patch	[utf-8] Thu Feb 23 19:59:14 2017
@@ -4,12 +4,12 @@
 
 --- a/newprinter.py
 +++ b/newprinter.py
-@@ -1068,7 +1068,7 @@
-                             debugprint ("No smb backend so attempting install")
-                             try:
-                                 pk = installpackage.PackageKit ()
--                                pk.InstallPackageName (0, 0, "samba-client")
-+                                pk.InstallPackageName (0, 0, "smbclient")
-                             except:
-                                 nonfatalException ()
+@@ -1420,7 +1420,7 @@ class NewPrinterGUI(GtkGUI):
+             try:
+                 pk = installpackage.PackageKit ()
+                 # The following call means a blocking, synchronous, D-Bus call
+-                pk.InstallPackageName (0, 0, "samba-client")
++                pk.InstallPackageName (0, 0, "smbclient")
+             except:
+                 nonfatalException ()
  

Modified: packages/experimental/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/patches/series?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/patches/series	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/patches/series	[utf-8] Thu Feb 23 19:59:14 2017
@@ -1,6 +1,3 @@
-03_install_layout.patch
 0006-use-paper-size-default-in-etc-papersize.patch
 0007-fix-pk-package-name.patch
-0008-fix-device-sorting.patch
-0009-fix-udev-add-printer-shbang.patch
 0010-no-start-printer-applet-gnome.patch

Modified: packages/experimental/system-config-printer/debian/python3-cupshelpers.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/python3-cupshelpers.install?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/python3-cupshelpers.install	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/python3-cupshelpers.install	[utf-8] Thu Feb 23 19:59:14 2017
@@ -1,3 +1,3 @@
 etc/cupshelpers/
-usr/lib/python3/dist-packages/cupshelpers
-usr/lib/python3/dist-packages/cupshelpers-1.0.egg-info
+usr/lib/python3*/*-packages/cupshelpers
+usr/lib/python3*/*-packages/cupshelpers-1.0-*.egg-info

Modified: packages/experimental/system-config-printer/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/system-config-printer/debian/rules?rev=52071&op=diff
==============================================================================
--- packages/experimental/system-config-printer/debian/rules	[utf-8] (original)
+++ packages/experimental/system-config-printer/debian/rules	[utf-8] Thu Feb 23 19:59:14 2017
@@ -3,31 +3,28 @@
 GNOME_DOWNLOAD_URL = http://cyberelk.net/tim/data/system-config-printer/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
 TARBALL_EXT := tar.xz
 
-DEB_PYTHON3_MODULE_PACKAGES := python3-cupshelpers \
-                               system-config-printer \
-                               system-config-printer-udev \
-                               system-config-printer-common
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/python-module.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-DEB_DH_INSTALL_ARGS := --list-missing
+%:
+# We need to force the build system to autoconf otherwise for some reasons it
+# tries to run the python_distutils one
+	dh $@ --buildsystem=autoconf --with gnome,python3
 
-DEB_PYTHON_PRIVATE_MODULES_DIRS_ALL := /usr/share/system-config-printer
+override_dh_auto_configure:
+	dh_auto_configure -- --with-udev-rules \
+		             --with-udevdir=/lib/udev \
+		             --with-systemdsystemunitdir=/lib/systemd/system
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
-		--sbindir=/usr/bin \
-		--with-udev-rules \
-		--with-udevdir=/lib/udev \
-		--with-systemdsystemunitdir=/lib/systemd/system
+override_dh_python3:
+	dh_python3 -ppython3-cupshelpers
+	dh_python3 -psystem-config-printer /usr/share/system-config-printer/
+	dh_python3 -psystem-config-printer-common /usr/share/system-config-printer/
 
-configure/python3-cupshelpers::
-	cp debug.py smburi.py cupshelpers/
+override_dh_installdocs:
+	dh_installdocs -A AUTHORS
 
-cleanbuilddir/python3-cupshelpers::
-	rm -rf cupshelpers/debug.py cupshelpers/smburi.py
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_autoreconf:
+	dh_autoreconf ./bootstrap

More information about the pkg-gnome-commits mailing list