Merged branch 'tg/master'.

diff --combined 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 --combined debian/control
index dd65aadfb94dcfea3d4e0dc87168cd2ccff21f11,89af9b1d4a51e54bb0cedb121280cfa44ebc78d5..5306a187e39d18417ccf30391b936a0cfa5bcd6a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: mai
  Priority: optional
  Maintainer: Daniel Walrond <debian@djw.org.uk>
  Build-Depends: debhelper (>= 5), dpatch, sharutils
- Standards-Version: 3.8.0
- Homepage: http://mlmmj.mmj.dk/
+ Standards-Version: 3.8.3
+ Homepage: http://mlmmj.org/
  
  Package: mlmmj
  Architecture: any
@@@ -28,16 -28,20 +28,19 @@@ Description: mail server independent ma
    * Functionality to retrieve old posts
    * Various web interfaces
    * VERP support
 - .
  
  Package: mlmmj-php-web
  Architecture: all
- Depends: php5 | php4
+ Depends: ${misc:Depends}, mlmmj, php5 | php4
  Description: web interface for mlmmj, written in php
-  Web based tools for mlmmj written in php.
+  A web based tool for mlmmj written in php, so that your users can subscribe
+  or unsubscribe through some HTML forms, which sometimes, might be more
+  convenient than just using the list commands.
  
  Package: mlmmj-php-web-admin
  Architecture: all
- Depends: mlmmj, php5 | php4
+ Depends: ${misc:Depends}, mlmmj, php5 | php4
  Description: administrative web interface for mlmmj, written in php
-  Web based administrative tools for mlmmj written in php.
- 
+  This web based administrative tool for mlmmj written in php will help you
+  to configure each mailing list individualy, through the web. You will be
+  able with mlmmj-php-web-admin to set each individual tunable of the list.

diff --combined 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
   
@@@ -17,19 -16,20 +17,19 @@@
  +$templatedir = "/usr/share/mlmmj-php-web-admin/templates/";
   
   ?>
 -diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess
 ---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess     2005-05-12 18:36:37.000000000 +0200
 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess    2005-05-12 18:52:05.000000000 +0200
 -@@ -1,4 +1,5 @@
 +diff a/contrib/web/php-admin/htdocs/dot.htaccess b/contrib/web/php-admin/htdocs/dot.htaccess
 +--- a/contrib/web/php-admin/htdocs/dot.htaccess
 ++++ b/contrib/web/php-admin/htdocs/dot.htaccess
 +@@ -1,4 +1,4 @@
   Require valid-user
   AuthType Basic
  -AuthName "mlmmj web-interface"
  -AuthUserFile /home/mlmmj/htpasswd
  +AuthName "mlmmj web-interface on Debian GNU/Linux"
  +AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
 -+php_value include_path "/usr/share/mlmmj-php-web-admin"
 -diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php
 ---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php 2005-05-12 18:36:37.000000000 +0200
 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php        2005-05-12 18:52:05.000000000 +0200
 +diff a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
 +--- a/contrib/web/php-admin/htdocs/edit.php
 ++++ b/contrib/web/php-admin/htdocs/edit.php
  @@ -26,7 +26,7 @@
    * IN THE SOFTWARE.
    */
@@@ -39,9 -39,9 +39,9 @@@
   require("class.FastTemplate.php");
   
   function mlmmj_boolean($name, $nicename, $text) 
 -diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php
 ---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php        2005-05-12 18:36:37.000000000 +0200
 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php       2005-05-12 18:52:05.000000000 +0200
 +diff a/contrib/web/php-admin/htdocs/index.php b/contrib/web/php-admin/htdocs/index.php
 +--- a/contrib/web/php-admin/htdocs/index.php
 ++++ b/contrib/web/php-admin/htdocs/index.php
  @@ -27,7 +27,7 @@
    */
   
@@@ -51,9 -51,9 +51,9 @@@
   
   $tpl = new FastTemplate($templatedir);
   
 -diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php
 ---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php 2005-05-12 18:36:37.000000000 +0200
 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php        2005-05-12 18:52:05.000000000 +0200
 +diff a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php
 +--- a/contrib/web/php-admin/htdocs/save.php
 ++++ b/contrib/web/php-admin/htdocs/save.php
  @@ -26,7 +26,7 @@
    * IN THE SOFTWARE.
    */
@@@ -63,9 -63,9 +63,9 @@@
   require("class.FastTemplate.php");
   
   function mlmmj_boolean($name, $nicename, $text)
 -diff -urNad mlmmj-1.2.7/contrib/web/php-user/example.html /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html
 ---- mlmmj-1.2.7/contrib/web/php-user/example.html     2004-07-09 22:28:16.000000000 +0200
 -+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html    2005-05-12 18:53:51.000000000 +0200
 +diff a/contrib/web/php-user/example.html b/contrib/web/php-user/example.html
 +--- a/contrib/web/php-user/example.html
 ++++ b/contrib/web/php-user/example.html
  @@ -1,7 +1,7 @@
   <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
   <html>

