Merge branch 'release/debian/1.14-16'debian/1.14-16

12 files changed, 107 insertions, 74 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 3cf3d06..2a092cd 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,6 +1,6 @@
 mailgraph (1.14-15) unstable; urgency=medium
 
-  * mailgraph are now installed at /usr/share/mailgraph. For use with
+    mailgraph are now installed at /usr/share/mailgraph. For use with
     apache2 there is a mailgraph.conf at /usr/share/doc/mailgraph/examples.
     You can copy the file to /etc/apache2/conf-available and enable it
     with "a2enconf mailgraph" as root.
@@ -9,13 +9,13 @@ mailgraph (1.14-15) unstable; urgency=medium
 
 mailgraph (1.14-9) unstable; urgency=low
 
-  * mailgraph now allows the creation of both RRD and graph for greylisting, 
+    mailgraph now allows the creation of both RRD and graph for greylisting, 
     supporting postgrey and grossd (contributions to support more greylisting
     applications are welcome).
     If you used the --only-mail-rrd and/or --only-virus-rrd options, please make
     sure you update your configuration for the following new options:
-       --no-mail-rrd       Do not update the mail rrd.
-       --no-virus-rrd      Do not update the virus rrd.
-       --no-greylist-rrd   Do not update the greylist rrd.
+     --no-mail-rrd       Do not update the mail rrd.
+     --no-virus-rrd      Do not update the virus rrd.
+     --no-greylist-rrd   Do not update the greylist rrd.
 
  -- Julien Valroff <julien@debian.org>  Sun, 13 Mar 2011 08:40:00 +0100
diff --git a/debian/README.Debian b/debian/README.Debian
index 931689c..30c12a0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,9 +4,16 @@ README.Debian for mailgraph
 This Debian package installs itself, optionally, as a daemon that
 will constantly gather the statistics it needs. You really need to turn
 this option on for it to be of any use. The statistics themselves are
