Bug#905673: menu-xdg: diff for NMU version 0.5+nmu1

[Niels Thykier]

Control: tags 905673 + patch
Control: tags 905673 + pending


Dear maintainer,

I've prepared an NMU for menu-xdg (versioned as 0.5+nmu1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.

I have taken the liberty of including some minor clean ups (such as
the now mandatory build-arch and build-indep targets).  Please let me
know if you prefer the NMU without these changes.

Regards.

diff -Nru menu-xdg-0.5/debian/changelog menu-xdg-0.5+nmu1/debian/changelog
--- menu-xdg-0.5/debian/changelog       2010-01-17 16:38:22.000000000 +0000
+++ menu-xdg-0.5+nmu1/debian/changelog  2018-11-11 15:16:14.000000000 +0000
@@ -1,3 +1,15 @@
+menu-xdg (0.5+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix use of internal dpkg database.  (Closes: #905673)
+  * Add required build-arch and build-indep targets to debian/rules.
+  * Replace call to "dh_clean -k" with "dh_prep" in debian/rules as the
+    latter is deprecated.
+  * Set "Rules-Requires-Root" to "no" as menu-xdg does not need
+    (fake)root to build."
+
+ -- Niels Thykier <ni...@thykier.net>  Sun, 11 Nov 2018 15:16:14 +0000
+
 menu-xdg (0.5) unstable; urgency=low
 
   * debian/control, debian/rules:
diff -Nru menu-xdg-0.5/debian/control menu-xdg-0.5+nmu1/debian/control
--- menu-xdg-0.5/debian/control 2010-01-17 12:20:39.000000000 +0000
+++ menu-xdg-0.5+nmu1/debian/control    2018-11-11 15:16:14.000000000 +0000
@@ -4,6 +4,7 @@
 Maintainer: Bill Allombert <ballo...@debian.org>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.8.3
+Rules-Requires-Root: no
 
 Package: menu-xdg
 Architecture: all
diff -Nru menu-xdg-0.5/debian/rules menu-xdg-0.5+nmu1/debian/rules
--- menu-xdg-0.5/debian/rules   2006-03-21 18:04:36.000000000 +0000
+++ menu-xdg-0.5+nmu1/debian/rules      2018-11-11 15:16:14.000000000 +0000
@@ -24,7 +24,10 @@
 
        touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
@@ -48,7 +51,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep 
        dh_installdirs
 
        # Add here commands to install the package into debian/menu-xdg.
diff -Nru menu-xdg-0.5/xdg-desktop-entry-spec-sessions 
menu-xdg-0.5+nmu1/xdg-desktop-entry-spec-sessions
--- menu-xdg-0.5/xdg-desktop-entry-spec-sessions        2010-01-17 
16:37:31.000000000 +0000
+++ menu-xdg-0.5+nmu1/xdg-desktop-entry-spec-sessions   2018-11-11 
15:16:14.000000000 +0000
@@ -11,7 +11,7 @@
 outputencoding="UTF-8";
 outputlanguage="C";
 
-function has_session() = shell("grep -l -e '^/usr/share/xsessions/' 
'/var/lib/dpkg/info/" $package ".list' 2>/dev/null");
+function has_session() = shell("dpkg-query --listfiles '" $package "' 
2>/dev/null | grep -qe '^/usr/share/xsessions/' && echo yes");
 
 function name() =
        "Name=" title() "\n"