r45916 - in /attic/system-config-printer/debian: changelog patches/03_install_layout.patch patches/series python3-cupshelpers.install

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Thu Sep 17 10:18:43 2015
New Revision: 45916

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45916
Log:
Add 03_install_layout.patch to install cupshelpers Python module to
correct location (copied from Ubuntu).

Added:
    attic/system-config-printer/debian/patches/03_install_layout.patch
Modified:
    attic/system-config-printer/debian/changelog
    attic/system-config-printer/debian/patches/series
    attic/system-config-printer/debian/python3-cupshelpers.install

Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=45916&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog	[utf-8] (original)
+++ attic/system-config-printer/debian/changelog	[utf-8] Thu Sep 17 10:18:43 2015
@@ -12,6 +12,8 @@
     - Replace python-* with python3-*.
     - Replace python-pycurl with python3-requests.
     - Replace gnome-icon-theme with adwaita-icon-theme.
+  * Add 03_install_layout.patch to install cupshelpers Python module to
+    correct location (copied from Ubuntu).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 16 Sep 2015 14:00:17 +0300
 

Added: attic/system-config-printer/debian/patches/03_install_layout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/03_install_layout.patch?rev=45916&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/03_install_layout.patch	(added)
+++ attic/system-config-printer/debian/patches/03_install_layout.patch	[utf-8] Thu Sep 17 10:18:43 2015
@@ -0,0 +1,27 @@
+Description: install with --install-layout=deb
+Author: Martin Pitt <mpitt at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-09-17
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -58,7 +58,7 @@
+ 
+ # Use distutils to install the module.
+ install-exec-local: .stamp-distutils-in-builddir
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
++	$(PYTHON) setup.py install --install-layout=deb --root=$(DESTDIR)
+ 
+ # Uninstall the module, crossing our fingers that we know enough
+ # about how distutils works to do this.  Unfortunately, distutils
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1962,7 +1962,7 @@
+ 
+ # Use distutils to install the module.
+ install-exec-local: .stamp-distutils-in-builddir
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
++	$(PYTHON) setup.py install --install-layout=deb --root=$(DESTDIR)
+ 
+ # Uninstall the module, crossing our fingers that we know enough
+ # about how distutils works to do this.  Unfortunately, distutils

Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=45916&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/series	[utf-8] Thu Sep 17 10:18:43 2015
@@ -1,3 +1,4 @@
+03_install_layout.patch
 0002-Disable-firewall-checks.patch
 #0005-Fix-French-translation.patch
 0006-use-paper-size-default-in-etc-papersize.patch

Modified: attic/system-config-printer/debian/python3-cupshelpers.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/python3-cupshelpers.install?rev=45916&op=diff
==============================================================================
--- attic/system-config-printer/debian/python3-cupshelpers.install	[utf-8] (original)
+++ attic/system-config-printer/debian/python3-cupshelpers.install	[utf-8] Thu Sep 17 10:18:43 2015
@@ -1,2 +1,3 @@
 usr/lib/python3/dist-packages/cupshelpers
+usr/lib/python3/dist-packages/cupshelpers-1.0.egg-info
 etc/cupshelpers/