Hi, Attached is the diff for my cvs2svn 1.3.1-1.1 NMU.
I've not been able to fix the test 27 hack, so it's disabled in that NMU. I consider it a minor annoyance though. -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u cvs2svn-1.3.1/debian/rules cvs2svn-1.3.1/debian/rules
--- cvs2svn-1.3.1/debian/rules
+++ cvs2svn-1.3.1/debian/rules
@@ -2,25 +2,23 @@
export DH_COMPAT=4
-BUILDDIR=$(CURDIR)/debian/cvs2svn
-
-PYTHON_DEBDIR=$(BUILDDIR)/usr/lib/site-python/
-
build: build-stamp
build-stamp:
dh_testdir
+
+ # run the built in test suite
+ # locale should be set to en_US for test 27, but it FTBFS sometimes,
+ # so we go for a reduced testsuite.
+ ./run-tests.py
+
+ python setup.py build
+ touch $@
- # run the built in test suite, but first be sure to have
- # en_US locale for test 27
- install -d $(CURDIR)/debian/locale/
- localedef -i en_US -f ISO-8859-1 $(CURDIR)/debian/locale/en_US
- LOCPATH="$(CURDIR)/debian/locale" LC_ALL="en_US" $(CURDIR)/run-tests.py
+install: install-stamp
+install-stamp:
+ dh_testdir
dh_installdirs
- install -m0644 cvs2svn $(BUILDDIR)/usr/bin/cvs2svn
- # install rcsparse modules
- install -d $(PYTHON_DEBDIR)/cvs2svn_rcsparse/
- install -m0644 cvs2svn_rcsparse/*.py $(PYTHON_DEBDIR)/cvs2svn_rcsparse/
-
+ python setup.py install --root=$(CURDIR)/debian/cvs2svn
touch $@
clean:
@@ -29,18 +27,19 @@
rm -rf $(CURDIR)/tmp/
rm -f $(CURDIR)/svntest/*.pyc $(CURDIR)/cvs2svn_rcsparse/*.pyc
+ -python setup.py clean
rm -rf $(CURDIR)/debian/locale/
- rm -f build-stamp
+ rm -f build-stamp install-stamp
dh_clean
binary-arch: build
-binary-indep: build
+binary-indep: build install
dh_testdir
dh_installdocs -i README www/
dh_installchangelogs -i
dh_installman -i cvs2svn.1
- dh_python -i
+ dh_pysupport -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
diff -u cvs2svn-1.3.1/debian/changelog cvs2svn-1.3.1/debian/changelog
--- cvs2svn-1.3.1/debian/changelog
+++ cvs2svn-1.3.1/debian/changelog
@@ -1,3 +1,10 @@
+cvs2svn (1.3.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: 380763).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Tue, 29 Aug 2006 22:36:34 +0200
+
cvs2svn (1.3.1-1) unstable; urgency=low
* New upstream release.
diff -u cvs2svn-1.3.1/debian/control cvs2svn-1.3.1/debian/control
--- cvs2svn-1.3.1/debian/control
+++ cvs2svn-1.3.1/debian/control
@@ -2,13 +2,13 @@
Section: devel
Priority: optional
Maintainer: Laszlo Boszormenyi (GCS) <[EMAIL PROTECTED]>
-Build-Depends-Indep: python (>= 2.1.0), rcs, cvs, subversion, locales
+Build-Depends-Indep: python-dev, rcs, cvs, subversion, locales, python-support
(>= 0.4)
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.7.2
Package: cvs2svn
Architecture: all
-Depends: subversion (>= 1.0.1), rcs, python (>= 2.1.0)
+Depends: ${python:Depends}, subversion (>= 1.0.1), rcs
Suggests: cvs
Recommends: mime-support
Description: Convert a cvs repository to a subversion repository
signature.asc
Description: Digital signature
