tags 617151 + patch pending
tags 625751 + patch pending
thanks

Dear maintainer,

I've prepared an NMU for xdelta3 (versioned as 0y.dfsg-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
  .''`.
 :  :' :   Luca Falavigna <dktrkr...@debian.org>
 `.  `'
   `-
diff -Nru xdelta3-0y.dfsg/debian/changelog xdelta3-0y.dfsg/debian/changelog
--- xdelta3-0y.dfsg/debian/changelog	2010-02-22 21:59:06.000000000 +0100
+++ xdelta3-0y.dfsg/debian/changelog	2011-05-08 13:30:13.000000000 +0200
@@ -1,3 +1,21 @@
+xdelta3 (0y.dfsg-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Convert package to dh_python2 (Closes: #617151).
+    + debian/control:
+      - Build-depend on python-all-dev (>= 2.6.6-3~).
+      - Drop python-central from Build-Depends.
+      - Define X-Python-Version field.
+      - Drop XB-Python-Version field.
+    + debian/pycompat:
+      - Useless, removed.
+    + debian/rules:
+      - Replace dh_pycentral with dh_python2.
+  * debian/patches/unversioned_shebangs.diff:
+    - Do not use versioned shebangs (Closes: #625751).
+
+ -- Luca Falavigna <dktrkr...@debian.org>  Sun, 08 May 2011 13:28:08 +0200
+
 xdelta3 (0y.dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru xdelta3-0y.dfsg/debian/control xdelta3-0y.dfsg/debian/control
--- xdelta3-0y.dfsg/debian/control	2010-02-23 00:24:10.000000000 +0100
+++ xdelta3-0y.dfsg/debian/control	2011-05-08 13:28:02.000000000 +0200
@@ -3,7 +3,8 @@
 Priority: optional
 XS-Python-Version: all
 Maintainer: A Mennucc1 <mennu...@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, python-central (>= 0.5), python-all-dev
+Build-Depends: debhelper (>= 5), cdbs, python-all-dev (>= 2.6.6-3~)
+X-Python-Version: >= 2.5
 Standards-Version: 3.8.4.0
 
 Package: xdelta3
@@ -20,7 +21,6 @@
 Architecture: any
 Section: python
 Depends:  ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Description: Xdelta3 python module
  Xdelta3 is a set of tools designed to compute changes between
diff -Nru xdelta3-0y.dfsg/debian/patches/series xdelta3-0y.dfsg/debian/patches/series
--- xdelta3-0y.dfsg/debian/patches/series	2010-02-23 18:41:54.000000000 +0100
+++ xdelta3-0y.dfsg/debian/patches/series	2011-05-08 13:22:51.000000000 +0200
@@ -1,3 +1,3 @@
 Makefile_OPTFLAGS.diff
 Makefile_PIC.diff
-
+unversioned_shebangs.diff
diff -Nru xdelta3-0y.dfsg/debian/patches/unversioned_shebangs.diff xdelta3-0y.dfsg/debian/patches/unversioned_shebangs.diff
--- xdelta3-0y.dfsg/debian/patches/unversioned_shebangs.diff	1970-01-01 01:00:00.000000000 +0100
+++ xdelta3-0y.dfsg/debian/patches/unversioned_shebangs.diff	2011-05-08 13:23:48.000000000 +0200
@@ -0,0 +1,23 @@
+#Author: Luca Falavigna <dktrkr...@debian.org>
+#Bug-Debian: http://bugs.debian.org/625751
+#Last-Update: 2011-05-08
+Index: xdelta3-0y.dfsg/testing/xdelta3-regtest.py
+===================================================================
+--- xdelta3-0y.dfsg.orig/testing/xdelta3-regtest.py	2011-05-08 13:22:23.412081704 +0200
++++ xdelta3-0y.dfsg/testing/xdelta3-regtest.py	2011-05-08 13:21:53.188081717 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.6
++#!/usr/bin/python
+ # xdelta 3 - delta compression tools and library
+ # Copyright (C) 2003, 2006, 2007, 2008.  Joshua P. MacDonald
+ #
+Index: xdelta3-0y.dfsg/xdelta3-test.py
+===================================================================
+--- xdelta3-0y.dfsg.orig/xdelta3-test.py	2011-05-08 13:22:23.344081704 +0200
++++ xdelta3-0y.dfsg/xdelta3-test.py	2011-05-08 13:21:57.100081790 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.5
++#!/usr/bin/python
+ # xdelta 3 - delta compression tools and library
+ # Copyright (C) 2003, 2006, 2007.  Joshua P. MacDonald
+ #
diff -Nru xdelta3-0y.dfsg/debian/pycompat xdelta3-0y.dfsg/debian/pycompat
--- xdelta3-0y.dfsg/debian/pycompat	2010-02-22 12:52:57.000000000 +0100
+++ xdelta3-0y.dfsg/debian/pycompat	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
diff -Nru xdelta3-0y.dfsg/debian/rules xdelta3-0y.dfsg/debian/rules
--- xdelta3-0y.dfsg/debian/rules	2010-02-22 13:03:45.000000000 +0100
+++ xdelta3-0y.dfsg/debian/rules	2011-05-08 13:27:28.000000000 +0200
@@ -61,7 +61,7 @@
 #	dh_installinfo -i
 #	dh_undocumented -i
 	dh_installchangelogs -i
-	dh_pycentral -i
+	dh_python2 -i
 	dh_link -i
 	dh_compress -i -X.py
 	dh_fixperms -i
@@ -83,7 +83,7 @@
 #	dh_installinfo -a
 #	dh_undocumented -a
 	dh_installchangelogs -a
-	dh_pycentral -a -ppython-xdelta3
+	dh_python2 -a -ppython-xdelta3
 	dh_strip -a
 	dh_link -a
 	dh_compress -a -X.py

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to