Merge branch 'master' into master-experimental

diff --cc debian/changelog
index e216f9939cc95fd05374c842b8ee08b7718c63f4,282e6b58e9a7bf8e4fbbca622c8999ae5348b109..5c3c0caa20fbb0eba677b00faee6ca1614c7d3a3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,16 +1,49 @@@
 +lsb (4.1+Debian0~exp0) experimental; urgency=low
 +
 +  [ Till Kamppeter ]
 +  * Add the "lsb-invalid-mta" package, with a fake sendmail. This allows
 +    the installation of LSB packages to not pull in an MTA any more,
 +    which once adds awkward configuration questions to the installation
 +    process and second adds an often unnneeded daemon to the system.
 +    (LP: #141641)
 +
 +  [ Didier Raboud ]
 +  * Upgrade to support LSB 4.1. (Closes: #586191, LP: #385606, #386128)
 +    LSB changes:
 +     - Bump Depends:
 +       - on libglib2.0-0  to >= 2.12.13;
 +       - on fontconfig    to >= 2.6.0;
 +       - on libglib2.0-0  to >= 2.12.13;
 +       - on libatk1.0-0   to >= 1.10.3;
 +       - on libpango1.0-0 to >= 1.10.4;
 +       - on libgtk2.0-0   to >= 2.10.14;
 +     - Add Depends:
 +       - on libglu1;
 +       - on libcairo2     to >= 1.2.0;
 +       - on libxtst6;
 +       - on ghostscript-cups;
 +     - In lsb, bump lsb-printing from Suggests to Depends.
 +     - Add the lsb-security package.
 +     - Drop the now-obsolete lsb-qt4 package.
 +    Debian changes:
 +     - libgl1-mesa-glx is the first alternative for libgl1;
 +     - Make sure all packages have ${misc:Depends}.
 +
 + -- Didier Raboud <odyx@debian.org>  Mon, 05 Mar 2012 22:42:21 +0100
 +
+ lsb (3.2+Debian31) unstable; urgency=low
+ 
+   [ Didier Raboud ]
+   * Correct a bug number in the 3.2+Debian30 upload.
+   * Promote lsb-release to Priority: optional.
+   * Fix both unused and undeclared local variables in pidofproc.
+     (Closes: #663351)
+ 
+   [ Peter Eisentraut ]
+   * Handle non-world-readable pid files. (Closes: #653598)
+ 
+  -- Didier Raboud <odyx@debian.org>  Sun, 11 Mar 2012 15:04:47 +0100
+ 
  lsb (3.2+Debian30) unstable; urgency=low
  
    * Drop Depends on essentials sed & ncurses-bin. (Closes: #488237)

diff --cc debian/control
Simple merge