diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-05-04 19:17:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-05-04 19:17:59 -0400 |
| commit | 5e5bb93adbce76431771d6d56faefbfef99d359f (patch) | |
| tree | 4c53215d986d5e37d77a8c876ea477002fd39582 | |
| parent | dd175cda8743068d12dd34b5c89e9fba6bd114c9 (diff) | |
| download | ikiwiki-5e5bb93adbce76431771d6d56faefbfef99d359f.tar ikiwiki-5e5bb93adbce76431771d6d56faefbfef99d359f.tar.gz | |
turn python-support back on
Should wait to upload until ikiwiki is fixed in testing.
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index c40bc4de0..ba67ce8c7 100644 --- 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 e89f25d04..57c5f917a 100644 --- 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 3541d348d..0a7ce7a26 100755 --- 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 |