diff --combined debian/rules
index 7133dcbaf5be1e7fd2a8788eb732c7ea22bb704c,69e269c808bdbf91d6d09e9b613b7357ff3b1915..ec2b7a98a5ec04173073157231935550cc5caf1a
mode 100755,100644..100644
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,15 +1,13 @@@
  #!/usr/bin/make -f
 -# -*- makefile -*-
 -# Sample debian/rules that uses debhelper.
 -# GNU copyright 1997 to 1999 by Joey Hess.
 +# debian/rules for mlmmj
 +# (based on the sample debian/rules by Joey Hess
 +# and Craig Small as shipped with dh-make).
  
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
 -export PACKAGE=mlmmj
 -export DH_OPTIONS
 -export TEXTDIR = $(CURDIR)/debian/mlmmj/usr/share/mlmmj/text.skel
 -CONFIGURERUN=no
 +WEB_DIR = debian/mlmmj-php-web/usr/share/mlmmj-php-web/www
 +WEB_ADMIN_DIR = debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/www
  
  include /usr/share/dpatch/dpatch.make
  
@@@ -24,7 -26,7 +24,7 @@@ els
  endif
  
  
 -export CFLAGS = -Wall -g
 +CFLAGS = -Wall -g
  ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
  else
@@@ -32,92 -34,110 +32,93 @@@
  endif
  
  
 -config.status: patch-stamp configure
 -      ./configure $(confflags)
 +config.status: configure patch-stamp
 +      dh_testdir
 +      ./configure $(confflags) CFLAGS="$(CFLAGS)"
 +
 +build: build-stamp
  
 -build-arch: build-arch-stamp config.status
 +build-stamp: config.status
        dh_testdir
  
 -      # Add here commands to compile the package.
        $(MAKE)
 -      #/usr/bin/docbook-to-man debian/mlmmj.sgml > mlmmj.1
 -
 -build-arch-stamp:
 -      touch build-arch-stamp
 -build-indep-stamp: 
 -      touch build-indep-stamp
  
 -build-indep: build-indep-stamp config.status
 +      touch build-stamp
  
  clean: unpatch
 +      dh_testdir
 +      dh_testroot
 +      rm -f build-stamp
        [ ! -f Makefile ] || $(MAKE) distclean
 -      rm -f build-stamp build-indep-stamp build-arch-stamp config.log configure-stamp
 -      rm -rf $(CURDIR)/debian/DEBIAN
        dh_clean 
  
 -install-arch: build-arch
 +install-arch: build
        dh_testdir
        dh_testroot
        dh_clean -k 
 -      dh_installdirs
 +      dh_installdirs -a
  
 -      # Add here commands to install the package into debian/mlmmj.
        $(MAKE) install DESTDIR=$(CURDIR)/debian/mlmmj
  
 -      # Install translated list texts
 -
 -      install -d \
 -              $(TEXTDIR)/da/ \
 -              $(TEXTDIR)/cz/ \
 -              $(TEXTDIR)/it/ \
 -              $(TEXTDIR)/de/ \
 -              $(TEXTDIR)/es/
 -      install -m 644 listtexts/da/* $(TEXTDIR)/da/
 -      install -m 644 listtexts/cz/* $(TEXTDIR)/cz/
 -      install -m 644 listtexts/it/* $(TEXTDIR)/it/
 -      install -m 644 listtexts/de/* $(TEXTDIR)/de/
 -      install -m 644 listtexts/es/* $(TEXTDIR)/es/
 -
        # 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
        dh_testroot
        dh_installchangelogs ChangeLog
 -      dh_installdocs -A FAQ TUNABLES TODO UPGRADE AUTHORS README README.access VERSION README.exim4 README.sendmail
 +      dh_installdocs -A FAQ TUNABLES TODO UPGRADE README*
        dh_installdebconf
        dh_installexamples
 -#     dh_install
 -#     dh_installmenu
        dh_installdebconf
 -#     dh_installlogrotate
 -#     dh_installemacsen
 -#     dh_installpam
 -#     dh_installmime
 -#     dh_installinit
        dh_installcron
 -#     dh_installinfo
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
 -#     dh_perl
 -#     dh_python
 -#     dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
@@@ -134,4 -154,4 +135,4 @@@ binary: binary-arch binary-inde
  
  build: build-arch build-indep
  
 -.PHONY: build-arch build-indep clean binary-indep binary-arch binary-common install-indep install-arch build configure
 +.PHONY: build-arch build-indep clean binary-indep binary-arch binary-common install-indep install-arch build