[Python-apps-commits] r2636 - in packages/sonata/trunk/debian (4 files)

[nijel at users.alioth.debian.org]

    Date: Wednesday, March 18, 2009 @ 15:06:00
  Author: nijel
Revision: 2636

Prepare for python2.6 (*-packages in *.install, --install-layout to
setup.py install).

Modified:
  packages/sonata/trunk/debian/changelog
  packages/sonata/trunk/debian/python-mmkeys.install
  packages/sonata/trunk/debian/rules
  packages/sonata/trunk/debian/sonata.install

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2009-03-18 07:42:21 UTC (rev 2635)
+++ packages/sonata/trunk/debian/changelog	2009-03-18 15:06:00 UTC (rev 2636)
@@ -7,8 +7,12 @@
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 17 Sep 2008 01:06:32 +0200
+  [ Michal ÄŒihaÅ™ ]
+  * Prepare for python2.6 (*-packages in *.install, --install-layout to
+    setup.py install).
 
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 16:05:19 +0100
+
 sonata (1.5.3-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/sonata/trunk/debian/python-mmkeys.install
===================================================================
--- packages/sonata/trunk/debian/python-mmkeys.install	2009-03-18 07:42:21 UTC (rev 2635)
+++ packages/sonata/trunk/debian/python-mmkeys.install	2009-03-18 15:06:00 UTC (rev 2636)
@@ -1 +1 @@
-usr/lib/python*/site-packages/mmkeys.so
+usr/lib/python*/*-packages/mmkeys.so

Modified: packages/sonata/trunk/debian/rules
===================================================================
--- packages/sonata/trunk/debian/rules	2009-03-18 07:42:21 UTC (rev 2635)
+++ packages/sonata/trunk/debian/rules	2009-03-18 15:06:00 UTC (rev 2636)
@@ -1,5 +1,14 @@
 #!/usr/bin/make -f
 
+-include /usr/share/python/python.mk
+ifeq (,$(py_sitename))
+  py_sitename = site-packages
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+  py_sitename_sh = $(py_sitename)
+  py_libdir_sh = $(py_libdir)
+  py_setup_install_args =
+endif
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -40,10 +49,10 @@
 	dh_installdirs
 	set -e; \
 	for python in $(PYVERSIONS) ; do \
-		$$python setup.py install --no-compile --root=$(CURDIR)/debian/tmp ; \
+		$$python setup.py install --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args) ; \
 	done
 	# Need to install default version as last to have proper #! line in main script
-	python setup.py install --no-compile --root=$(CURDIR)/debian/tmp
+	python setup.py install --no-compile --root=$(CURDIR)/debian/tmp $(py_setup_install_args)
 	# We install docs other way
 	rm -rf $(CURDIR)/debian/tmp/usr/share/sonata
 	install -m644 debian/sonata.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps

Modified: packages/sonata/trunk/debian/sonata.install
===================================================================
--- packages/sonata/trunk/debian/sonata.install	2009-03-18 07:42:21 UTC (rev 2635)
+++ packages/sonata/trunk/debian/sonata.install	2009-03-18 15:06:00 UTC (rev 2636)
@@ -1,4 +1,4 @@
 usr/bin
 usr/share
-usr/lib/python*/site-packages/Sonata*
-usr/lib/python*/site-packages/sonata
+usr/lib/python*/*-packages/Sonata*
+usr/lib/python*/*-packages/sonata