drop rcslock instead of overriding for it; it also doesn't work anyway

diff --git a/debian/changelog b/debian/changelog
index 69097e0..488df67 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 cvs (2:1.12.13+real-7) xunstable; urgency=low
 
-  * Add lintian override for rcslock contrib script
+  * Drop unsafe rcslock script from contrib
   * debian/rules: cleanup (remove install/check, dh_installdirs;
     switch to dh_prep if extant)
   * Use -Wl,--as-needed for the link to appease dpkg-shlibdebs

diff --git a/debian/lintian/cvs b/debian/lintian/cvs
index ac48c9e..baad542 100644 (file)
--- a/debian/lintian/cvs
+++ b/debian/lintian/cvs
@@ -1,7 +1,5 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.9 2011/11/12 00:11:23 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.10 2011/12/04 14:51:06 tg Exp $
 
 # these are just contrib
 cvs: csh-considered-harmful usr/share/cvs/contrib/sccs2rcs
 cvs: missing-dep-for-interpreter csh *
-# this is contrib AND perl terminates it due to taint problems
-cvs: script-uses-perl4-libs-without-dep usr/share/cvs/contrib/rcslock:97 getopts.pl

diff --git a/debian/rules b/debian/rules
index 2e1b3fd..cce8b25 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.12 2011/12/04 14:45:59 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.13 2011/12/04 14:51:06 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -119,6 +119,7 @@ debian/.install_stamp: debian/.build_stamp
        #cp tools/ChangeLog debian/stagedir/clogs/ChangeLog.tools
        nroff -man -Tascii contrib/cvshelp.man | \
            col -b >debian/stagedir/cvshelp.txt
+       rm -f debian/stagedir/usr/share/cvs/contrib/rcslock
        @:>$@
 
 binary-indep: