[Python-modules-commits] r10363 - in packages/clientcookie/trunk/debian (3 files)

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

    Date: Wednesday, November 11, 2009 @ 15:14:19
  Author: jwilk-guest
Revision: 10363

Integrate 1.3.0-1.2 NMU

Modified:
  packages/clientcookie/trunk/debian/changelog
  packages/clientcookie/trunk/debian/control
  packages/clientcookie/trunk/debian/rules

Modified: packages/clientcookie/trunk/debian/changelog
===================================================================
--- packages/clientcookie/trunk/debian/changelog	2009-11-11 15:13:14 UTC (rev 10362)
+++ packages/clientcookie/trunk/debian/changelog	2009-11-11 15:14:19 UTC (rev 10363)
@@ -1,3 +1,19 @@
+clientcookie (1.3.0-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control
+    - moved debhelper to Build-Depends (needed for 'clean' target)
+  * Make the package ready for Python 2.6; thanks to Josselin Mouette
+    for the report; Closes: #547814
+    - debian/control
+      + bump versioned b-d-i of python-all-dev to '>= 2.5.4-1~'
+    - debian/rules
+      + include python.mk
+      + use $(py_setup_install_args) when installing
+      + use $(call py_sitename,$*) instead of site-packages
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 11 Oct 2009 23:59:05 +0200
+
 clientcookie (1.3.0-1.1) unstable; urgency=low
 
   * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490453.

Modified: packages/clientcookie/trunk/debian/control
===================================================================
--- packages/clientcookie/trunk/debian/control	2009-11-11 15:13:14 UTC (rev 10362)
+++ packages/clientcookie/trunk/debian/control	2009-11-11 15:14:19 UTC (rev 10363)
@@ -1,7 +1,8 @@
 Source: clientcookie
 section: python
 Priority: optional
-Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-central (>= 0.4.17), debhelper (>= 5.0.37.1), python-setuptools (>= 0.6b3)
+Build-Depends: debhelper (>= 5.0.37.1)
+Build-Depends-Indep: python-all-dev (>= 2.5.4-1~), python-central (>= 0.4.17), python-setuptools (>= 0.6b3)
 XS-Python-Version: all
 Maintainer: Ganesan Rajagopal <rganesan at debian.org>
 Standards-Version: 3.6.2

Modified: packages/clientcookie/trunk/debian/rules
===================================================================
--- packages/clientcookie/trunk/debian/rules	2009-11-11 15:13:14 UTC (rev 10362)
+++ packages/clientcookie/trunk/debian/rules	2009-11-11 15:14:19 UTC (rev 10363)
@@ -6,6 +6,8 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
+include /usr/share/python/python.mk
+
 PYVERS	:= $(shell pyversions -vr debian/control)
 DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog \
                          | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
@@ -37,11 +39,11 @@
 
 install-python%:
 	python$* setup.py install \
-		--no-compile --root=$(d) --single-version-externally-managed
+		--no-compile --root=$(d) --single-version-externally-managed $(py_setup_install_args)
 
 	# Remove python and module version from .egg-info
-	mv $(d)/usr/lib/python$*/site-packages/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \
-		$(d)/usr/lib/python$*/site-packages/$(PYMOD).egg-info
+	mv $(d)/usr/lib/python$*/$(call py_sitename,$*)/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \
+		$(d)/usr/lib/python$*/$(call py_sitename,$*)/$(PYMOD).egg-info
 
 # Build architecture-independent files here.
 binary-indep: build install