[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.2-30-gf15fcd8

[Sandro Tosi]

The following commit has been merged in the master branch:
commit f15fcd80370a6999e637184c99f65a95241cf0ce
Author: Sandro Tosi <morph at debian.org>
Date:   Thu May 21 15:09:52 2009 +0200

      - added '--install-layout=deb', to prepare for Python 2.6 introduction,
        updating python requirements to >= 2.5; thanks to Kenneth E Drake for the
        report and getting back to Debian; Closes: #529660

diff --git a/debian/changelog b/debian/changelog
index 9626a46..12fe6db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,12 @@ reportbug (4.3) UNRELEASED; urgency=low
     - include debsums output into bug report; thanks to Michael Biebl for the
       report and to Carl Chenet for the patch; Closes: #458572
     - added debsums output also for --template (non interactive) executions
+  * debian/{control, rules}
+    - added '--install-layout=deb', to prepare for Python 2.6 introduction,
+      updating python requirements to >= 2.5; thanks to Kenneth E Drake for the
+      report and getting back to Debian; Closes: #529660
 
- -- Sandro Tosi <morph at debian.org>  Thu, 21 May 2009 13:21:56 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 21 May 2009 14:47:55 +0200
 
 reportbug (4.2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 855e647..13e4c66 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sandro Tosi <morph at debian.org>, Chris Lawrence <lawrencc at debian.org>
 Standards-Version: 3.8.1
 Build-Depends: debhelper (>= 5.0.37.2), po4a (>= 0.23)
 Build-Depends-Indep: python-dev (>= 2.5), python-support, python-nose, python-setuptools
-XS-Python-Version: current, >= 2.5
+XS-Python-Version: >= 2.5
 Vcs-Git: git://git.debian.org/git/reportbug/reportbug.git
 Vcs-Browser: http://git.debian.org/?p=reportbug/reportbug.git
 Homepage: http://alioth.debian.org/projects/reportbug/
diff --git a/debian/rules b/debian/rules
index 600c84b..2d2ff91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ install-stamp: build-stamp
 	dh_installdirs
 
 	# Add here commands to install the package into debian/reportbug.
-	python setup.py install --root $(CURDIR)/debian/reportbug
+	python setup.py install --root $(CURDIR)/debian/reportbug --install-layout=deb
 	mv $(CURDIR)/debian/reportbug/usr/lib $(CURDIR)/debian/python-reportbug/usr
 	chmod 0755 $(CURDIR)/debian/reportbug/usr/bin/*
 	cp -p conf/reportbug.conf $(CURDIR)/debian/reportbug/etc

-- 
Reportbug - reports bugs in the Debian distribution