diff -Nru ikiwiki-3.20100623/CHANGELOG ikiwiki-3.20100623ubuntu1/CHANGELOG --- ikiwiki-3.20100623/CHANGELOG 2010-06-23 20:10:32.000000000 +0200 +++ ikiwiki-3.20100623ubuntu1/CHANGELOG 2010-06-25 21:30:22.000000000 +0200 @@ -1,3 +1,12 @@ +ikiwiki (3.20100623ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #598622), remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Lorenzo De Liso Fri, 25 Jun 2010 21:21:23 +0200 + ikiwiki (3.20100623) unstable; urgency=low * openid: Add openid_realm and openid_cgiurl configuration options, @@ -30,7 +39,16 @@ -- Joey Hess Wed, 23 Jun 2010 14:10:26 -0400 -ikiwiki (3.20100610) unstable; urgency=low +ikiwiki (3.20100610ubuntu1) maverick; urgency=low + + * Merge from debian unstable. (LP: #593385) Remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Jean-Louis Dupond Fri, 11 Jun 2010 07:24:35 +0100i + +kiwiki (3.20100610) unstable; urgency=low * creation_day() etc use local time, not gmtime. To match calendars, which use local time. @@ -323,6 +341,15 @@ -- Joey Hess Fri, 12 Feb 2010 16:45:50 -0500 +ikiwiki (3.20100122ubuntu1) lucid; urgency=low + + * Merge from debian unstable: (LP: #520530) + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Leo Iannacone Thu, 11 Feb 2010 11:23:50 +0100 + ikiwiki (3.20100122) unstable; urgency=low * inline: Avoid showing edit links if page editing is disabled. @@ -341,6 +368,15 @@ -- Joey Hess Fri, 22 Jan 2010 16:02:36 -0500 +ikiwiki (3.20100102.3ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining Ubuntu changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Andrea Gasparini Thu, 14 Jan 2010 22:56:29 +0100 + ikiwiki (3.20100102.3) unstable; urgency=low Happy palindrome day! @@ -657,6 +693,15 @@ -- Joey Hess Fri, 12 Jun 2009 19:50:46 -0400 +ikiwiki (3.14ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining Ubuntu changes: (LP: #383914) + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Andrea Gasparini Fri, 05 Jun 2009 14:48:37 +0200 + ikiwiki (3.14) unstable; urgency=low * highlight: New plugin supporting syntax highlighting of pretty much @@ -693,6 +738,15 @@ -- Joey Hess Fri, 22 May 2009 14:10:56 -0400 +ikiwiki (3.12ubuntu1) karmic; urgency=low + + * Merge from debian unstable: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Leo Iannacone Sat, 09 May 2009 22:12:09 +0200 + ikiwiki (3.12) unstable; urgency=low * Re-enable python-support and add python:Depends to control file. @@ -735,6 +789,15 @@ -- Joey Hess Mon, 04 May 2009 15:45:10 -0400 +ikiwiki (3.10ubuntu1) karmic; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes (fixes LP: #368566): + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Tue, 28 Apr 2009 15:11:32 +0200 + ikiwiki (3.10) unstable; urgency=low * darcs: Finally added support for this VCS, thanks to many @@ -753,6 +816,17 @@ -- Joey Hess Sat, 18 Apr 2009 19:40:25 -0400 +ikiwiki (3.09ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + - Set Build-Depends on debhelper to the latest one available for + Ubuntu. + + -- Alessio Treglia Mon, 06 Apr 2009 00:03:02 +0200 + ikiwiki (3.09) unstable; urgency=low * inline: Add title_natural sort order, using Sort::Naturally @@ -772,6 +846,17 @@ -- Joey Hess Sat, 04 Apr 2009 14:33:49 -0400 +ikiwiki (3.08ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove wdg-html-validator from Build-Depends. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + - Downgrade build-dependency on debhelper to the latest one available for + Ubuntu. + + -- Alessio Treglia Wed, 18 Mar 2009 00:21:27 +0100 + ikiwiki (3.08) unstable; urgency=low * git: Fix utf-8 encoding of author names. @@ -781,6 +866,17 @@ -- Joey Hess Sun, 15 Mar 2009 17:54:47 -0400 +ikiwiki (3.07ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop Build-Depends on wdg-html-validator. The xmlns set in the generated + elements causes /usr/bin/validate to attempt to download a file + from w3.org. This doesn't work without Internet access. + - Downgrade build-dependency on debhelper to the latest one available for + Ubuntu. + + -- Alessio Treglia Wed, 11 Mar 2009 19:00:16 +0100 + ikiwiki (3.07) unstable; urgency=low * Updated German translation (Kai Wasserbäch). Closes: #518377 @@ -794,6 +890,17 @@ -- Joey Hess Sun, 08 Mar 2009 19:00:46 -0400 +ikiwiki (3.06ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop Build-Depends on wdg-html-validator. The xmlns set in the generated + elements causes /usr/bin/validate to attempt to download a file + from w3.org. This doesn't work without Internet access. + * Downgrade build-dependency on debhelper to Ubuntu latest one, it works + fine anyway. + + -- Alessio Treglia Tue, 03 Mar 2009 19:01:30 +0100 + ikiwiki (3.06) unstable; urgency=low * Setup automator: Fix bug in password comparison. Closes: #517654 @@ -818,6 +925,15 @@ -- Joey Hess Fri, 27 Feb 2009 15:48:39 -0500 +ikiwiki (3.04ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop Build-Depends on wdg-html-validator. The xmlns set in the generated + elements causes /usr/bin/validate to attempt to download a file + from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Mon, 16 Feb 2009 08:25:01 +0100 + ikiwiki (3.04) unstable; urgency=low * 404: New plugin which lets you use the IkiWiki CGI script as @@ -837,6 +953,15 @@ -- Joey Hess Sat, 14 Feb 2009 02:27:14 -0500 +ikiwiki (3.03ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #323242), Ubuntu remaining changes: + - Remove wdg-html-validator from Build-Depends field. The xmlns set in + the 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, 30 Jan 2009 17:21:28 +0100 + ikiwiki (3.03) unstable; urgency=low * Avoid feeding decoded unicode to Term::ReadLine. Closes: 512169 @@ -855,6 +980,15 @@ -- Joey Hess Thu, 29 Jan 2009 14:36:58 -0500 +ikiwiki (3.02ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #318374), Ubuntu remaining changes: + - Remove wdg-html-validator from Build-Depends field. The xmlns set in + the generated elements causes /usr/bin/validate to attempt to + download a file from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Sun, 18 Jan 2009 09:40:58 +0100 + ikiwiki (3.02) unstable; urgency=low * blogspam: New plugin, adding spam filtering for page editing / comment @@ -882,6 +1016,16 @@ -- Joey Hess Sat, 17 Jan 2009 18:19:39 -0500 +ikiwiki (3.01ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #314307), Ubuntu remaining changes: + - Don't 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 Tue, 06 Jan 2009 10:32:44 +0100 + ikiwiki (3.01) unstable; urgency=low * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories. @@ -894,6 +1038,16 @@ -- Joey Hess Mon, 05 Jan 2009 18:53:50 -0500 +ikiwiki (3.00ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #nnn), Ubuntu remaining changes: + - Don't 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 Sat, 03 Jan 2009 15:31:51 +0100 + ikiwiki (3.00) unstable; urgency=low * Remove support for GlobLists. @@ -964,6 +1118,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. @@ -997,6 +1161,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 @@ -1266,6 +1437,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. @@ -1280,6 +1459,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. @@ -1316,6 +1503,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 ] @@ -1442,6 +1637,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. @@ -1512,6 +1718,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 @@ -1528,6 +1746,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 @@ -1718,6 +1948,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 ikiwiki-3.20100623/debian/changelog ikiwiki-3.20100623ubuntu1/debian/changelog --- ikiwiki-3.20100623/debian/changelog 2010-06-23 20:10:32.000000000 +0200 +++ ikiwiki-3.20100623ubuntu1/debian/changelog 2010-06-25 21:30:22.000000000 +0200 @@ -1,3 +1,12 @@ +ikiwiki (3.20100623ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #598622), remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Lorenzo De Liso Fri, 25 Jun 2010 21:21:23 +0200 + ikiwiki (3.20100623) unstable; urgency=low * openid: Add openid_realm and openid_cgiurl configuration options, @@ -30,7 +39,16 @@ -- Joey Hess Wed, 23 Jun 2010 14:10:26 -0400 -ikiwiki (3.20100610) unstable; urgency=low +ikiwiki (3.20100610ubuntu1) maverick; urgency=low + + * Merge from debian unstable. (LP: #593385) Remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Jean-Louis Dupond Fri, 11 Jun 2010 07:24:35 +0100i + +kiwiki (3.20100610) unstable; urgency=low * creation_day() etc use local time, not gmtime. To match calendars, which use local time. @@ -323,6 +341,15 @@ -- Joey Hess Fri, 12 Feb 2010 16:45:50 -0500 +ikiwiki (3.20100122ubuntu1) lucid; urgency=low + + * Merge from debian unstable: (LP: #520530) + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Leo Iannacone Thu, 11 Feb 2010 11:23:50 +0100 + ikiwiki (3.20100122) unstable; urgency=low * inline: Avoid showing edit links if page editing is disabled. @@ -341,6 +368,15 @@ -- Joey Hess Fri, 22 Jan 2010 16:02:36 -0500 +ikiwiki (3.20100102.3ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining Ubuntu changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Andrea Gasparini Thu, 14 Jan 2010 22:56:29 +0100 + ikiwiki (3.20100102.3) unstable; urgency=low Happy palindrome day! @@ -657,6 +693,15 @@ -- Joey Hess Fri, 12 Jun 2009 19:50:46 -0400 +ikiwiki (3.14ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining Ubuntu changes: (LP: #383914) + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Andrea Gasparini Fri, 05 Jun 2009 14:48:37 +0200 + ikiwiki (3.14) unstable; urgency=low * highlight: New plugin supporting syntax highlighting of pretty much @@ -693,6 +738,15 @@ -- Joey Hess Fri, 22 May 2009 14:10:56 -0400 +ikiwiki (3.12ubuntu1) karmic; urgency=low + + * Merge from debian unstable: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Leo Iannacone Sat, 09 May 2009 22:12:09 +0200 + ikiwiki (3.12) unstable; urgency=low * Re-enable python-support and add python:Depends to control file. @@ -735,6 +789,15 @@ -- Joey Hess Mon, 04 May 2009 15:45:10 -0400 +ikiwiki (3.10ubuntu1) karmic; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes (fixes LP: #368566): + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Tue, 28 Apr 2009 15:11:32 +0200 + ikiwiki (3.10) unstable; urgency=low * darcs: Finally added support for this VCS, thanks to many @@ -753,6 +816,17 @@ -- Joey Hess Sat, 18 Apr 2009 19:40:25 -0400 +ikiwiki (3.09ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + - Set Build-Depends on debhelper to the latest one available for + Ubuntu. + + -- Alessio Treglia Mon, 06 Apr 2009 00:03:02 +0200 + ikiwiki (3.09) unstable; urgency=low * inline: Add title_natural sort order, using Sort::Naturally @@ -772,6 +846,17 @@ -- Joey Hess Sat, 04 Apr 2009 14:33:49 -0400 +ikiwiki (3.08ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove wdg-html-validator from Build-Depends. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + - Downgrade build-dependency on debhelper to the latest one available for + Ubuntu. + + -- Alessio Treglia Wed, 18 Mar 2009 00:21:27 +0100 + ikiwiki (3.08) unstable; urgency=low * git: Fix utf-8 encoding of author names. @@ -781,6 +866,17 @@ -- Joey Hess Sun, 15 Mar 2009 17:54:47 -0400 +ikiwiki (3.07ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop Build-Depends on wdg-html-validator. The xmlns set in the generated + elements causes /usr/bin/validate to attempt to download a file + from w3.org. This doesn't work without Internet access. + - Downgrade build-dependency on debhelper to the latest one available for + Ubuntu. + + -- Alessio Treglia Wed, 11 Mar 2009 19:00:16 +0100 + ikiwiki (3.07) unstable; urgency=low * Updated German translation (Kai Wasserbäch). Closes: #518377 @@ -794,6 +890,17 @@ -- Joey Hess Sun, 08 Mar 2009 19:00:46 -0400 +ikiwiki (3.06ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop Build-Depends on wdg-html-validator. The xmlns set in the generated + elements causes /usr/bin/validate to attempt to download a file + from w3.org. This doesn't work without Internet access. + * Downgrade build-dependency on debhelper to Ubuntu latest one, it works + fine anyway. + + -- Alessio Treglia Tue, 03 Mar 2009 19:01:30 +0100 + ikiwiki (3.06) unstable; urgency=low * Setup automator: Fix bug in password comparison. Closes: #517654 @@ -818,6 +925,15 @@ -- Joey Hess Fri, 27 Feb 2009 15:48:39 -0500 +ikiwiki (3.04ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: + - Drop Build-Depends on wdg-html-validator. The xmlns set in the generated + elements causes /usr/bin/validate to attempt to download a file + from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Mon, 16 Feb 2009 08:25:01 +0100 + ikiwiki (3.04) unstable; urgency=low * 404: New plugin which lets you use the IkiWiki CGI script as @@ -837,6 +953,15 @@ -- Joey Hess Sat, 14 Feb 2009 02:27:14 -0500 +ikiwiki (3.03ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #323242), Ubuntu remaining changes: + - Remove wdg-html-validator from Build-Depends field. The xmlns set in + the 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, 30 Jan 2009 17:21:28 +0100 + ikiwiki (3.03) unstable; urgency=low * Avoid feeding decoded unicode to Term::ReadLine. Closes: 512169 @@ -855,6 +980,15 @@ -- Joey Hess Thu, 29 Jan 2009 14:36:58 -0500 +ikiwiki (3.02ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #318374), Ubuntu remaining changes: + - Remove wdg-html-validator from Build-Depends field. The xmlns set in + the generated elements causes /usr/bin/validate to attempt to + download a file from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Sun, 18 Jan 2009 09:40:58 +0100 + ikiwiki (3.02) unstable; urgency=low * blogspam: New plugin, adding spam filtering for page editing / comment @@ -882,6 +1016,16 @@ -- Joey Hess Sat, 17 Jan 2009 18:19:39 -0500 +ikiwiki (3.01ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #314307), Ubuntu remaining changes: + - Don't 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 Tue, 06 Jan 2009 10:32:44 +0100 + ikiwiki (3.01) unstable; urgency=low * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories. @@ -894,6 +1038,16 @@ -- Joey Hess Mon, 05 Jan 2009 18:53:50 -0500 +ikiwiki (3.00ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #nnn), Ubuntu remaining changes: + - Don't 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 Sat, 03 Jan 2009 15:31:51 +0100 + ikiwiki (3.00) unstable; urgency=low * Remove support for GlobLists. @@ -964,6 +1118,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. @@ -997,6 +1161,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 @@ -1266,6 +1437,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. @@ -1280,6 +1459,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. @@ -1316,6 +1503,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 ] @@ -1442,6 +1637,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. @@ -1512,6 +1718,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 @@ -1528,6 +1746,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 @@ -1718,6 +1948,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 ikiwiki-3.20100623/debian/control ikiwiki-3.20100623ubuntu1/debian/control --- ikiwiki-3.20100623/debian/control 2010-06-12 20:21:19.000000000 +0200 +++ ikiwiki-3.20100623ubuntu1/debian/control 2010-06-25 21:23:06.000000000 +0200 @@ -5,10 +5,11 @@ 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-scrubber-perl, libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34), libfile-chdir-perl, -Maintainer: Joey Hess +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.4 Homepage: http://ikiwiki.info/