Merge tag 'debian/0.0.7-1' into bpo/wheezy

whatmaps Debian release 0.0.7-1

5 files changed, 28 insertions, 12 deletions

diff --git a/apt/50whatmaps_apt b/apt/50whatmaps_apt
index cefb5fe..632efdd 100644
--- a/apt/50whatmaps_apt
+++ b/apt/50whatmaps_apt
@@ -1,3 +1,3 @@
-DPkg::Pre-Install-Pkgs { "/usr/bin/whatmaps --apt --restart --print-cmds=/var/lib/whatmaps/restart.sh" };
+DPkg::Pre-Install-Pkgs { "/usr/bin/whatmaps --apt --restart --print-cmds=/var/lib/whatmaps/restart.sh || true" };
 DPkg::Post-Invoke { "if [ -x /var/lib/whatmaps/restart.sh ]; then /var/lib/whatmaps/restart.sh; rm -f /var/lib/whatmaps/restart.sh; fi" };
 DPkg::Tools::Options::/usr/bin/whatmaps::Version "2";
diff --git a/debian/changelog b/debian/changelog
index c1757df..3d09258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+whatmaps (0.0.7-1) unstable; urgency=medium
+
+  [ Justin B Rye ]
+  * [d10e47c] Improve package description (Closes: #747147)
+
+  [ Guido Günther ]
+  * New upstream version 0.0.7
+  * [acbf3dd] Depend on python-pkg-resources needed for the entry point
+  * [a049392] Drop patches applied upstream
+
+ -- Guido Günther <agx@sigxcpu.org>  Fri, 06 Jun 2014 19:42:09 +0200
+
+whatmaps (0.0.6-2) unstable; urgency=medium
+
+  * [b0fe055] Add missing import
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 03 May 2014 11:29:16 +0200
+
 whatmaps (0.0.6-1) unstable; urgency=medium
 
   * New upstream version 0.0.6
diff --git a/debian/control b/debian/control
index 570fbb8..516e234 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,11 @@ X-Python-Version: >= 2.7
 Package: whatmaps
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, lsb-release,
- python-apt
-Description: Find processes mapping shared objects
- After package upgrades processes using a ahared library need to be
- restarted to make use of that updated library (e.g. if the library got a
- security upgrade).
+ python-apt, python-pkg-resources
+Description: tool to find processes mapping shared objects
+ After package upgrades (especially security fixes), services using a
+ shared library need to be restarted to make use of the updated version.
  .
- Whatmaps looks for shared objects in packages and finds running programs that
- map them, list them and allows one to restart them.
- .
- It can be integrated with apt to automatically restart services automatically
- on security upgrades.
+ Whatmaps looks for shared objects provided by upgraded packages, lists any
+ running processes that map them, and can integrate with APT to restart
+ services as needed after security upgrades.
diff --git a/whatmaps/debiandistro.py b/whatmaps/debiandistro.py
index 54c706a..4a3d0db 100644
--- a/whatmaps/debiandistro.py
+++ b/whatmaps/debiandistro.py
@@ -26,6 +26,7 @@ except ImportError:
     lsb_release = None
 
 import logging
+import string
 import subprocess
 import sys
 
diff --git a/whatmaps/process.py b/whatmaps/process.py
index f3d5dcd..1abde23 100644
--- a/whatmaps/process.py
+++ b/whatmaps/process.py
@@ -36,7 +36,7 @@ class Process(object):
             if m:
                 self.exe = m.group('exe')
                 self.deleted = True
-                logging.error("Using deleted exe %s", self.exe)
+                logging.info("Using deleted exe %s", self.exe)
             if not os.path.exists(self.exe):
                 logging.debug("%s doesn't exist", self.exe)
             self.cmdline = open(self._procpath('%d/cmdline' % self.pid)).read()