lintian and d/rules cleanup round
authortg <tg@mirbsd.org>
Sat, 12 Nov 2011 00:11:23 +0000 (00:11 +0000)
committertg <tg@mirbsd.org>
Sat, 12 Nov 2011 00:11:23 +0000 (00:11 +0000)
debian/changelog
debian/lintian/cvs
debian/rules

index 13f7f0e..5cf2d36 100644 (file)
@@ -1,3 +1,10 @@
+cvs (2:1.12.13+real-7) xunstable; urgency=low
+
+  * Add lintian override for rcslock contrib script
+  * debian/rules: cleanup (remove install/check, dh_installdirs)
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 12 Nov 2011 00:05:27 +0000
+
 cvs (2:1.12.13+real-6) unstable; urgency=low
 
   * d/watch: mangle the +real away until 1.12.14 is out,
index e43d974..ac48c9e 100644 (file)
@@ -1,9 +1,7 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.8 2011/05/06 23:46:19 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.9 2011/11/12 00:11:23 tg Exp $
 
 # these are just contrib
 cvs: csh-considered-harmful usr/share/cvs/contrib/sccs2rcs
 cvs: missing-dep-for-interpreter csh *
-
-# this is part of the ABI
-#XXX lintian 2.5.0~rc3 stopped complaining about it? why?
-#cvs: spelling-error-in-binary usr/bin/cvs misformed malformed
+# 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
index 98a4474..01426b2 100755 (executable)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.10 2011/07/28 11:35:12 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.11 2011/11/12 00:11:22 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -98,13 +98,10 @@ clean:
        -rm -rf ${CLEANFILES}
        dh_clean
 
-install: debian/.install_stamp
-
 debian/.install_stamp: debian/.build_stamp
        dh_testdir
        dh_testroot
        dh_clean -k
-       dh_installdirs
        -rm -rf debian/stagedir
        mkdir -p debian/stagedir/clogs
        cd debian/builddir && \
@@ -124,12 +121,9 @@ debian/.install_stamp: debian/.build_stamp
            col -b >debian/stagedir/cvshelp.txt
        @:>$@
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-indep:
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build debian/.install_stamp
        dh_testdir
        dh_testroot
        dh_installchangelogs debian/stagedir/clogs/ChangeLog
@@ -149,4 +143,4 @@ binary-arch: build install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install check
+.PHONY: binary binary-arch binary-indep build build-arch build-indep clean