-served up by a web CGI program, /usr/lib/cgi-bin/mailgraph.cgi. With any
-normal Debian web server install, this should be accessible as
-http://localhost/cgi-bin/mailgraph.cgi
+served up by a web CGI program, /usr/share/mailgraph/mailgraph.cgi.
+
+Note for Apache2.4 users:
+
+  There is a mailgraph.conf at /usr/share/doc/mailgraph/examples.
+  You can copy the file to /etc/apache2/conf-available and enable it
+  with "a2enconf mailgraph" as root.
+
+  Mailgraph is after them accessible as
+  http://localhost/mailgraph/mailgraph.cgi
 
 
 Note for Lighttpd users:
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e4f2b3d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index 6fb4952..5386476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,38 @@
+mailgraph (1.14-16) unstable; urgency=medium
+
+  * Change to my new email address.
+  * Fix documentation error (Closes: #865914):
+    - Add debian/NEWS.Debian to mailgraph.docs.
+    - Correct debian/README.Debian.
+  * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * Add missing mailgraph.service file.
+  * New README.source to explain the branching model used.
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - Bump minimum debhelper version in debian/control to >= 11.
+  * debian/changelog:
+    - Remove trailing whitespaces.
+  * debian/control:
+    - Change Vcs-* to point to the new repository.
+    - Use secure URI for homepage.
+    - Change priority from deprecated extra to optional.
+    - Add requested default-mta to recommends.
+  * debian/copyright:
+    - Use secure URI for copyright format and source.
+    - Change year to 2018 for packaging.
+  * debian/NEWS.debian:
+    - Use paragraphs instead bulleted lists.
+  * debian/mailgraph.preinst (Closes: #900507):
+    - Remove outdated script. It was used to update releases before 1.13-1.1.
+      Oldstable has 1.14-13.
+  * debian/watch:
+    - Use secure URI.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 09 Sep 2018 12:15:23 +0200
+
 mailgraph (1.14-15) unstable; urgency=medium
 
-  * Move to /usr/share/mailgraph for compliance with Apache 2.4 
+  * Move to /usr/share/mailgraph for compliance with Apache 2.4
     (Closes: #802775):
     - Changed files:
       + debian/mailgraph.install
@@ -67,17 +99,17 @@ mailgraph (1.14-12) unstable; urgency=medium
 
 mailgraph (1.14-11) unstable; urgency=low
 
-  * Update copyright file as per DEP-5 1.0 format 
+  * Update copyright file as per DEP-5 1.0 format
   * Add patch from Pascal Volk to deal with Postfix enable_long_queue_ids
     parameter (Closes: #677747)
-  * Update to new policy 3.9.3 (no changes needed)  
+  * Update to new policy 3.9.3 (no changes needed)
 
  -- Julien Valroff <julien@debian.org>  Tue, 28 Feb 2012 18:44:18 +0100
 
 mailgraph (1.14-10) unstable; urgency=low
 
   * Add VCS fields
-  * Update DEP-5 uri 
+  * Update DEP-5 uri
   * Add support for "status" action to init.d script - thanks to Peter
     Eisentraut <petere@debian.org> (Closes: #652998)
   * Updated Debconf translation for Norwegian Bokmål - thanks to Bjørn
@@ -88,12 +120,12 @@ mailgraph (1.14-10) unstable; urgency=low
 
 mailgraph (1.14-9) unstable; urgency=low
 
-  * Fix patch to set default location of rrd files (Closes: #617411) 
+  * Fix patch to set default location of rrd files (Closes: #617411)
   * Add patch to create greylisting RRD and graph (supports postgrey and
     grossd)
   * Remove Norbert from Uploaders, thanks to him for his work on this
-    package 
-  * Update DEP-5 url to the latest revision 
+    package
+  * Update DEP-5 url to the latest revision
   * Update to new policy 3.9.2 (no changes needed)
 
  -- Julien Valroff <julien@debian.org>  Sat, 09 Apr 2011 07:55:10 +0200
@@ -102,14 +134,14 @@ mailgraph (1.14-8) unstable; urgency=low
 
   * Add patch from Malte S. Stretz to replace rrdtool badge by a simple
     text link which prevents tracking by oss.oetiker.ch
-  * Bump debhelper compat to 8 
+  * Bump debhelper compat to 8
 
  -- Julien Valroff <julien@debian.org>  Sat, 12 Feb 2011 15:11:19 +0100
 
 mailgraph (1.14-7) unstable; urgency=low
 
-  * Make use of perl:Depends substvar 
-  * Update copyright information as per latest DEP-5 
+  * Make use of perl:Depends substvar
+  * Update copyright information as per latest DEP-5
   * Add patch from Adrian von Bidder <avbidder@fortytwo.ch> to fix virus
     notification with clamav-milter (Closes: #610521)
 
@@ -118,9 +150,9 @@ mailgraph (1.14-7) unstable; urgency=low
 mailgraph (1.14-6) unstable; urgency=low
 
   * Debconf templates translation update:
-    + nl - thanks to Remco Rijnders (Closes: #600552) 
+    + nl - thanks to Remco Rijnders (Closes: #600552)
   * Remove duplicate description from README.Debian
-  * Update my email address 
+  * Update my email address
   * Remove DMUA field, now useless
 
  -- Julien Valroff <julien@debian.org>  Wed, 10 Nov 2010 21:46:34 +0100
@@ -157,7 +189,7 @@ mailgraph (1.14-4) unstable; urgency=low
     + ru - thanks to Yuri Kozlov
     + sk - thanks to Ivan Masár
     + sv - thanks to Martin Bagge
-  * Fix typo in watch file 
+  * Fix typo in watch file
 
  -- Julien Valroff <julien@kirya.net>  Sat, 09 Oct 2010 20:54:02 +0200
 
@@ -184,7 +216,7 @@ mailgraph (1.14-2) unstable; urgency=low
   * Use dh minimal rules
   * Update copyright information and switch for machine-readble format
   * Add manpage, thanks to Gregory Colpart <reg@evolix.fr>
-    (Closes: #189033, #462294) 
+    (Closes: #189033, #462294)
   * Add watch file (Closes: #489719)
   * Add patch to account for infected mail as logged by DSPAM
     (Closes: #370091)
diff --git a/debian/compat b/debian/compat
index 021ea30..9f1d48e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,2 +1,2 @@
-10
+11
 
diff --git a/debian/control b/debian/control
index 193ad11..d12c77c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: mailgraph
 Section: admin
-Priority: extra
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Priority: optional
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  po-debconf
-Standards-Version: 3.9.8
-Homepage: http://mailgraph.schweikert.ch
-Vcs-Git: git://anonscm.debian.org/collab-maint/mailgraph.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mailgraph.git
+Standards-Version: 4.2.1
+Homepage: https://mailgraph.schweikert.ch
+Vcs-Git: git://jff.email/opt/git//mailgraph.git
+Vcs-Browser: https://jff.email/cgit//mailgraph.git
 
 Package: mailgraph
 Architecture: all
@@ -22,7 +22,7 @@ Depends:
 Pre-Depends:
  debconf (>= 0.5) | debconf-2.0
 Recommends:
- httpd | apache2, exim4 | postfix | sendmail | mail-transport-agent
+ httpd | apache2, default-mta | exim4 | postfix | sendmail | mail-transport-agent
 Description: RRDtool frontend for Mail statistics
  Mailgraph is a very simple mail statistics RRDtool frontend for
  Postfix, Sendmail or Exim that produces daily, weekly, monthly and
diff --git a/debian/copyright b/debian/copyright
index a103548..b4b09cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mailgraph
 Upstream-Contact: David Schweikert <david@schweikert.ch>
-Source: http://mailgraph.schweikert.ch/pub/
+Source: https://mailgraph.schweikert.ch/pub/
 
 Files: *
 Copyright: 2000-2007 David Schweikert <david@schweikert.ch>
@@ -11,7 +11,7 @@ License: GPL-2
 Files: debian/*
 Copyright: 2002-2008 Norbert Tretkowski <nobse@debian.org>
            2010-2012 Julien Valroff <julien@debian.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2
 
 License: GPL-2
diff --git a/debian/mailgraph.docs b/debian/mailgraph.docs
index 95f19c1..74728e1 100644
--- a/debian/mailgraph.docs
+++ b/debian/mailgraph.docs
@@ -1,2 +1,3 @@
 README
 debian/README.fetchmail
+debian/NEWS.Debian
diff --git a/debian/mailgraph.preinst b/debian/mailgraph.preinst
deleted file mode 100644
index 729ecc5..0000000
--- a/debian/mailgraph.preinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-
-
-case "$1" in
-    upgrade)
-    	if [ "$2" \< "1.13-1.1" ]; then
-            if [ -r /etc/default/mailgraph ]; then
-                . /usr/share/debconf/confmodule
-                . /etc/default/mailgraph
-                db_set mailgraph/start_on_boot "$BOOT_START"
-                db_set mailgraph/mail_log "$MAIL_LOG"
-                db_set mailgraph/ignore_localhost "$IGNORE_LOCALHOST"
-            fi
-    	fi
-    ;;
-
-    install|abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mailgraph.service b/debian/mailgraph.service
new file mode 100644
index 0000000..a4d9810
--- /dev/null
+++ b/debian/mailgraph.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=mailgraph mail log file analyzer
+After=
+
+[Service]
+Nice=19
+Type=forking
+ExecStart=/usr/sbin/mailgraph -d -l /var/log/mail.log --daemon-rrd=/var/lib/mailgraph --ignore-localhost
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
index 76a9cb2..6714255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,3 +8,6 @@ override_dh_auto_configure:
 override_dh_auto_clean:
 	rm -f mailgraph
 	dh_auto_clean
+
+override_dh_installsystemd:
+	dh_installsystemd -pmailgraph --no-enable --name=mailgraph
diff --git a/debian/watch b/debian/watch
index a3a91b9..da96973 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-http://mailgraph.schweikert.ch/pub/mailgraph-(.*)\.tar\.gz
+https://mailgraph.schweikert.ch/pub/mailgraph-(.*)\.tar\.gz