On Sun, 11 Nov 2018 16:51:22 +0100 Bill Allombert <[email protected]> wrote: > On Sun, Nov 11, 2018 at 03:28:21PM +0000, Niels Thykier wrote: > > 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. > > Hello Niels, > > Your NMU is OK. Did you manage to test it ? >> [...] > > Cheers, > -- > Bill. <[email protected]> > > Imagine a large red swirl here. > >
Hi, Not fully. I did not know how to exercise that bit of code in menu-xdg live (I am not a use of menu myself). The best I could come up with was testing comparing original shell call and its replacement in isolation (which is what I did). If you have a means to test it, it would a great help for me. :) I noticed that mistakenly sent the debdiff that was still marked "UNRELEASED". I have included the final debdiff in this mail. Thanks, ~Niels
diff -Nru menu-xdg-0.5/debian/changelog menu-xdg-0.5+nmu1/debian/changelog --- menu-xdg-0.5/debian/changelog 2010-01-17 17:38:22.000000000 +0100 +++ menu-xdg-0.5+nmu1/debian/changelog 2018-11-11 16:30:00.000000000 +0100 @@ -1,3 +1,15 @@ +menu-xdg (0.5+nmu1) unstable; 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 <[email protected]> Sun, 11 Nov 2018 15:30:00 +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 13:20:39.000000000 +0100 +++ menu-xdg-0.5+nmu1/debian/control 2018-11-11 16:25:54.000000000 +0100 @@ -4,6 +4,7 @@ Maintainer: Bill Allombert <[email protected]> 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 19:04:36.000000000 +0100 +++ menu-xdg-0.5+nmu1/debian/rules 2018-11-11 16:23:15.000000000 +0100 @@ -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 17:37:31.000000000 +0100 +++ menu-xdg-0.5+nmu1/xdg-desktop-entry-spec-sessions 2018-11-11 16:21:13.000000000 +0100 @@ -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"
