commit wip here, too

diff --git a/debian/README.source b/debian/README.source
index 1a1e241..146667e 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
 #!/bin/mksh
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/README.source,v 1.3 2010/09/16 20:26:14 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/README.source,v 1.4 2010/09/19 17:31:55 tg Exp $
 #-
 
 # The thing behind epoch:upstreamversion- without any ~bpo etc.
@@ -16,8 +16,9 @@ rm -rf !(debian)
 CVSROOT=:ext:_anoncvs@anoncvs.mirbsd.org:/cvs
 [[ $1 = -H ]] && CVSROOT=:ext:_anoncvs@herc.mirbsd.org:/cvs
 CVS_RSH=ssh cvs -qd $CVSROOT co -PA -ddebian/CVSTEMP ports/devel/cvs/patches
+read i?'Press ^C to abort, Enter to apply:'
 
-cat debian/CVSTEMP/* | patch -lp0
+cat debian/CVSTEMP/patch-* | patch -lp0
 find . -name \*.orig -o -name \*.rej
 ed -s configure.in <<-EOF
        ,g/-MirPorts-QQ/s//-MirDebian-${DEBIANVER}/

diff --git a/debian/changelog b/debian/changelog
index 0b0eec9..d6fc0c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cvs (2:1.12.13-2~beta1) UNRELEASED; urgency=low
+
+  * wip trying to get the testsuite done
+  * also fix a couple of warnings
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 19 Sep 2010 17:31:25 +0000
+
 cvs (2:1.12.13-1) unstable; urgency=low
 
   * Build from MirPorts 1.12.13-8 = MirOS BSD 0AAC

diff --git a/debian/control b/debian/control
index fea03e9..a29ea4f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.3 2010/09/16 20:26:15 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.4 2010/09/19 17:31:55 tg Exp $
 #
 Source: cvs
 Section: vcs
@@ -15,7 +15,7 @@ Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/cvs/
 
 Package: cvs
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: cvs-doc
 Conflicts: cvs-doc
 Provides: cvs-doc

diff --git a/debian/info b/debian/info
new file mode 100644 (file)
index 0000000..b714a3c
--- /dev/null
+++ b/debian/info
@@ -0,0 +1,3 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/info,v 1.1 2010/09/19 17:31:55 tg Exp $
+#-
+debian/stagedir/usr/share/info/*.info

diff --git a/debian/install b/debian/install
index ad705a6..8fe28a1 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.2 2010/09/16 18:55:46 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.3 2010/09/19 17:31:56 tg Exp $
 #-
 contrib/cvs_acls.html usr/share/cvs/contrib/
 contrib/cvshelp.man usr/share/cvs/contrib/
@@ -10,4 +10,3 @@ debian/lintian/cvs usr/share/lintian/overrides/
 debian/stagedir/usr/bin/cvs usr/bin/
 debian/stagedir/usr/bin/cvsbug usr/bin/
 debian/stagedir/usr/share/cvs/contrib/* usr/share/cvs/contrib/
-debian/stagedir/usr/share/info/*.info usr/share/info/

diff --git a/debian/lintian/cvs b/debian/lintian/cvs
index 6a639a3..b029053 100644 (file)
--- a/debian/lintian/cvs
+++ b/debian/lintian/cvs
@@ -1,8 +1,7 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.4 2010/09/16 21:53:01 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.5 2010/09/19 17:31:56 tg Exp $
 
-# exceptions granted by MirDebian WTF https master ☺
+# exception granted by MirDebian WTF https master ☺
 cvs: arch-dep-package-has-big-usr-share *
-cvs: new-package-should-close-itp-bug
 
 # these are just contrib
 cvs: csh-considered-harmful ./usr/share/cvs/contrib/sccs2rcs