r45894 - in /attic/system-config-printer/debian: changelog control control.in python-cupshelpers.install python3-cupshelpers.install rules

mitya57 at users.alioth.debian.org mitya57 at users.alioth.debian.org
Wed Sep 16 11:28:40 UTC 2015


Author: mitya57
Date: Wed Sep 16 11:28:40 2015
New Revision: 45894

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45894
Log:
* Rename python-cupshelpers to python3-cupshelpers, following upstream
  switch to Python 3.
* debian/control:
  - Replace python-* with python3-*.
  - Replace python-pycurl with python3-requests.
  - Replace gnome-icon-theme with adwaita-icon-theme.

Added:
    attic/system-config-printer/debian/python3-cupshelpers.install
      - copied, changed from r45893, attic/system-config-printer/debian/python-cupshelpers.install
Removed:
    attic/system-config-printer/debian/python-cupshelpers.install
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/rules

Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=45894&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog	[utf-8] (original)
+++ attic/system-config-printer/debian/changelog	[utf-8] Wed Sep 16 11:28:40 2015
@@ -6,6 +6,12 @@
   * Drop 0001-Adjust-python-paths.patch, not needed as all Python source
     files are installed into the same directory.
   * Refresh other patches via quilt.
+  * Rename python-cupshelpers to python3-cupshelpers, following upstream
+    switch to Python 3.
+  * debian/control:
+    - Replace python-* with python3-*.
+    - Replace python-pycurl with python3-requests.
+    - Replace gnome-icon-theme with adwaita-icon-theme.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 16 Sep 2015 14:00:17 +0300
 

Modified: attic/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control?rev=45894&op=diff
==============================================================================
--- attic/system-config-printer/debian/control	[utf-8] (original)
+++ attic/system-config-printer/debian/control	[utf-8] Wed Sep 16 11:28:40 2015
@@ -11,7 +11,7 @@
 Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
                autotools-dev,
-               python (>= 2.6),
+               python3,
                libxml-parser-perl,
                desktop-file-utils (>= 0.13),
                xmlto,
@@ -25,29 +25,29 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/system-config-printer
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/system-config-printer
 Homepage: http://cyberelk.net/tim/software/system-config-printer/
-X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.0
 
 Package: system-config-printer
 Architecture: all
 Depends: ${misc:Depends},
-         ${python:Depends},
-         python-cups (>= 1.9.60),
-         python-cupshelpers (= ${binary:Version}),
-         python-cairo,
-         python-dbus,
-         python-libxml2,
-         python-gi,
+         ${python3:Depends},
+         python3-cups (>= 1.9.60),
+         python3-cupshelpers (= ${binary:Version}),
+         python3-cairo,
+         python3-dbus,
+         python3-libxml2,
+         python3-gi,
          gir1.2-glib-2.0,
          gir1.2-pango-1.0,
          gir1.2-gdkpixbuf-2.0,
          gir1.2-gtk-3.0,
          gir1.2-notify-0.7,
          gir1.2-packagekitglib-1.0,
-         gnome-icon-theme,
+         adwaita-icon-theme
 Recommends: system-config-printer-udev,
             cups-pk-helper,
             gir1.2-gnomekeyring-1.0,
-            python-smbc
+            python3-smbc
 Suggests: gnome-packagekit-session
 Conflicts: hal-cups-utils
 Description: graphical interface to configure the printing system
@@ -59,15 +59,14 @@
  In terms of features, it aims to be as complete as the CUPS web 
  administration tool, while being integrated to the desktop.
 
-Package: python-cupshelpers
+Package: python3-cupshelpers
 Architecture: all
 Section: python
 Depends: ${misc:Depends},
-         ${python:Depends},
-         python-cups (>= 1.9.42),
-         python-dbus,
-         python-elementtree | python (>= 2.5),
-         python-pycurl
+         ${python3:Depends},
+         python3-cups (>= 1.9.42),
+         python3-dbus,
+         python3-requests
 Description: Python utility modules around the CUPS printing system
  These Python modules, that come from the system-config-printer 
  distribution, help building applications and utilities around the CUPS 
@@ -77,10 +76,10 @@
 Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         ${python:Depends},
-         python-cups (>= 1.9.42),
-         python-cupshelpers (= ${source:Version}),
-         python-dbus
+         ${python3:Depends},
+         python3-cups (>= 1.9.42),
+         python3-cupshelpers (= ${source:Version}),
+         python3-dbus
 Conflicts: hal-cups-utils (<< 0.6.17)
 Description: Utilities to detect and configure printers automatically
  These utilities allow one to detect automatically printers using UDEV when

