r43482 - in /attic/system-config-printer/debian: ./ patches/

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Sun Oct 12 09:55:18 UTC 2014


Author: bigon
Date: Sun Oct 12 09:55:17 2014
New Revision: 43482

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43482
Log:
* New upstream release (Closes: #744869)
* debian/control.in: Add udev to the build-dependencies, this is needed for
  the udev.pc pkgconfig file
* debian/system-config-printer-udev.install: The udev helpers and the
  config files are now installed in the proper directory
* d/p/0003-Use-our-custom-cpk-install-package-name.patch,
  d/p/0006-use-paper-size-default-in-etc-papersize.patch: Refreshed
* Drop d/p/0005-Fix-French-translation.patch,
  d/p/0007-scp-dbus-service-fix-dbus-signature-typo.patch: Merged upstream
* Drop debian/patches/0008-fix-udevhelperdir.patch: The path is expanded
  properly

Removed:
    attic/system-config-printer/debian/patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch
    attic/system-config-printer/debian/patches/0008-fix-udevhelperdir.patch
Modified:
    attic/system-config-printer/debian/changelog
    attic/system-config-printer/debian/control
    attic/system-config-printer/debian/control.in
    attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
    attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch
    attic/system-config-printer/debian/patches/series
    attic/system-config-printer/debian/system-config-printer-udev.install

Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog	[utf-8] (original)
+++ attic/system-config-printer/debian/changelog	[utf-8] Sun Oct 12 09:55:17 2014
@@ -1,9 +1,23 @@
-system-config-printer (1.4.3-5) UNRELEASED; urgency=medium
-
+system-config-printer (1.4.5-1) UNRELEASED; urgency=medium
+
+  [ Dmitry Shachnev ]
   * Drop obsolete python-gnomekeyring Suggests, the package has been
     ported to use GnomeKeyring via introspection.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 25 Feb 2014 13:06:49 +0400
+  [ Laurent Bigonville ]
+  * New upstream release (Closes: #744869)
+  * debian/control.in: Add udev to the build-dependencies, this is needed for
+    the udev.pc pkgconfig file
+  * debian/system-config-printer-udev.install: The udev helpers and the
+    config files are now installed in the proper directory
+  * d/p/0003-Use-our-custom-cpk-install-package-name.patch,
+    d/p/0006-use-paper-size-default-in-etc-papersize.patch: Refreshed
+  * Drop d/p/0005-Fix-French-translation.patch,
+    d/p/0007-scp-dbus-service-fix-dbus-signature-typo.patch: Merged upstream
+  * Drop debian/patches/0008-fix-udevhelperdir.patch: The path is expanded
+    properly
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 12 Oct 2014 11:44:59 +0200
 
 system-config-printer (1.4.3-4) unstable; urgency=medium
 

Modified: attic/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/control	[utf-8] (original)
+++ attic/system-config-printer/debian/control	[utf-8] Sun Oct 12 09:55:17 2014
@@ -2,7 +2,6 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: system-config-printer
 Section: gnome
 Priority: optional
@@ -21,6 +20,7 @@
                libcups2-dev,
                libglib2.0-dev,
                libudev-dev (>= 172) [linux-any],
+               udev (>= 172) [linux-any],
                libusb-1.0-0-dev
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/system-config-printer

Modified: attic/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control.in?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/control.in	[utf-8] (original)
+++ attic/system-config-printer/debian/control.in	[utf-8] Sun Oct 12 09:55:17 2014
@@ -16,6 +16,7 @@
                libcups2-dev,
                libglib2.0-dev,
                libudev-dev (>= 172) [linux-any],
+               udev (>= 172) [linux-any],
                libusb-1.0-0-dev
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/system-config-printer

Modified: attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch	[utf-8] Sun Oct 12 09:55:17 2014
@@ -6,13 +6,11 @@
  installpackage.py |   10 +++-------
  1 files changed, 3 insertions(+), 7 deletions(-)
 
-diff --git a/installpackage.py b/installpackage.py
-index 288610a..e415bcc 100644
 --- a/installpackage.py
 +++ b/installpackage.py
 @@ -22,15 +22,11 @@
  import os
- import glib
+ from gi.repository import GLib
  
 +GPK_INSTALL_PACKAGE_NAME='/usr/share/system-config-printer/gpk-install-package-name'
 +
@@ -28,4 +26,4 @@
 +        self.gpk_install_package_name = GPK_INSTALL_PACKAGE_NAME
  
      def InstallPackageName (self, xid, timestamp, name):
-         glib.spawn_async ([self.gpk_install_package_name, name])
+         GLib.spawn_async ([self.gpk_install_package_name, name])

Modified: attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch	[utf-8] Sun Oct 12 09:55:17 2014
@@ -2,10 +2,9 @@
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593219
 Origin: vendor
 
-diff -Nur -x '*.orig' -x '*~' system-config-printer-1.2.3+20100723//cupshelpers/cupshelpers.py system-config-printer-1.2.3+20100723.new//cupshelpers/cupshelpers.py
---- system-config-printer-1.2.3+20100723//cupshelpers/cupshelpers.py	2010-07-23 11:35:25.000000000 -0400
-+++ system-config-printer-1.2.3+20100723.new//cupshelpers/cupshelpers.py	2010-10-29 12:50:35.731061356 -0400
-@@ -654,6 +654,23 @@
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -722,6 +722,23 @@ def setPPDPageSize(ppd, language):
      for each in letter:
          if language == each:
              size = 'Letter'

Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/series	[utf-8] Sun Oct 12 09:55:17 2014
@@ -1,7 +1,5 @@
 0001-Adjust-python-paths.patch
 0002-Disable-firewall-checks.patch
 0003-Use-our-custom-cpk-install-package-name.patch
-0005-Fix-French-translation.patch
+#0005-Fix-French-translation.patch
 0006-use-paper-size-default-in-etc-papersize.patch
-0007-scp-dbus-service-fix-dbus-signature-typo.patch
-0008-fix-udevhelperdir.patch

Modified: attic/system-config-printer/debian/system-config-printer-udev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/system-config-printer-udev.install?rev=43482&op=diff
==============================================================================
--- attic/system-config-printer/debian/system-config-printer-udev.install	[utf-8] (original)
+++ attic/system-config-printer/debian/system-config-printer-udev.install	[utf-8] Sun Oct 12 09:55:17 2014
@@ -1,2 +1,2 @@
-etc/udev /lib/
+lib/udev
 lib/systemd/system/configure-printer at .service




More information about the pkg-gnome-commits mailing list