On Mon 2013-12-02 13:04:46 -0500, Daniel Kahn Gillmor wrote:
> libnss3-tools 2:3.15.3-1 is now in both jessie and sid, but it doeesn't
> address this change.  Would you like me to do an NMU of 2:3.15.3-1.1
> to resolve it?

i've gone ahead and made that NMU, with the attached debdiff, and have
uploaded it to DELAYED/2.

Regards,

        --dkg

diff -Nru nss-3.15.3/debian/changelog nss-3.15.3/debian/changelog
--- nss-3.15.3/debian/changelog	2013-11-15 18:51:30.000000000 -0500
+++ nss-3.15.3/debian/changelog	2013-12-03 13:42:54.000000000 -0500
@@ -1,3 +1,10 @@
+nss (2:3.15.3-1.1) unstable; urgency=low
+
+  * Non-Maintainer Upload
+   - ship extra NSS utilities (Closes: #701141)
+
+ -- Daniel Kahn Gillmor <d...@fifthhorseman.net>  Tue, 03 Dec 2013 13:42:54 -0500
+
 nss (2:3.15.3-1) unstable; urgency=high
 
   * New upstream release.
diff -Nru nss-3.15.3/debian/rules nss-3.15.3/debian/rules
--- nss-3.15.3/debian/rules	2013-11-15 18:49:26.000000000 -0500
+++ nss-3.15.3/debian/rules	2013-12-03 13:42:18.000000000 -0500
@@ -81,8 +81,40 @@
 	install -m 755 -t debian/libnss3-dev/usr/bin debian/nss-config
 
 	install -m 755 -t debian/libnss3-tools/usr/bin \
-		$(foreach bin,certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap pwdecrypt, \
-		$(DISTDIR)/bin/$(bin))
+		$(foreach bin, \
+			certutil \
+			chktest \
+			cmsutil \
+			crlutil \
+			derdump \
+			httpserv \
+			modutil \
+			ocspclnt \
+			p7content \
+			p7env \
+			p7sign \
+			p7verify \
+			pk12util \
+			pk1sign \
+			pwdecrypt \
+			rsaperf \
+			selfserv \
+			shlibsign \
+			signtool \
+			signver \
+			ssltap \
+			strsclnt \
+			symkeyutil \
+			tstclnt \
+			vfychain \
+			vfyserv \
+	 	, $(DISTDIR)/bin/$(bin))
+	# these utilities are too generically-named, so we prefix them with nss- (see http://bugs.debian.org/701141)
+	$(foreach bin, \
+		addbuiltin \
+		dbtest \
+		pp \
+	 	, install -m 755 -T $(DISTDIR)/bin/$(bin) debian/libnss3-tools/usr/bin/nss-$(bin) ; )
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libnss3-dbg

Attachment: pgpSp9aebYbiG.pgp
Description: PGP signature

Reply via email to