From 3177b3f76b429dedca16277e77d19534d34a16ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Apr 2009 21:46:01 -0400 Subject: Add python:Depends to control file. Closes: #525086 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index a00fd72cc..df4c2d649 100644 --- a/debian/control +++ b/debian/control @@ -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 -- cgit v1.2.3 From 39c8d072e83290e73e50bffda8459ade9a208159 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 May 2009 14:41:21 -0400 Subject: 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. --- debian/changelog | 2 +- debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/control') 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 -- cgit v1.2.3 From 8455036ed0a4763b4788a50a071db23bdbcdc409 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 May 2009 16:33:10 -0400 Subject: releasing version 3.11 --- debian/changelog | 4 ++-- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index be85a0c2b..c40bc4de0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.11) UNRELEASED; urgency=low +ikiwiki (3.11) unstable; urgency=low * Avoid using python-support. Closes: #525086 * websetup: Display stderr in browser if ikiwiki setup fails. @@ -22,7 +22,7 @@ ikiwiki (3.11) UNRELEASED; urgency=low * Updated Danish translation from Jonas Smedegaard. Closes: #525751 * translation.mdwn: Typo fixes. Closes: #525753 - -- Joey Hess Tue, 21 Apr 2009 21:41:38 -0400 + -- Joey Hess Mon, 04 May 2009 15:45:10 -0400 ikiwiki (3.10) unstable; urgency=low diff --git a/debian/control b/debian/control index 28630b853..e89f25d04 100644 --- a/debian/control +++ b/debian/control @@ -9,14 +9,14 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libhtml-parser-perl, liburi-perl, perlmagick Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all -Depends: ${misc:Depends}, ${perl:Depends} +Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl -- cgit v1.2.3 From 5e5bb93adbce76431771d6d56faefbfef99d359f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 May 2009 19:17:59 -0400 Subject: turn python-support back on Should wait to upload until ikiwiki is fixed in testing. --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'debian/control') 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 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 -- cgit v1.2.3