Bug#701141: [PATCH] rename the generic utilities with an nss- prefix

[Daniel Kahn Gillmor]

---
 debian/rules |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 152a0cb..9903275 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,12 +84,10 @@ override_dh_auto_install: $(PREPROCESS_FILES:.in=)
 
 	install -m 755 -t debian/libnss3-tools/usr/bin \
 		$(foreach bin, \
-			addbuiltin \
 			certutil \
 			chktest \
 			cmsutil \
 			crlutil \
-			dbtest \
 			derdump \
 			httpserv \
 			modutil \
@@ -100,7 +98,6 @@ override_dh_auto_install: $(PREPROCESS_FILES:.in=)
 			p7verify \
 			pk12util \
 			pk1sign \
-			pp \
 			pwdecrypt \
 			rsaperf \
 			selfserv \
@@ -114,6 +111,12 @@ override_dh_auto_install: $(PREPROCESS_FILES:.in=)
 			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
-- 
1.7.10.4