diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/patches/0001-Another-import-bugfix.patch | 27 | ||||
| -rw-r--r-- | debian/patches/0002-Abort-early-if-we-found-a-match.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/po/sv.po | 50 | ||||
| -rw-r--r-- | debian/preinst | 14 | ||||
| -rwxr-xr-x | debian/tests/smoke | 2 |
7 files changed, 81 insertions, 60 deletions
diff --git a/debian/changelog b/debian/changelog index 8b6b278..ba3c0bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +whatmaps (0.0.9-1) unstable; urgency=medium + + * New upstream version: + * Install apt.conf configuration on derivatives too (Closes: #761054) + * Fix service detection with newer systemd (as in Debian Jessie) + * Make logging consistent + * [36fd4ee] Avoid error message on missing file. + Don't try to get the md5sum of a nonexistent file to avoid + md5sum: /etc/apt/apt.conf.d/20servicese: No such file or directory + which is confusing. + * Drop all patches merged upstream + + -- Guido Günther <agx@sigxcpu.org> Sun, 28 Dec 2014 15:04:26 +0100 + +whatmaps (0.0.8-5) unstable; urgency=medium + + * [617fed4] Add sv Debconf translation. Thanks to Martin Bagge (Closes: + #761973) + * [1a7a8b9] Fix smoketest. The name of the libvirt service changed + + -- Guido Günther <agx@sigxcpu.org> Sat, 27 Sep 2014 13:42:48 +0200 + whatmaps (0.0.8-4~bpo70+1) wheezy-backports; urgency=medium * Rebuild for wheezy-backports. diff --git a/debian/patches/0001-Another-import-bugfix.patch b/debian/patches/0001-Another-import-bugfix.patch deleted file mode 100644 index 9cbb73e..0000000 --- a/debian/patches/0001-Another-import-bugfix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org> -Date: Fri, 11 Jul 2014 20:53:31 +0200 -Subject: Another import bugfix - ---- - whatmaps/debiandistro.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/whatmaps/debiandistro.py b/whatmaps/debiandistro.py -index 9294c9f..3a3bf16 100644 ---- a/whatmaps/debiandistro.py -+++ b/whatmaps/debiandistro.py -@@ -31,12 +31,12 @@ import subprocess - import sys - import string - --import whatmaps.distro -+from . distro import Distro - from . debianpkg import DebianPkg - from . pkg import PkgError - from . systemd import Systemd - --class DebianDistro(whatmaps.distro.Distro): -+class DebianDistro(Distro): - "Debian (dpkg) based distribution" - id = 'Debian' - diff --git a/debian/patches/0002-Abort-early-if-we-found-a-match.patch b/debian/patches/0002-Abort-early-if-we-found-a-match.patch deleted file mode 100644 index 3513ad6..0000000 --- a/debian/patches/0002-Abort-early-if-we-found-a-match.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org> -Date: Mon, 14 Jul 2014 16:12:43 +0200 -Subject: Abort early if we found a match - -Once we found a shared object that a process maps we don't need to -continue with the other shared objects since one is enough to require -a process restart. ---- - whatmaps/command.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/whatmaps/command.py b/whatmaps/command.py -index 7690ef8..e649cbb 100755 ---- a/whatmaps/command.py -+++ b/whatmaps/command.py -@@ -39,7 +39,7 @@ def check_maps(procs, shared_objects): - restart_procs[proc.exe] += [ proc ] - else: - restart_procs[proc.exe] = [ proc ] -- continue -+ break - return restart_procs - - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 219effd..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-Another-import-bugfix.patch -0002-Abort-early-if-we-found-a-match.patch diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..2ee931e --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,50 @@ +# Translation of whatmaps debconf template to Swedish +# Copyright (C) 2014 Martin Bagge <brother@bsnet.se> +# This file is distributed under the same license as the XX package. +# +# Martin Bagge <brother@bsnet.se>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: whatmaps\n" +"Report-Msgid-Bugs-To: whatmaps@packages.debian.org\n" +"POT-Creation-Date: 2014-08-20 06:56+0200\n" +"PO-Revision-Date: 2014-09-17 13:22+0100\n" +"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n" +"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" +"Language: Swedish\n" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "Automatically restart services after library security updates?" +msgstr "" +"Ska tjänster startas om automatiskt efter säkerhetsuppdateringar för " +"bibliotek?" + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"Services need to be restarted to benefit from updates of shared libraries " +"they depend on. Otherwise they remain vulnerable to security bugs fixed in " +"these updates." +msgstr "" +"Tjänster behöver startas om för att dra nytta av uppdateringar av delade " +"bibliotek som de är beroende av. Annars kan tjänsterna fortsätta vara " +"sårbara för säkerhetsfel som lösts i dessa uppdateringar." + +#. Type: boolean +#. Description +#: ../templates:2001 +msgid "" +"Automatic service restarts are only done if APT fetched the library from a " +"source providing security updates. This also affects packages installed via " +"\"unattended-upgrades\"." +msgstr "" +"Automatiska omstarter av tjänster görs bara om APT hämtar biblioteket från " +"en källa som tillhandahåller säkerhetsuppdateringar. Detta påverkar också " +"paket installerade voa \"unattended-upgrades\"." diff --git a/debian/preinst b/debian/preinst index 1d54ef0..1ea0c9f 100644 --- a/debian/preinst +++ b/debian/preinst @@ -17,12 +17,14 @@ set -e case "$1" in install|upgrade) if dpkg --compare-versions "$2" lt-nl "0.0.8-3~"; then - # Remove backup copies of services file - md5=$(md5sum /etc/apt/apt.conf.d/20servicese | sed -e 's/ .*//') - case "$md5" in - 074e684668c83b8a98c5eeb8257c88f2|509ad2c35aa4da3153dd6e70941e060b) - rm -f /etc/apt/apt.conf.d/20servicese - esac + if [ -f /etc/apt/apt.conf.d/20servicese ]; then + # Remove errnoneous backup copies of services file + md5=$(md5sum /etc/apt/apt.conf.d/20servicese | sed -e 's/ .*//') + case "$md5" in + 074e684668c83b8a98c5eeb8257c88f2|509ad2c35aa4da3153dd6e70941e060b) + rm -f /etc/apt/apt.conf.d/20servicese + esac + fi fi ;; diff --git a/debian/tests/smoke b/debian/tests/smoke index dde8c37..f4a8642 100755 --- a/debian/tests/smoke +++ b/debian/tests/smoke @@ -1,3 +1,3 @@ #!/bin/sh -whatmaps libvirt0 | grep -qs ^libvirt-bin +whatmaps libvirt0 | grep -qsE '^(libvirt-bin|libvirtd)' |