[Pkg-uml-commit] uml-utilities: Changes to 'debian-unstable'

[Mattia Dongili]

 debian/changelog |    9 +++++++++
 debian/control   |    2 +-
 debian/postinst  |    4 ----
 debian/postrm    |    4 ++++
 debian/rules     |    3 +--
 5 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 216f773f84d09521df21700f097c45e8a84f26c4
Author: Mattia Dongili <malattia at linux.it>
Date:   Tue Jul 12 07:22:34 2016 -0700

    Incorporate diff for NMU 20070815-1.4
    
    Changes:
    * Stop shipping /var/run/uml-utilities, thanks to Thomas Goirand. The
      initscript already created this if it was missing.  (Closes: #689905)
    * Set Architecture: linux-any.  (Closes: #745188, #637724)
    
    Signed-off-by: Mattia Dongili <malattia at linux.it>

diff --git a/debian/changelog b/debian/changelog
index 127bebc..5ecf0a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+uml-utilities (20070815-1.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Stop shipping /var/run/uml-utilities, thanks to Thomas Goirand. The
+    initscript already created this if it was missing.  (Closes: #689905)
+  * Set Architecture: linux-any.  (Closes: #745188, #637724)
+
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 04 Nov 2014 14:05:53 +0100
+
 uml-utilities (20070815-1.3) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index e4fdc37..84d8ef6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>> 4.0.0), libreadline-dev, docbook-to-man, dpatch, li
 Standards-Version: 3.7.2
 
 Package: uml-utilities
-Architecture: any
+Architecture: linux-any
 Depends: adduser, ${shlibs:Depends}, lsb-base (>= 3.0-10)
 Suggests: user-mode-linux
 Description: User-mode Linux (utility programs)
diff --git a/debian/postinst b/debian/postinst
index 8909d22..91d221a 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -37,10 +37,6 @@ case "$1" in
                 /usr/lib/uml/uml_net
         fi
 
-        if ! dpkg-statoverride --list /var/run/uml-utilities >/dev/null; then
-            chown uml-net:uml-net /var/run/uml-utilities
-        fi
-
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/postrm b/debian/postrm
index adb122d..00d0752 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -35,6 +35,10 @@ case "$1" in
 	;;
 esac
 
+if [ "${1}" = "purge" ] ; then
+	rm -rf /var/run/uml-utilities
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
diff --git a/debian/rules b/debian/rules
index 3a279be..11ab847 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,8 +56,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs usr/sbin usr/lib/uml \
-		etc/network/if-up.d etc/network/if-pre-up.d \
-		var/run/uml-utilities
+		etc/network/if-up.d etc/network/if-pre-up.d
 
 	$(MAKE) install DESTDIR=$(tmp)