Avoid using python-support. Closes: #525086

Uses new debhelper feature to turn off python-support.

The tiny python module included herein certianly doesn't
need all the python-support nonsense.

diff --git a/debian/changelog b/debian/changelog
index f4c4266d2cc4cc683d1895f67832c6d041e20cf6..be85a0c2b4b20a7b727fc533ba9de3c57f610db3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ikiwiki (3.11) UNRELEASED; urgency=low
 
-  * Add python:Depends to control file. Closes: #525086
+  * Avoid using python-support. Closes: #525086
   * websetup: Display stderr in browser if ikiwiki setup fails.
   * blogspam: Load RPC::XML library in checkconfig, so that an
     error can be printed at that point if it's not available,

diff --git a/debian/control b/debian/control
index df4c2d64904d0e0efb1cde5d16c70606253ac454..28630b8539b5bf08cac9b65b7bd72d79244bb9e6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ikiwiki
 Section: web
 Priority: optional
-Build-Depends: perl, debhelper (>= 7.0.50)
+Build-Depends: perl, debhelper (>= 7.2.9)
 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtext-markdown-perl | markdown, 
   libtimedate-perl, libhtml-template-perl,
@@ -16,7 +16,7 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
 
 Package: ikiwiki
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}
   libtext-markdown-perl | markdown,
   libhtml-scrubber-perl, libhtml-template-perl,
   libhtml-parser-perl, liburi-perl

diff --git a/debian/rules b/debian/rules
index 0a7ce7a267e43c0999d6e468f7e6844abbc8d660..3541d348df82f5056688f50b092126e58c1ab46d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-       dh $@
+       dh --without=python-support $@
 
 override_dh_auto_configure:
        # keeps it out of /usr/local