Control: tags 910559 + patch
Control: tags 910559 + pending

Dear maintainer,

I've prepared an NMU for cli-common (versioned as 0.9+nmu2) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru cli-common-0.9+nmu1/debian/changelog 
cli-common-0.9+nmu2/debian/changelog
--- cli-common-0.9+nmu1/debian/changelog        2015-02-25 20:57:38.000000000 
+0000
+++ cli-common-0.9+nmu2/debian/changelog        2018-10-28 17:08:11.000000000 
+0000
@@ -1,3 +1,16 @@
+cli-common (0.9+nmu2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Replace references and usage of "dh_clean -k" with "dh_prep".
+  * dh_makeclilibs: Update to support "Rules-Requires-Root: no" (R³).
+    Thanks to Daniel Kahn Gillmor for reporting the issue.
+    (Closes: #910559)
+  * Set "Rules-Requires-Root" (R³) to "no".
+  * d/rules: Remove dh_installcliframework.1 on clean.
+  * d/rules: Add required build-arch and build-indep targets.
+
+ -- Niels Thykier <[email protected]>  Sun, 28 Oct 2018 17:08:11 +0000
+
 cli-common (0.9+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload fixing a bug blocking serious bug #777597 --
diff -Nru cli-common-0.9+nmu1/debian/control cli-common-0.9+nmu2/debian/control
--- cli-common-0.9+nmu1/debian/control  2015-02-25 20:34:45.000000000 +0000
+++ cli-common-0.9+nmu2/debian/control  2018-10-28 17:05:35.000000000 +0000
@@ -16,6 +16,7 @@
 Homepage: http://alioth.debian.org/projects/pkg-cli-common/
 Vcs-Git: git://git.debian.org/git/pkg-cli-common/packages/cli-common.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-common/packages/cli-common.git
+Rules-Requires-Root: no
 
 Package: cli-common
 Architecture: all
diff -Nru cli-common-0.9+nmu1/debian/rules cli-common-0.9+nmu2/debian/rules
--- cli-common-0.9+nmu1/debian/rules    2015-02-25 20:34:08.000000000 +0000
+++ cli-common-0.9+nmu2/debian/rules    2018-10-28 17:08:11.000000000 +0000
@@ -6,6 +6,8 @@
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 
 build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
        dh_testdir
        debiandoc2text cli-policy.sgml
@@ -18,7 +20,7 @@
 clean:
        dh_testdir
        dh_testroot
-       rm -f dh_clideps.1 dh_makeclilibs.1 dh_installcligac.1 dh_clifixperms.1 
dh_clistrip.1 dh_cligacpolicy.1
+       rm -f dh_clideps.1 dh_makeclilibs.1 dh_installcligac.1 dh_clifixperms.1 
dh_clistrip.1 dh_cligacpolicy.1 dh_installcliframework.1
        rm -fr cli-policy.html cli-policy.txt cli-policy.pdf cli-policy.tpt
        rm -f build-stamp
        rm -rf $(MONO_SHARED_DIR)/.wapi
@@ -27,7 +29,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
 
 # Build architecture-independent files here.
diff -Nru cli-common-0.9+nmu1/dh_cligacpolicy 
cli-common-0.9+nmu2/dh_cligacpolicy
--- cli-common-0.9+nmu1/dh_cligacpolicy 2015-02-25 20:34:08.000000000 +0000
+++ cli-common-0.9+nmu2/dh_cligacpolicy 2018-10-28 16:21:33.000000000 +0000
@@ -68,7 +68,7 @@
 
 =head1 NOTES
 
-Note that this command is not idempotent. "dh_clean -k" should be called
+Note that this command is not idempotent. "dh_prep" should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 
diff -Nru cli-common-0.9+nmu1/dh_installcliframework 
cli-common-0.9+nmu2/dh_installcliframework
--- cli-common-0.9+nmu1/dh_installcliframework  2015-02-25 20:34:08.000000000 
+0000
+++ cli-common-0.9+nmu2/dh_installcliframework  2018-10-28 16:21:33.000000000 
+0000
@@ -85,7 +85,7 @@
 
 =head1 NOTES
 
-Note that this command is not idempotent. "dh_clean -k" should be called
+Note that this command is not idempotent. "dh_prep" should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 
diff -Nru cli-common-0.9+nmu1/dh_installcligac 
cli-common-0.9+nmu2/dh_installcligac
--- cli-common-0.9+nmu1/dh_installcligac        2015-02-25 20:34:08.000000000 
+0000
+++ cli-common-0.9+nmu2/dh_installcligac        2018-10-28 16:21:33.000000000 
+0000
@@ -37,7 +37,7 @@
 
 =head1 NOTES
 
-Note that this command is not idempotent. "dh_clean -k" should be called
+Note that this command is not idempotent. "dh_prep" should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 
diff -Nru cli-common-0.9+nmu1/dh_makeclilibs cli-common-0.9+nmu2/dh_makeclilibs
--- cli-common-0.9+nmu1/dh_makeclilibs  2015-02-25 20:34:08.000000000 +0000
+++ cli-common-0.9+nmu2/dh_makeclilibs  2018-10-28 16:20:39.000000000 +0000
@@ -295,8 +295,7 @@
     close FIND;
 
     if (-e "$tmp/DEBIAN/clilibs") {
-        doit("chmod", 644,   "$tmp/DEBIAN/clilibs");
-        doit("chown", "0:0", "$tmp/DEBIAN/clilibs");
+        reset_perm_and_owner(0644, "$tmp/DEBIAN/clilibs");
     }
 }
 

Reply via email to