Modified: attic/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control.in?rev=45894&op=diff
==============================================================================
--- attic/system-config-printer/debian/control.in	[utf-8] (original)
+++ attic/system-config-printer/debian/control.in	[utf-8] Wed Sep 16 11:28:40 2015
@@ -7,7 +7,7 @@
 Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
                autotools-dev,
-               python (>= 2.6),
+               python3,
                libxml-parser-perl,
                desktop-file-utils (>= 0.13),
                xmlto,
@@ -21,29 +21,29 @@
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/system-config-printer
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/system-config-printer
 Homepage: http://cyberelk.net/tim/software/system-config-printer/
-X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.0
 
 Package: system-config-printer
 Architecture: all
 Depends: ${misc:Depends},
-         ${python:Depends},
-         python-cups (>= 1.9.60),
-         python-cupshelpers (= ${binary:Version}),
-         python-cairo,
-         python-dbus,
-         python-libxml2,
-         python-gi,
+         ${python3:Depends},
+         python3-cups (>= 1.9.60),
+         python3-cupshelpers (= ${binary:Version}),
+         python3-cairo,
+         python3-dbus,
+         python3-libxml2,
+         python3-gi,
          gir1.2-glib-2.0,
          gir1.2-pango-1.0,
          gir1.2-gdkpixbuf-2.0,
          gir1.2-gtk-3.0,
          gir1.2-notify-0.7,
          gir1.2-packagekitglib-1.0,
-         gnome-icon-theme,
+         adwaita-icon-theme
 Recommends: system-config-printer-udev,
             cups-pk-helper,
             gir1.2-gnomekeyring-1.0,
-            python-smbc
+            python3-smbc
 Suggests: gnome-packagekit-session
 Conflicts: hal-cups-utils
 Description: graphical interface to configure the printing system
@@ -55,15 +55,14 @@
  In terms of features, it aims to be as complete as the CUPS web 
  administration tool, while being integrated to the desktop.
 
-Package: python-cupshelpers
+Package: python3-cupshelpers
 Architecture: all
 Section: python
 Depends: ${misc:Depends},
-         ${python:Depends},
-         python-cups (>= 1.9.42),
-         python-dbus,
-         python-elementtree | python (>= 2.5),
-         python-pycurl
+         ${python3:Depends},
+         python3-cups (>= 1.9.42),
+         python3-dbus,
+         python3-requests
 Description: Python utility modules around the CUPS printing system
  These Python modules, that come from the system-config-printer 
  distribution, help building applications and utilities around the CUPS 
@@ -73,10 +72,10 @@
 Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         ${python:Depends},
-         python-cups (>= 1.9.42),
-         python-cupshelpers (= ${source:Version}),
-         python-dbus
+         ${python3:Depends},
+         python3-cups (>= 1.9.42),
+         python3-cupshelpers (= ${source:Version}),
+         python3-dbus
 Conflicts: hal-cups-utils (<< 0.6.17)
 Description: Utilities to detect and configure printers automatically
  These utilities allow one to detect automatically printers using UDEV when

Copied: attic/system-config-printer/debian/python3-cupshelpers.install (from r45893, attic/system-config-printer/debian/python-cupshelpers.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/python3-cupshelpers.install?rev=45894&op=diff
==============================================================================
--- attic/system-config-printer/debian/python-cupshelpers.install	[utf-8] (original)
+++ attic/system-config-printer/debian/python3-cupshelpers.install	[utf-8] Wed Sep 16 11:28:40 2015
@@ -1,2 +1,2 @@
-usr/lib/python*/site-packages/cupshelpers
+usr/lib/python3/dist-packages/cupshelpers
 etc/cupshelpers/

Modified: attic/system-config-printer/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/rules?rev=45894&op=diff
==============================================================================
--- attic/system-config-printer/debian/rules	[utf-8] (original)
+++ attic/system-config-printer/debian/rules	[utf-8] Wed Sep 16 11:28:40 2015
@@ -13,7 +13,7 @@
 include /usr/share/cdbs/1/rules/utils.mk
 DEB_DH_INSTALL_ARGS := --list-missing
 
-DEB_PYTHON2_MODULE_PACKAGES := python-cupshelpers \
+DEB_PYTHON3_MODULE_PACKAGES := python3-cupshelpers \
                                system-config-printer \
                                system-config-printer-udev
 DEB_PYTHON_PRIVATE_MODULES_DIRS_system-config-printer-udev := /lib/udev/
@@ -24,8 +24,8 @@
 		--with-udevdir=/lib/udev \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
-configure/python-cupshelpers::
+configure/python3-cupshelpers::
 	cp debug.py smburi.py cupshelpers/
 
-cleanbuilddir/python-cupshelpers::
+cleanbuilddir/python3-cupshelpers::
 	rm -rf cupshelpers/debug.py cupshelpers/smburi.py




More information about the pkg-gnome-commits mailing list