diff -Nru ikiwiki-3.00/CHANGELOG ikiwiki-3.00ubuntu1/CHANGELOG --- ikiwiki-3.00/CHANGELOG 2008-12-31 21:17:49.000000000 +0100 +++ ikiwiki-3.00ubuntu1/CHANGELOG 2009-01-01 19:07:04.000000000 +0100 @@ -1,3 +1,13 @@ +ikiwiki (3.00ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #nnn), Ubuntu remaining changes: + - Removed build-depend on wdg-html-validator. The xmlns now set in + generated elements causes /usr/bin/validate to attempt + to download a file from w3.org. This doesn't work without + Internet access. + + -- Alessio Treglia Thu, 01 Jan 2009 19:01:14 +0100 + ikiwiki (3.00) unstable; urgency=low * Remove support for GlobLists. @@ -20,7 +30,7 @@ * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite if it is not present. * French translation update from Philippe Batailler. Closes: #510216 - * websetup: Avoid a crash when a new array setup item has been added in + * websetup: Avoid a crash when a new array setup item has been added in a new ikiwiki release, and is thus not present in the setup file yet. -- Joey Hess Wed, 31 Dec 2008 15:17:47 -0500 @@ -68,6 +78,16 @@ -- Joey Hess Sun, 21 Dec 2008 16:22:05 -0500 +ikiwiki (2.70ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #297345), Ubuntu remaining changes: + - Removed build-depend on wdg-html-validator. The xmlns now set in + generated elements causes /usr/bin/validate to attempt + to download a file from w3.org. This doesn't work without + Internet access. + + -- Alessio Treglia Fri, 14 Nov 2008 09:22:46 +0100 + ikiwiki (2.70) unstable; urgency=low * Avoid crash on malformed utf-8 discovered by intrigeri. @@ -101,6 +121,13 @@ -- Joey Hess Tue, 11 Nov 2008 20:35:55 -0500 +ikiwiki (2.68ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #257549), Ubuntu remaining changes: + - Remove build-depend on wdg-html-validator. + + -- Alessio Treglia Tue, 04 Nov 2008 23:23:06 +0100 + ikiwiki (2.68) unstable; urgency=low * Add support for checking pushes from untrusted git committers. This can be @@ -131,8 +158,8 @@ * inline: Only the last feed link was put on the page, fix this to include all feed links. So rss will be included along with atom, and pages with multiple feeds will get links added for all feeds. - * tag: When tagbase is set, force the links created by tagging to point at - the toplevel tagbase, and not closer subpages. The html links already went + * tag: When tagpage is set, force the links created by tagging to point at + the toplevel tagpage, and not closer subpages. The html links already went there, but internally the links were not recorded as absolute, which could cause confusing backlinks etc. * Add an inject function, that can be used by plugins that want to @@ -370,6 +397,14 @@ -- Joey Hess Tue, 12 Aug 2008 14:20:25 -0400 +ikiwiki (2.56ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, Ubuntu remaining changes (LP: #254615): + - Removed build-depend on wdg-html-validator. + - Added build-depend on liblocale-gettext-perl. Fixes FTBFS. + + -- Alessio Treglia Mon, 04 Aug 2008 13:18:04 +0200 + ikiwiki (2.56) unstable; urgency=low * autoindex: New plugin that generates missing index pages. @@ -384,6 +419,14 @@ -- Joey Hess Thu, 31 Jul 2008 19:25:24 -0400 +ikiwiki (2.55ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + Dont build-depend on wdg-html-validator. + + Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + -- Emanuele Gentili Fri, 01 Aug 2008 13:45:41 +0200 + ikiwiki (2.55) unstable; urgency=low * remove: New plugin that adds the ability to remove pages via the web. @@ -420,6 +463,14 @@ -- Joey Hess Sun, 27 Jul 2008 11:23:13 -0400 +ikiwiki (2.54ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes (LP: #251550): + - Dont build-depend on wdg-html-validator. + - Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + -- Alessio Treglia Thu, 24 Jul 2008 18:38:56 +0200 + ikiwiki (2.54) unstable; urgency=low [ Joey Hess ] @@ -546,6 +597,17 @@ -- Joey Hess Sun, 29 Jun 2008 14:09:37 -0400 +ikiwiki (2.50ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + - Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Albin Tonnerre Fri, 20 Jun 2008 19:48:16 +0200 + ikiwiki (2.50) unstable; urgency=low * img: Support captions. @@ -616,6 +678,18 @@ -- Joey Hess Sun, 25 May 2008 14:25:42 -0400 +ikiwiki (2.46ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: (LP: #230052) + + Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Emanuele Gentili Tue, 13 May 2008 20:47:29 +0200 + ikiwiki (2.46) unstable; urgency=low * amazon_s3: New plugin, which injects wiki pages into Amazon S3, allowing @@ -632,6 +706,18 @@ -- Joey Hess Mon, 12 May 2008 20:51:50 -0400 +ikiwiki (2.45ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: (LP: #227289) + + Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Emanuele Gentili Tue, 06 May 2008 14:43:02 +0200 + ikiwiki (2.45) unstable; urgency=low * toc: Add the table of contents at sanitize time, rather than at format @@ -822,6 +908,22 @@ -- Joey Hess Fri, 29 Feb 2008 23:05:39 -0500 +ikiwiki (2.32.3ubuntu2) hardy; urgency=low + + * Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- William Grant Mon, 24 Mar 2008 00:55:52 +1100 + +ikiwiki (2.32.3ubuntu1) hardy; urgency=low + + * Build-depend on liblocale-gettext-perl. Fixes FTBFS. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- William Grant Sun, 23 Mar 2008 15:53:25 +1100 + ikiwiki (2.31.3) unstable; urgency=high [ Josh Triplett ] diff -Nru /tmp/G6Fh6R3VdW/ikiwiki-3.00/debian/changelog /tmp/7fKkNmENdT/ikiwiki-3.00ubuntu1/debian/changelog --- ikiwiki-3.00/debian/changelog 2008-12-31 21:17:49.000000000 +0100 +++ ikiwiki-3.00ubuntu1/debian/changelog 2009-01-01 19:07:04.000000000 +0100 @@ -1,3 +1,13 @@ +ikiwiki (3.00ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #nnn), Ubuntu remaining changes: + - Removed build-depend on wdg-html-validator. The xmlns now set in + generated elements causes /usr/bin/validate to attempt + to download a file from w3.org. This doesn't work without + Internet access. + + -- Alessio Treglia Thu, 01 Jan 2009 19:01:14 +0100 + ikiwiki (3.00) unstable; urgency=low * Remove support for GlobLists. @@ -20,7 +30,7 @@ * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite if it is not present. * French translation update from Philippe Batailler. Closes: #510216 - * websetup: Avoid a crash when a new array setup item has been added in + * websetup: Avoid a crash when a new array setup item has been added in a new ikiwiki release, and is thus not present in the setup file yet. -- Joey Hess Wed, 31 Dec 2008 15:17:47 -0500 @@ -68,6 +78,16 @@ -- Joey Hess Sun, 21 Dec 2008 16:22:05 -0500 +ikiwiki (2.70ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #297345), Ubuntu remaining changes: + - Removed build-depend on wdg-html-validator. The xmlns now set in + generated elements causes /usr/bin/validate to attempt + to download a file from w3.org. This doesn't work without + Internet access. + + -- Alessio Treglia Fri, 14 Nov 2008 09:22:46 +0100 + ikiwiki (2.70) unstable; urgency=low * Avoid crash on malformed utf-8 discovered by intrigeri. @@ -101,6 +121,13 @@ -- Joey Hess Tue, 11 Nov 2008 20:35:55 -0500 +ikiwiki (2.68ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #257549), Ubuntu remaining changes: + - Remove build-depend on wdg-html-validator. + + -- Alessio Treglia Tue, 04 Nov 2008 23:23:06 +0100 + ikiwiki (2.68) unstable; urgency=low * Add support for checking pushes from untrusted git committers. This can be @@ -131,8 +158,8 @@ * inline: Only the last feed link was put on the page, fix this to include all feed links. So rss will be included along with atom, and pages with multiple feeds will get links added for all feeds. - * tag: When tagbase is set, force the links created by tagging to point at - the toplevel tagbase, and not closer subpages. The html links already went + * tag: When tagpage is set, force the links created by tagging to point at + the toplevel tagpage, and not closer subpages. The html links already went there, but internally the links were not recorded as absolute, which could cause confusing backlinks etc. * Add an inject function, that can be used by plugins that want to @@ -370,6 +397,14 @@ -- Joey Hess Tue, 12 Aug 2008 14:20:25 -0400 +ikiwiki (2.56ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, Ubuntu remaining changes (LP: #254615): + - Removed build-depend on wdg-html-validator. + - Added build-depend on liblocale-gettext-perl. Fixes FTBFS. + + -- Alessio Treglia Mon, 04 Aug 2008 13:18:04 +0200 + ikiwiki (2.56) unstable; urgency=low * autoindex: New plugin that generates missing index pages. @@ -384,6 +419,14 @@ -- Joey Hess Thu, 31 Jul 2008 19:25:24 -0400 +ikiwiki (2.55ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + Dont build-depend on wdg-html-validator. + + Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + -- Emanuele Gentili Fri, 01 Aug 2008 13:45:41 +0200 + ikiwiki (2.55) unstable; urgency=low * remove: New plugin that adds the ability to remove pages via the web. @@ -420,6 +463,14 @@ -- Joey Hess Sun, 27 Jul 2008 11:23:13 -0400 +ikiwiki (2.54ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes (LP: #251550): + - Dont build-depend on wdg-html-validator. + - Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + -- Alessio Treglia Thu, 24 Jul 2008 18:38:56 +0200 + ikiwiki (2.54) unstable; urgency=low [ Joey Hess ] @@ -546,6 +597,17 @@ -- Joey Hess Sun, 29 Jun 2008 14:09:37 -0400 +ikiwiki (2.50ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + - Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Albin Tonnerre Fri, 20 Jun 2008 19:48:16 +0200 + ikiwiki (2.50) unstable; urgency=low * img: Support captions. @@ -616,6 +678,18 @@ -- Joey Hess Sun, 25 May 2008 14:25:42 -0400 +ikiwiki (2.46ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: (LP: #230052) + + Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Emanuele Gentili Tue, 13 May 2008 20:47:29 +0200 + ikiwiki (2.46) unstable; urgency=low * amazon_s3: New plugin, which injects wiki pages into Amazon S3, allowing @@ -632,6 +706,18 @@ -- Joey Hess Mon, 12 May 2008 20:51:50 -0400 +ikiwiki (2.45ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: (LP: #227289) + + Build-depend on liblocale-gettext-perl. Fixes FTBFS. + + Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Emanuele Gentili Tue, 06 May 2008 14:43:02 +0200 + ikiwiki (2.45) unstable; urgency=low * toc: Add the table of contents at sanitize time, rather than at format @@ -822,6 +908,22 @@ -- Joey Hess Fri, 29 Feb 2008 23:05:39 -0500 +ikiwiki (2.32.3ubuntu2) hardy; urgency=low + + * Dont build-depend on wdg-html-validator. Fixes FTBFS. The xmlns now set in + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- William Grant Mon, 24 Mar 2008 00:55:52 +1100 + +ikiwiki (2.32.3ubuntu1) hardy; urgency=low + + * Build-depend on liblocale-gettext-perl. Fixes FTBFS. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- William Grant Sun, 23 Mar 2008 15:53:25 +1100 + ikiwiki (2.31.3) unstable; urgency=high [ Josh Triplett ] diff -Nru /tmp/G6Fh6R3VdW/ikiwiki-3.00/debian/control /tmp/7fKkNmENdT/ikiwiki-3.00ubuntu1/debian/control --- ikiwiki-3.00/debian/control 2008-12-29 21:06:06.000000000 +0100 +++ ikiwiki-3.00ubuntu1/debian/control 2009-01-01 19:00:52.000000000 +0100 @@ -2,8 +2,9 @@ Section: web Priority: optional Build-Depends: perl, debhelper (>= 5) -Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick -Maintainer: Joey Hess +Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libhtml-parser-perl, liburi-perl, perlmagick +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.0 Homepage: http://ikiwiki.info/