Merge commit 'debian/2.1.1-1' into debian

Conflicts:

	debian/changelog

diff --cc debian/changelog
index ee0b4f000f6851337111fb4b7c4099d4144d413d,1c38eed80da960f9d187a4474c26b74356c2f54a..e795decdaae9533226bcc796a9898cba50d59f96
--- 1/debian/changelog
--- 2/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 <rhonda@debian.at>  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 <rhonda@debian.at>  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 2a830595c98c76656140ee104a28ede914cb2475,0644ce9ddd7c830e4fdb7bb8a55a07b06a1e5ed7..33903050df8871b9693469f30f49ee42810cf9d4
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,9 -2,11 +2,11 @@@ Source: blosxo
  Section: web
  Priority: optional
  Maintainer: Gerfried Fuchs <rhonda@debian.at>
 -Uploaders: Axel Beckert <be@deuxchevaux.org>
 +Uploaders: Axel Beckert <abe@deuxchevaux.org>
  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