[Python-modules-commits] r8664 - in packages/circuits/trunk/debian (changelog control rules)

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

    Date: Monday, June 1, 2009 @ 07:48:29
  Author: dktrkranz-guest
Revision: 8664

Changes for upcoming Python 2.6 transition (Closes: #531085)

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

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2009-05-31 22:17:04 UTC (rev 8663)
+++ packages/circuits/trunk/debian/changelog	2009-06-01 07:48:29 UTC (rev 8664)
@@ -1,3 +1,13 @@
+circuits (1.1.1-2) UNRELEASED; urgency=low
+
+  * Changes for upcoming Python 2.6 transition (Closes: #531085):
+    - debian/rules: pass --install-layout=deb to setup.py install call
+      to let files be installed under /usr instead of /usr/local.
+    - debian/control: build-depend on python (>= 2.5.3-1~exp1) for
+      --install-layout=deb support.
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Mon, 01 Jun 2009 09:46:46 +0200
+
 circuits (1.1.1-1) unstable; urgency=low
 
   * debian/control

Modified: packages/circuits/trunk/debian/control
===================================================================
--- packages/circuits/trunk/debian/control	2009-05-31 22:17:04 UTC (rev 8663)
+++ packages/circuits/trunk/debian/control	2009-06-01 07:48:29 UTC (rev 8664)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 7), python, python-setuptools
+Build-Depends: debhelper (>= 7), python (>= 2.5.3-1~exp1), python-setuptools
 Build-Depends-Indep: python-support, snakefood, ghostscript, graphviz, python-nose, python-pyinotify, python-pygame, python-epydoc
 Standards-Version: 3.8.1
 Homepage: http://trac.softcircuit.com.au/circuits/

Modified: packages/circuits/trunk/debian/rules
===================================================================
--- packages/circuits/trunk/debian/rules	2009-05-31 22:17:04 UTC (rev 8663)
+++ packages/circuits/trunk/debian/rules	2009-06-01 07:48:29 UTC (rev 8664)
@@ -36,7 +36,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/python-progressbar.
-	python setup.py install --root=$(CURDIR)/debian/python-circuits
+	python setup.py install --root=$(CURDIR)/debian/python-circuits --install-layout=deb
 
 	# no test binaries wanted
 	rm -rf $(CURDIR)/debian/python-circuits/usr/bin