Package: cvs2svn
Version: 2.3.0-1
Severity: wishlist
Tags: patch

Once Python 2.6 hits unstable, cvs2svn will need to set install-layout=deb.
This is supported now in both Unstable and Testing, so it is prudent to go
ahead and make the change.  Patch attached

-- System Information:
Debian Release: 5.0
  APT prefers jaunty-updates
  APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 
'jaunty-backports'), (500, 'jaunty')
Architecture: i386 (i686)

Kernel: Linux 2.6.28-15-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u cvs2svn-2.3.0/debian/changelog cvs2svn-2.3.0/debian/changelog
--- cvs2svn-2.3.0/debian/changelog
+++ cvs2svn-2.3.0/debian/changelog
@@ -1,3 +1,10 @@
+cvs2svn (2.3.0-2) unstable; urgency=low
+
+  * Add --install-layout=deb to debian/rules for Python 2.6 compatibility
+    - Add version dependency for python-dev
+
+ -- Scott Kitterman <[email protected]>  Mon, 14 Sep 2009 01:46:14 -0400
+
 cvs2svn (2.3.0-1) unstable; urgency=low
 
   * New upstream release, fixes FTBFS due to self-test (closes: #542981).
diff -u cvs2svn-2.3.0/debian/control cvs2svn-2.3.0/debian/control
--- cvs2svn-2.3.0/debian/control
+++ cvs2svn-2.3.0/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <[email protected]>
 Build-Depends-Indep: rcs, cvs, subversion, locales
-Build-Depends: debhelper (>= 6), python-dev, python-support (>= 0.5.3)
+Build-Depends: debhelper (>= 6), python-dev (>= 2.5.4-2), python-support (>= 0.5.3)
 Standards-Version: 3.8.3
 XS-Python-Version: all
 Homepage: http://cvs2svn.tigris.org/
diff -u cvs2svn-2.3.0/debian/rules cvs2svn-2.3.0/debian/rules
--- cvs2svn-2.3.0/debian/rules
+++ cvs2svn-2.3.0/debian/rules
@@ -18,7 +18,7 @@
 install-stamp:
 	dh_testdir
 	dh_installdirs
-	python setup.py install --root=$(DESTDIR)
+	python setup.py install --install-layout=deb --root=$(DESTDIR)
 	install -d $(DESTDIR)/usr/share/lintian/overrides/
 	install -m0644 $(CURDIR)/debian/cvs2svn.lintian $(DESTDIR)/usr/share/lintian/overrides/cvs2svn
 

Reply via email to