tags 332118 + patch
tags 373390 + patch
thanks

Hi,

In order to finish the cdebconf transition, see:
http://lists.debian.org/debian-devel/2005/08/msg00136.html

I intend to *lovingly* NMU, with this very small change.
I will upload to DELAYED-7, so that you still have time to stop 
it if needed.

Attached is the diff for my tmda 1.0.3-1.1 NMUi, as provided by Rudy.


-- 
  ยท''`.             If I can't dance to it, it's not my revolution
 : :' :                                            -- Emma Goldman
 `. `'           Proudly running Debian GNU/Linux (unstable)
   `-     www.amayita.com  www.malapecora.com  www.chicasduras.com
diff -u tmda-1.0.3/debian/changelog tmda-1.0.3/debian/changelog
--- tmda-1.0.3/debian/changelog
+++ tmda-1.0.3/debian/changelog
@@ -1,3 +1,12 @@
+tmda (1.0.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Migrated to the new policy	Closes: #373390
+  * Fixed version dependency for binary package, now using binary:Version
+  * Adds dependency on debconf-2.0 as alternative	Closes: #332118
+
+ -- Rudy Godoy <[EMAIL PROTECTED]>  Wed, 30 Aug 2006 21:35:31 -0500
+
 tmda (1.0.3-1) unstable; urgency=low
 
   * New upstream release
diff -u tmda-1.0.3/debian/control tmda-1.0.3/debian/control
--- tmda-1.0.3/debian/control
+++ tmda-1.0.3/debian/control
@@ -2,12 +2,14 @@
 Section: mail
 Priority: extra
 Maintainer: Adam D. McKenna <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.0), python
-Standards-Version: 3.5.9
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-central (>= 0.5)
+Standards-Version: 3.7.2
+XS-Python-Version: >= 2.3
 
 Package: tmda
 Architecture: all
-Depends: python (<< 2.4), python (>= 2.1), python-tmda (= ${dpkg:Version}), debconf
+Depends: ${python:Depends}, python-tmda (= ${binary:Version}), debconf | debconf-2.0
+XB-Python-Version: ${python:Versions}
 Conflicts: python (= 2.3.1-1)
 Suggests: python-cdb
 Replaces: python2-tmda
@@ -24,7 +26,8 @@
 
 Package: python-tmda
 Architecture: all
-Depends: python (<< 2.4), python (>= 2.1)
+Depends: ${python:Depends}
+XB-Python-Version: ${python:Versions}
 Conflicts: python (= 2.3.1-1)
 Replaces: python2-tmda
 Section: python
diff -u tmda-1.0.3/debian/python-tmda.dirs tmda-1.0.3/debian/python-tmda.dirs
--- tmda-1.0.3/debian/python-tmda.dirs
+++ tmda-1.0.3/debian/python-tmda.dirs
@@ -1,3 +1,2 @@
-/usr/lib/python2.1/site-packages
-/usr/lib/python2.2/site-packages
 /usr/lib/python2.3/site-packages
+/usr/lib/python2.4/site-packages
diff -u tmda-1.0.3/debian/rules tmda-1.0.3/debian/rules
--- tmda-1.0.3/debian/rules
+++ tmda-1.0.3/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
-export DH_COMPAT=3
+
+PYTHON := /usr/bin/python
+PYVERS=${shell pyversions -vr}
 
 clean:
 	dh_testdir
@@ -9,7 +11,14 @@
 	find . -name "*.pyc" -exec rm -f {} \;
 	rm -f debian/*.1
 
-install:
+build: $(PYVERS:%=build-python%)
+	touch $@
+
+build-python%:
+	python$* setup.py build
+	touch $@
+
+install: build $(PYVERS:%=install-python%)
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -17,9 +26,10 @@
 
 	cp -a bin/tmda-* debian/tmda/usr/bin
 	cp -a templates/* debian/tmda/etc/tmda
-	cp -a TMDA debian/python-tmda/usr/lib/python2.1/site-packages/
-	cp -a TMDA debian/python-tmda/usr/lib/python2.2/site-packages/
+#	cp -a TMDA debian/python-tmda/usr/lib/python2.1/site-packages/
+#	cp -a TMDA debian/python-tmda/usr/lib/python2.2/site-packages/
 	cp -a TMDA debian/python-tmda/usr/lib/python2.3/site-packages/
+	cp -a TMDA debian/python-tmda/usr/lib/python2.4/site-packages/
 	cp debian/tmda-manpage debian/tmda.1
 	cp debian/tmda-manpage debian/tmda-inject.1
 	cp debian/tmda-manpage debian/tmda-check-address.1
@@ -39,19 +49,26 @@
 	cp debian/tmda-manpage debian/tmda-gui.1
 
+install-python%:
+	python$* setup.py install --root $(CURDIR)/debian/python-tmda
+
 binary-indep: install
 	dh_testdir -i
 	dh_testroot -i
+	dh_installchangelogs ChangeLog -i
 	dh_installdocs -i
 	dh_installman -A
-	dh_installchangelogs ChangeLog -i
-	dh_python /usr/lib/python2.1/site-packages /usr/lib/python2.2/site-packages /usr/lib/python2.3/site-packages
+	dh_pycentral
+	dh_python /usr/lib/python2.3/site-packages /usr/lib/python2.4/site-packages 
+	dh_compress -X.py
 	dh_installdebconf
-	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i
+	dh_gencontrol
 	dh_md5sums -i
 	dh_builddeb -i
 
+binary-arch: build install
+# Do nothing
+
 binary: binary-indep
 .PHONY: build clean binary-arch binary install configure
only in patch2:
unchanged:
--- tmda-1.0.3.orig/debian/compat
+++ tmda-1.0.3/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- tmda-1.0.3.orig/debian/pycompat
+++ tmda-1.0.3/debian/pycompat
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- tmda-1.0.3.orig/setup.py
+++ tmda-1.0.3/setup.py
@@ -0,0 +1,6 @@
+# Python distutils script for Debian package
+# Seo Sanghyeon
+
+from distutils.core import setup
+setup(name="tmda",
+      version="1.0.3")

Reply via email to