Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
I'd like to update whatmaps in p-u to fix #791569. Due to the rename
of the apache package from apache2.2 to apache2 whatmaps fails to
restart apache after a security upgrade.
Cheers,
-- Guido
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'unstable'),
(500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.1.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index 94fec4b..76adb40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+whatmaps (0.0.9-1+deb8u1) stable-proposed-updates; urgency=medium
+
+ * [920f1dd] Respect jessie apache package rename (Closes: #791569)
+ * [7c61790] Adjust gbp.conf for Jessie
+
+ -- Guido Günther <a...@sigxcpu.org> Wed, 24 Feb 2016 08:36:38 +0100
+
whatmaps (0.0.9-1) unstable; urgency=medium
* New upstream version:
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 9678e28..a446ca6 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
[DEFAULT]
-debian-branch = debian/master
+debian-branch = debian/jessie
upstream-tag = v%(version)s
upstream-branch = master
diff --git a/debian/patches/Respect-jessie-apache-package-rename.patch b/debian/patches/Respect-jessie-apache-package-rename.patch
new file mode 100644
index 0000000..1ce75f6
--- /dev/null
+++ b/debian/patches/Respect-jessie-apache-package-rename.patch
@@ -0,0 +1,21 @@
+From: Santiago Garcia Mantinan <ma...@debian.org>
+Date: Tue, 7 Jul 2015 07:17:22 +0200
+Subject: Respect jessie apache package rename
+
+Closes: #791569
+---
+ whatmaps/debiandistro.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/whatmaps/debiandistro.py b/whatmaps/debiandistro.py
+index 3a3bf16..5c98c19 100644
+--- a/whatmaps/debiandistro.py
++++ b/whatmaps/debiandistro.py
+@@ -43,6 +43,7 @@ class DebianDistro(Distro):
+ _pkg_services = { 'apache2-mpm-worker': [ 'apache2' ],
+ 'apache2-mpm-prefork': [ 'apache2' ],
+ 'apache2.2-bin': [ 'apache2' ],
++ 'apache2-bin': [ 'apache2' ],
+ 'dovecot-imapd': [ 'dovecot' ],
+ 'dovecot-pop3d': [ 'dovecot' ],
+ 'exim4-daemon-light': [ 'exim4' ],
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d9c8b37
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Respect-jessie-apache-package-rename.patch
