rework what we actually do ship with the binary package (gah!)
authortg <tg@mirbsd.org>
Sun, 4 Dec 2011 15:11:41 +0000 (15:11 +0000)
committertg <tg@mirbsd.org>
Sun, 4 Dec 2011 15:11:41 +0000 (15:11 +0000)
debian/NEWS
debian/changelog
debian/install
debian/links [deleted file]
debian/manpages
debian/rules

index e7dd0f6..e272ef6 100644 (file)
@@ -1,3 +1,13 @@
+cvs (2:1.12.13+real-7) xunstable; urgency=low
+
+  rcs2log no longer lives in the PATH, the contributed script
+  and its manpage are in /usr/share/cvs/contrib/rcs2log now.
+
+  Some contrib files (and their documentation) are no longer
+  shipped with the binary package (antique, insecure, useless).
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 04 Dec 2011 15:08:49 +0000
+
 cvs (2:1.12.13+real-5) unstable; urgency=low
 
   This cvs package is a totally new packaging and has almost
index 488df67..2b1c91c 100644 (file)
@@ -1,12 +1,15 @@
 cvs (2:1.12.13+real-7) xunstable; urgency=low
 
-  * Drop unsafe rcslock script from contrib
+  * Drop unsafe scripts from contrib, add NEWS entry for that
   * 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
   * Update maintainer scripts from template jupp (better comments)
+  * Drop csh-using contrib script from package, with NEWS entry
+  * Demote rcs2log(1) to contrib, add NEWS entry
+  * Stop shipping a patch to rcs(1) with the binary package, ffs
 
- -- Thorsten Glaser <tg@mirbsd.de>  Sun, 04 Dec 2011 14:45:09 +0000
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 04 Dec 2011 15:08:49 +0000
 
 cvs (2:1.12.13+real-6) unstable; urgency=low
 
index 0aac7a5..294f91d 100644 (file)
@@ -1,9 +1,10 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.6 2011/12/04 14:55:22 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.7 2011/12/04 15:11:40 tg Exp $
 #-
-contrib/cvs_acls.html usr/share/cvs/contrib/
+#contrib/cvs_acls.html usr/share/cvs/contrib/
 contrib/cvshelp.man usr/share/cvs/contrib/
 contrib/descend.man usr/share/cvs/contrib/
 contrib/descend.sh usr/share/cvs/contrib/
+contrib/rcs2log.1 usr/share/cvs/contrib/
 contrib/rcs2sccs.sh usr/share/cvs/contrib/
 contrib/sandbox_status.man usr/share/cvs/contrib/
 debian/cvs-switchroot usr/bin/
diff --git a/debian/links b/debian/links
deleted file mode 100644 (file)
index 548d564..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/links,v 1.1 2010/09/16 00:18:40 tg Exp $
-#-
-usr/share/cvs/contrib/rcs2log usr/bin/rcs2log
index 0fa8958..51ce07a 100644 (file)
@@ -1,6 +1,5 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/manpages,v 1.3 2011/07/28 15:56:23 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/manpages,v 1.4 2011/12/04 15:11:41 tg Exp $
 #-
-contrib/rcs2log.1
 debian/cvs-switchroot.1
 debian/stagedir/usr/share/man/man1/cvs.1
 debian/stagedir/usr/share/man/man5/cvs.5
index a5dad22..b1a2296 100755 (executable)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.14 2011/12/04 14:55:22 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.15 2011/12/04 15:11:41 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -119,10 +119,19 @@ 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
+       # fat and nonsensical to ship this
+       rm -f debian/stagedir/usr/share/cvs/contrib/rcs-5.7-commitid.patch
        # uses csh
        rm -f debian/stagedir/usr/share/cvs/contrib/sccs2rcs
        # unsafe
+       rm -f debian/stagedir/usr/share/cvs/contrib/commit_prep
+       rm -f debian/stagedir/usr/share/cvs/contrib/cvs_acls
+       rm -f debian/stagedir/usr/share/cvs/contrib/log
+       rm -f debian/stagedir/usr/share/cvs/contrib/log_accum
+       rm -f debian/stagedir/usr/share/cvs/contrib/mfpipe
        rm -f debian/stagedir/usr/share/cvs/contrib/rcslock
+       # we ship cvs-switchroot(1) instead
+       rm -f debian/stagedir/usr/share/cvs/contrib/newcvsroot
        @:>$@
 
 binary-indep: