[Debian-l10n-commits] r2029 - in /pootle/trunk/debian: changelog control rules

[nekral-guest at users.alioth.debian.org]

Author: nekral-guest
Date: Sun Dec 13 13:26:08 2009
New Revision: 2029

URL: http://svn.debian.org/wsvn/?sc=1&rev=2029
Log:
  * Acknowledge NMU by Sandro Tosi <morph at debian.org>:
    + debian/control: bump versioned dependency on python-all-dev to 2.5.4-1~
    + debian/rules: include python.mk, adapt variables to be compatible with
      the Python 2.5 and 2.6, pass py_setup_install_args to 'setup.py
      install'; thanks to Jakub Wilk for the report; Closes: #557957

Modified:
    pootle/trunk/debian/changelog
    pootle/trunk/debian/control
    pootle/trunk/debian/rules

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=2029&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Sun Dec 13 13:26:08 2009
@@ -1,6 +1,11 @@
 pootle (2.0.0-1) unstable; urgency=low
 
   * New upstream release
+  * Acknowledge NMU by Sandro Tosi <morph at debian.org>:
+    + debian/control: bump versioned dependency on python-all-dev to 2.5.4-1~
+    + debian/rules: include python.mk, adapt variables to be compatible with
+      the Python 2.5 and 2.6, pass py_setup_install_args to 'setup.py
+      install'; thanks to Jakub Wilk for the report; Closes: #557957
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sun, 13 Dec 2009 14:12:44 +0100
 

Modified: pootle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/control?rev=2029&op=diff
==============================================================================
--- pootle/trunk/debian/control (original)
+++ pootle/trunk/debian/control Sun Dec 13 13:26:08 2009
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
-Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
+Build-Depends-Indep: python-all-dev (>= 2.5.4-1~), python-central (>= 0.5.6)
 Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40)
 XS-Python-Version: current, >= 2.3
 Standards-Version: 3.8.3

Modified: pootle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/rules?rev=2029&op=diff
==============================================================================
--- pootle/trunk/debian/rules (original)
+++ pootle/trunk/debian/rules Sun Dec 13 13:26:08 2009
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
+
+include /usr/share/python/python.mk
 
 d=$(CURDIR)/debian/pootle
 pv=$(shell pyversions -vr)
-Pootle=$(d)/usr/lib/python$(pv)/site-packages/Pootle
+Pootle=$(d)$(call py_libdir,$(pv))/Pootle
 
 include /usr/share/quilt/quilt.make
 
@@ -26,7 +28,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	python setup.py install --root=$(d)
+	python setup.py install --root=$(d) $(py_setup_install_args)
 	# Pootle is a WEB server, I prefer to install it in sbin
 	mv $(d)/usr/bin/PootleServer $(d)/usr/sbin
 	# Remove the tests and unused files