Control: tags 786023 + patch
Dear maintainer,
I've prepared an NMU for xmldiff (versioned as 0.6.10-2.1). The diff
is attached to this message.
Regards.
diff -u xmldiff-0.6.10/debian/changelog xmldiff-0.6.10/debian/changelog
--- xmldiff-0.6.10/debian/changelog
+++ xmldiff-0.6.10/debian/changelog
@@ -1,3 +1,15 @@
+xmldiff (0.6.10-2.1) unstable; urgency=medium
+
+ [ Benjamin Drung ]
+ * Non-maintainer upload.
+ * Port from python-support to dh_python (Closes: #786023)
+ * Add missing ${misc:Depends} to dependencies
+
+ [ Stefano Rivera ]
+ * Drop pycompat, it's not useful or used.
+
+ -- Benjamin Drung <bdr...@debian.org> Wed, 19 Aug 2015 22:10:43 +0200
+
xmldiff (0.6.10-2) unstable; urgency=low
* Fixed Uploaders field in debian/control (closes: #602619)
diff -u xmldiff-0.6.10/debian/control xmldiff-0.6.10/debian/control
--- xmldiff-0.6.10/debian/control
+++ xmldiff-0.6.10/debian/control
@@ -6,14 +6,13 @@
Alexandre Fayolle <alexandre.fayo...@logilab.fr>,
Emile Anclin <emile.anc...@logilab.fr>,
Alain Leufroy <alain.leuf...@logilab.fr>
-Build-Depends: debhelper (>= 5.0.38), python (>=2.4.6-2), python-dev (>=2.4.6-2), python-support
+Build-Depends: debhelper (>= 5.0.38), dh-python, python (>=2.4.6-2), python-dev (>=2.4.6-2)
Standards-Version: 3.8.3
-XS-Python-Version: current
Homepage: http://www.logilab.org/project/xmldiff
Package: xmldiff
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python2.3-xmldiff
Replaces: python2.3-xmldiff
XB-Python-Version: ${python:Versions}
@@ -30,7 +29,7 @@
Package: xmldiff-xmlrev
Architecture: all
-Depends: xmldiff, libxml2-utils, xsltproc, sp
+Depends: xmldiff, libxml2-utils, xsltproc, sp, ${misc:Depends}
Recommends: docbook-xsl
Description: xmldiff output formatter
xmlrev can be used to display the differences between two XML
reverted:
--- xmldiff-0.6.10/debian/pycompat
+++ xmldiff-0.6.10.orig/debian/pycompat
@@ -1 +0,0 @@
-2
diff -u xmldiff-0.6.10/debian/rules xmldiff-0.6.10/debian/rules
--- xmldiff-0.6.10/debian/rules
+++ xmldiff-0.6.10/debian/rules
@@ -67,7 +67,7 @@
dh_testroot -a
dh_install -a
dh_installman -a
- dh_pysupport -p xmldiff
+ dh_python2 -p xmldiff
gzip -9 -c ChangeLog > changelog.gz
dh_installdocs -a -A README TODO changelog.gz
dh_installchangelogs -a
only in patch2:
unchanged:
--- xmldiff-0.6.10.orig/debian/source/format
+++ xmldiff-0.6.10/debian/source/format
@@ -0,0 +1 @@
+1.0
