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

7 files changed, 26 insertions, 6 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS
index 2a092cd..2a092cd 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS
diff --git a/debian/changelog b/debian/changelog
index 756724a..3631580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+mailgraph (1.14-18) unstable; urgency=medium
+
+  * Migrate to debhelper-compat 13:
+    - Remove debian/compat.
+    - debian/control:
+      + Bump minimum debhelper-compat version to = 13.
+  * Declare compliance with Debian Policy 4.6.0.0 (No changes needed).
+  * debian/control:
+    - Add ${misc:Pre-Depends}.
+    - Add Rules-Requires-Root: no.
+  * Rename NEWS.Debian to NEWS (thanks to lintian).
+  * Fix the owner and the group of the directory /var/lib/mailgraph/
+    (Closes: #927017). Thanks to Michael Krieger <phyre@rogers.com>.
+  * debian/copyright:
+    - Add year 2021 to myself.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 20 Aug 2021 13:47:23 +0200
+
 mailgraph (1.14-17) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 9f1d48e..0000000
--- a/debian/compat
+++ /dev/null
@@ -1,2 +0,0 @@
-11
-
diff --git a/debian/control b/debian/control
index e8463d8..270ea61 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: admin
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
  po-debconf
-Standards-Version: 4.2.1
+Standards-Version: 4.6.0.0
 Homepage: https://mailgraph.schweikert.ch
 Vcs-Git: git://jff.email/opt/git/mailgraph.git
 Vcs-Browser: https://jff.email/cgit/mailgraph.git
+Rules-Requires-Root: no
 
 Package: mailgraph
 Architecture: all
@@ -20,6 +21,7 @@ Depends:
  lsb-base (>= 3.0-6),
  ucf (>= 0.28)
 Pre-Depends:
+ ${misc:Pre-Depends},
  debconf (>= 0.5) | debconf-2.0
 Recommends:
  httpd | apache2, default-mta | exim4 | postfix | sendmail | mail-transport-agent
diff --git a/debian/copyright b/debian/copyright
index b4b09cd..9e9cdcc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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-2018 Jörg Frings-Fürst <debian@jff.email>
+           2014-2021 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 74728e1..8d623c0 100644
--- a/debian/mailgraph.docs
+++ b/debian/mailgraph.docs
@@ -1,3 +1,4 @@
 README
 debian/README.fetchmail
-debian/NEWS.Debian
+debian/README.source
+debian/README.Debian
diff --git a/debian/mailgraph.postinst b/debian/mailgraph.postinst
index 4b73ef3..62b42e8 100644
--- a/debian/mailgraph.postinst
+++ b/debian/mailgraph.postinst
@@ -36,6 +36,7 @@ case "$1" in
         ucf --debconf-ok ${tempfile} /etc/default/mailgraph
         ucfr mailgraph /etc/default/mailgraph
         rm -f ${tempfile}
+	chown www-data:www-data /var/lib/mailgraph/
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)