turn python-support back on

Should wait to upload until ikiwiki is fixed in testing.

diff --git a/debian/changelog b/debian/changelog
index c40bc4de0417f418ed43a3a9c53e0559871e9273..ba67ce8c784b7c1b28dae67a27b4015412a4c06b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.12) UNRELEASED; urgency=low
+
+  * Re-enable python-support and add python:Depends to control file.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 May 2009 19:17:39 -0400
+
 ikiwiki (3.11) unstable; urgency=low
 
   * Avoid using python-support. Closes: #525086

diff --git a/debian/control b/debian/control
index e89f25d046935971f22942d918b2a9d36244f06f..57c5f917ae3795ea9e50948b78f6669121c8ebc9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ikiwiki
 Section: web
 Priority: optional
-Build-Depends: perl, debhelper (>= 7.2.9)
+Build-Depends: perl, debhelper (>= 7.0.50)
 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},
+Depends: ${misc:Depends}, ${perl:Depends}, ${python: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 3541d348df82f5056688f50b092126e58c1ab46d..0a7ce7a267e43c0999d6e468f7e6844abbc8d660 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-       dh --without=python-support $@
+       dh $@
 
 override_dh_auto_configure:
        # keeps it out of /usr/local