Merged branch 'tg/master'.

diff --cc debian/changelog
index 9fd5ce1ef94410f154413ad6925aa27cb3af539f,37960ba0650306f950c8eb3871e5a168fb2793cc..b308eac44bce02988acd6e77f577d09eaa361fc3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,20 +1,68 @@@
 -mlmmj (1.2.15-1.2) unstable; urgency=low
 +mlmmj (1.2.16-0.1) unstable; urgency=low
  
++  [ Sebastian Harl ]
    * Non-maintainer upload.
 -  * Moved files from /var/www/mlmmj-php-web to /usr/share/mlmmj-php-web
 -    and same for mlmmj-php-web-admin (Closes: #553550).
 -  * Added dependency to mlmmj for the mlmmj-php-web package.
 -  * Added ${misc:Depends} dependency for both mlmmj-php-web and
 -    mlmmj-php-web-admin packages.
 -  * Bumped Standard-Version: to 3.8.3.
 -  * Added descriptions in all dpatch patches.
 +  * New upstream release.
 +  * Fixed .diff.gz - do not include the reverse diff to some previous version
 +    (Closes: #516948).
 +  * debian/po/:
 +    - Added sv.po, thanks to Martin Bagge (Closes: #503607).
 +    - Added ja.po, thanks to Hideki Yamane (Closes: #512988).
 +  * debian/control:
 +    - Moved "Homepage" field from package description to the source stanza.
-     - Updated standards-version to 3.8.0.
 +  * debian/attic/:
 +    - Removed. It's the job of a VCS to keep track of old versions.
 +  * debian/mlmmj.templates.old:
 +    - Removed. It's the job of a VCS to keep track of old versions.
 +  * debian/dirs:
 +    - Removed. This file is not needed.
 +  * debian/rules:
 +    - Cleanup: There is no need to have build-arch and build-indep -
 +      especially if the latter is empty. Removed configure from .PHONY to
 +      prevent configure being called twice. Removed unnecessary occurrences of
 +      $(CURDIR).
 +    - Actually pass CFLAGS to configure.
 +    - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary
 +      as well.
 +    - Do not manually install listtexts - the upstream build system takes care
 +      of that itself.
 +    - Do not include the AUTHORS and VERSION files in the binary packages -
 +      they do not contribute any further information.
 +    - Include all upstream README files in the binary packages - the MTA
 +      specific files have been left out so far.
 +    - Install the web-interfaces to /usr/share/PACKAGE/www - /var/www is for
-       the user of the local admin only.
++      the user of the local admin only (Closes: #553548, #553550).
 +  * debian/patches/:
 +    - Added short descriptions to all patches.
 +    - Cleaned up patches: Don't use a custom /bin/sh script to execute the
 +      patches but use dpatch instead. Use prefix "a" and "b" for path names.
 +    - Removed 01_debian_make_mlmmj-ml - instead added mlmmj-make-ml to debian/
 +      directly.
 +    - Removed unused 05_fix_call_to_free.
 +    - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and
 +      mlmmj-unsub manpages.
 +    - Added 01_fix_hyphen_used_as_minus_sign to fix the use of '-' in
 +      manpages.
 +  * debian/bogus-conffiles:
 +    - Removed. This file is not used.
 +  * debian/docs:
 +    - Removed. This file is not needed.
 +  * debian/mlmmj-php-web-admin.apache.conf, debian/mlmmj-php-web.apache.conf:
 +    - Added example configurations for the Apache webserver.
 +
++  [ Thomas Goirand ]
++  * debian/control:
++    - Added dependency to mlmmj for the mlmmj-php-web package.
++    - Added ${misc:Depends} dependency for both mlmmj-php-web and
++      mlmmj-php-web-admin packages.
++    - Bumped Standard-Version to 3.8.3.
++    - Wrote a more comprehensive long description.
++    - Updated homepage field.
+   * Added a README.source
 -  * Wrote a more comprehensive long description.
 -  * Removed useless /usr/sbin dir in the mlmmj package.
 -  * Removed homepage from long description, added a homepage field, and used
 -    the correct new URL (mlmmj.org).
++  * debian/rules:
++    - Removed useless /usr/sbin dir in the mlmmj package.
+ 
 - -- Thomas Goirand <thomas@goirand.fr>  Sat, 02 Jan 2010 07:44:06 +0800
 + -- Sebastian Harl <sh@tokkee.org>  Thu, 05 Mar 2009 13:25:24 +0100
  
  mlmmj (1.2.15-1.1) unstable; urgency=low
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/02_fix_mlmmj_php.dpatch
index 34f8bb759ac72b9a3c93fd1a80b89c82c86f61d5,97c8e1f2241ea9d944ca9dabecf483ec6c747944..2df52a22ef9dc44ad15b6c9d70bce32a05c2b5fe
--- 1/debian/patches/02_fix_mlmmj_php.dpatch
--- 2/debian/patches/02_fix_mlmmj_php.dpatch
+++ b/debian/patches/02_fix_mlmmj_php.dpatch
@@@ -1,14 -1,13 +1,14 @@@
  #! /bin/sh /usr/share/dpatch/dpatch-run
 -## 02_fix_mlmmj_php.dpatch by  <boll@tristram.fork.dk>
 +## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard <boll@tristram.fork.dk>
  ##
 -## All lines beginning with `## DP:' are a description of the patch.
 -## DP: Makes it so that mlmmj-php-web-admin uses the FHS of Debian with correct dirs.
 +## DP: Adapt pathes and settings used in the web interface to match the
- ## DP: installation paths.
++## DP: (FHS compliant) installation paths.
  
  @DPATCH@
 -diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php
 ---- mlmmj-1.2.7/contrib/web/php-admin/conf/config.php 2005-05-12 18:36:37.000000000 +0200
 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php        2005-05-12 18:52:05.000000000 +0200
 +
 +diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php
 +--- a/contrib/web/php-admin/conf/config.php
 ++++ b/contrib/web/php-admin/conf/config.php
  @@ -1,6 +1,6 @@
   <?php
   

diff --cc debian/rules
index 7133dcbaf5be1e7fd2a8788eb732c7ea22bb704c,69e269c808bdbf91d6d09e9b613b7357ff3b1915..ec2b7a98a5ec04173073157231935550cc5caf1a
mode 100755,100644..100644
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -63,47 -69,50 +63,48 @@@ install-arch: buil
        # Don't advertise that mlmmj-make-ml is a shell script
        # And install our own version of mlmmj-make-ml, until upstream 
        # has stabilised somewhat
 -      rm -f $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml.sh
 -      install -m 755 -D $(CURDIR)/debian/mlmmj-make-ml.sh \
 -              $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml
 +      rm -f debian/mlmmj/usr/bin/mlmmj-make-ml.sh
 +      install -m 755 -D debian/mlmmj-make-ml \
 +              debian/mlmmj/usr/bin/mlmmj-make-ml
 +      mv debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.sh.1 \
 +              debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.1
+       rmdir $(CURDIR)/debian/mlmmj/usr/sbin
        dh_install -s
  
 -install-indep: build-indep
 -        # mlmmj-php-web
 -      install -m 644 -D $(CURDIR)/contrib/web/php-user/mlmmj.php \
 -              $(CURDIR)/debian/mlmmj-php-web/usr/share/mlmmj-php-web/mlmmj.php
 -      install -m 644 -D $(CURDIR)/contrib/web/php-user/README \
 -              $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README
 -      install -m 644 -D $(CURDIR)/contrib/web/php-user/example.html \
 -              $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html
 +install-indep:
 +      dh_testdir
 +      dh_testroot
 +      dh_clean -k
 +      dh_installdirs -i
 +
 +      # mlmmj-php-web
 +      install -m 644 -D contrib/web/php-user/mlmmj.php \
 +              $(WEB_DIR)/mlmmj.php
 +      install -m 644 -D contrib/web/php-user/README \
 +              debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README
 +      install -m 644 -D contrib/web/php-user/example.html \
 +              debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html
 +      install -m 644 -D debian/mlmmj-php-web.apache.conf \
 +              debian/mlmmj-php-web/etc/mlmmj-php-web/apache.conf
 +
        # mlmmj-php-web-admin
 -      install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin
 -      install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/*.php \
 -              $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/
 -      install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/dot.htaccess \
 -              $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/.htaccess
 -      install -m 644 -D $(CURDIR)/contrib/web/php-admin/README \
 -              $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README
 -      install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf
 -      install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates
 -      install -m 644 $(CURDIR)/contrib/web/php-admin/conf/* \
 -              $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf/
 -      install -m 644 $(CURDIR)/contrib/web/php-admin/templates/* \
 -              $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates/
 -      install -m 644 -D $(CURDIR)/debian/htpasswd \
 -              $(CURDIR)/debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/htpasswd
 +      install -m 755 -d $(WEB_ADMIN_DIR)
 +      install -m 644 contrib/web/php-admin/htdocs/*.php \
 +              $(WEB_ADMIN_DIR)/
 +      install -m 644 contrib/web/php-admin/htdocs/dot.htaccess \
 +              $(WEB_ADMIN_DIR)/.htaccess
 +      install -m 644 -D contrib/web/php-admin/README \
 +              debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README
 +      install -d debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf
 +      install -d debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates
 +      install -m 644 contrib/web/php-admin/conf/* \
 +              debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf/
 +      install -m 644 contrib/web/php-admin/templates/* \
 +              debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates/
 +      install -m 644 -D debian/htpasswd \
 +              debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/htpasswd
 +      install -m 644 -D debian/mlmmj-php-web-admin.apache.conf \
 +              debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/apache.conf
  
  binary-common:
        dh_testdir