Package: release.debian.org
Followup-For: Bug #855971
Ouups forgot the debdiff
-- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1,
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_BE.UTF-8, LC_CTYPE=fr_BE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru system-config-printer-1.5.7/debian/changelog
system-config-printer-1.5.7/debian/changelog
--- system-config-printer-1.5.7/debian/changelog 2016-06-02
11:17:13.000000000 +0200
+++ system-config-printer-1.5.7/debian/changelog 2017-02-23
17:55:32.000000000 +0100
@@ -1,3 +1,14 @@
+system-config-printer (1.5.7-3) unstable; urgency=medium
+
+ * debian/patches/0010-no-start-printer-applet-gnome.patch: Do not start the
+ printer-applet in GNOME or Cinnamon {gnome,cinnamon}-settings-daemon is
+ already take care of this.
+ * debian/rules: Move the definition of DEB_PYTHON3_MODULE_PACKAGES before
+ including python-module.mk otherwise cdbs is not calling dh_python3 as
+ expected
+
+ -- Laurent Bigonville <bi...@debian.org> Thu, 23 Feb 2017 17:55:32 +0100
+
system-config-printer (1.5.7-2) unstable; urgency=medium
* Move part of system-config-printer to system-config-printer-common
@@ -7,13 +18,13 @@
* debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
* Drop debian/gpk-install-package-name, this doesn't seem needed anymore
* Drop adwaita-icon-theme dependency, try to avoid individual packages to
- depends against themes.
+ depend against themes.
* Add debian/patches/0008-fix-device-sorting.patch: Fix sorting of devices,
taken from upstream
* Drop debian/patches/0002-Disable-firewall-checks.patch: firewalld is
available in Debian as well, let's integrate with it.
* Add debian/patches/0009-fix-udev-add-printer-shbang.patch: Fix incorrect
- python3 invocation, taken from upstream
+ python3 invocation, taken from upstream (Closes: #823472)
-- Laurent Bigonville <bi...@debian.org> Thu, 02 Jun 2016 11:16:46 +0200
diff -Nru system-config-printer-1.5.7/debian/control
system-config-printer-1.5.7/debian/control
--- system-config-printer-1.5.7/debian/control 2016-06-02 11:19:11.000000000
+0200
+++ system-config-printer-1.5.7/debian/control 2017-02-23 17:55:32.000000000
+0100
@@ -6,7 +6,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers
<pkg-gnome-maintain...@lists.alioth.debian.org>
-Uploaders: Dmitry Shachnev <mity...@debian.org>, Emilio Pozuelo Monfort
<po...@debian.org>, Laurent Bigonville <bi...@debian.org>, Guido Günther
<a...@sigxcpu.org>
+Uploaders: Dmitry Shachnev <mity...@debian.org>, Laurent Bigonville
<bi...@debian.org>, Guido Günther <a...@sigxcpu.org>
Build-Depends: autotools-dev,
cdbs (>= 0.4.90~),
debhelper (>= 9),
diff -Nru
system-config-printer-1.5.7/debian/patches/0010-no-start-printer-applet-gnome.patch
system-config-printer-1.5.7/debian/patches/0010-no-start-printer-applet-gnome.patch
---
system-config-printer-1.5.7/debian/patches/0010-no-start-printer-applet-gnome.patch
1970-01-01 01:00:00.000000000 +0100
+++
system-config-printer-1.5.7/debian/patches/0010-no-start-printer-applet-gnome.patch
2016-06-08 11:20:59.000000000 +0200
@@ -0,0 +1,24 @@
+From 4450fd4a2ad3c5447118d33ee373e555f0e81ab3 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bi...@bigon.be>
+Date: Thu, 2 Jun 2016 14:41:48 +0200
+Subject: [PATCH] Do not start the applet on GNOME and Cinnamon desktops
+ (Closes: #40)
+
+{gnome,cinnamon}-settings-daemon are also claiming the D-Bus interfaces
+provided by the applet
+---
+ print-applet.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/print-applet.desktop.in b/print-applet.desktop.in
+index c8fd345..0e38ee1 100644
+--- a/print-applet.desktop.in
++++ b/print-applet.desktop.in
+@@ -5,6 +5,6 @@ Exec=system-config-printer-applet
+ Terminal=false
+ Type=Application
+ Icon=printer
+-NotShowIn=KDE;
++NotShowIn=KDE;GNOME;Cinnamon;
+ StartupNotify=false
+ X-GNOME-Autostart-Delay=30
diff -Nru system-config-printer-1.5.7/debian/patches/series
system-config-printer-1.5.7/debian/patches/series
--- system-config-printer-1.5.7/debian/patches/series 2016-06-02
11:16:36.000000000 +0200
+++ system-config-printer-1.5.7/debian/patches/series 2016-06-08
11:21:13.000000000 +0200
@@ -3,3 +3,4 @@
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
diff -Nru system-config-printer-1.5.7/debian/rules
system-config-printer-1.5.7/debian/rules
--- system-config-printer-1.5.7/debian/rules 2016-06-01 16:06:39.000000000
+0200
+++ system-config-printer-1.5.7/debian/rules 2017-02-23 17:52:03.000000000
+0100
@@ -3,6 +3,11 @@
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
@@ -13,11 +18,6 @@
include /usr/share/cdbs/1/rules/utils.mk
DEB_DH_INSTALL_ARGS := --list-missing
-DEB_PYTHON3_MODULE_PACKAGES := python3-cupshelpers \
- system-config-printer \
- system-config-printer-udev \
- system-config-printer-common
-
DEB_PYTHON_PRIVATE_MODULES_DIRS_ALL := /usr/share/system-config-printer
DEB_CONFIGURE_EXTRA_FLAGS := \
