From: Gerfried Fuchs Date: Tue, 9 Sep 2008 10:27:49 +0000 (+0200) Subject: Merge commit 'debian/2.1.1-1' into debian X-Git-Tag: debian/2.1.2-2~21 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=ab610a555d860fd48269af15fae725e640489914;p=pkg%2Fblosxom.git Merge commit 'debian/2.1.1-1' into debian Conflicts: debian/changelog --- ab610a555d860fd48269af15fae725e640489914 diff --cc debian/changelog index ee0b4f0,1c38eed..e795dec --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,21 +1,27 @@@ - blosxom (2.1.0-2) unstable; urgency=low ++blosxom (2.1.1-2) unstable; urgency=low + + * Corrected Axel's email address in Uploaders field, sorry. + + -- Gerfried Fuchs Wed, 20 Aug 2008 13:44:35 +0200 + + blosxom (2.1.1-1) unstable; urgency=low + + [ Gerfried Fuchs ] + * New upstream release which fixes a regression from the previous blosxom + 2.0 version we have currently in stable (closes: #492987) + * Add Vcs-* informations to source control file. + * Forgot to mention in the previous upload that I added Axel Beckert as + Co-Maintainer. Welcome on board. :) + * Update debian/README.Debian with more current informations, especially + related to referencing the proper URLs (closes: #492985) + * Add the moved $encode_xml_entities config option to blosxom.conf, too. + + [ Axel Beckert ] + * Clearified debian/NEWS.Debian with respect to rss aggregators. + * Fix copyright year information for Rael on blosxom.cgi. + + -- Gerfried Fuchs Thu, 07 Aug 2008 17:15:31 -0300 + blosxom (2.1.0-1) unstable; urgency=low * New upstream release which did incorporate all patches and in parts also diff --cc debian/control index 2a83059,0644ce9..3390305 --- a/debian/control +++ b/debian/control @@@ -2,9 -2,11 +2,11 @@@ Source: blosxo Section: web Priority: optional Maintainer: Gerfried Fuchs -Uploaders: Axel Beckert +Uploaders: Axel Beckert Standards-Version: 3.8.0 Homepage: http://blosxom.sourceforge.net/ + Vcs-Git: git://repo.or.cz/blosxom.git + Vcs-Browser: http://repo.or.cz/r/blosxom.git Package: blosxom Architecture: all