aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-04 14:41:21 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-04 14:41:21 -0400
commit39c8d072e83290e73e50bffda8459ade9a208159 (patch)
tree317447853cee9878d55adbdd27e085f78d06863e
parent8d5cd865932b0c0feb1a398e5cde31de262a7649 (diff)
downloadikiwiki-39c8d072e83290e73e50bffda8459ade9a208159.tar
ikiwiki-39c8d072e83290e73e50bffda8459ade9a208159.tar.gz
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.
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules2
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index f4c4266d2..be85a0c2b 100644
--- 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 df4c2d649..28630b853 100644
--- 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 0a7ce7a26..3541d348d 100755
--- 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