almost there

diff --git a/debian/README.source b/debian/README.source
index 45255bf..a9063fd 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,8 +1,33 @@
-$MirOS: contrib/hosted/tg/deb/cvs/debian/README.source,v 1.1 2010/09/16 00:18:38 tg Exp $
+#!/bin/mksh
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/README.source,v 1.2 2010/09/16 18:55:45 tg Exp $
+#-
 
-The patches come from AnonCVS at
-:extssh:_anoncvs@anoncvs.mirbsd.org:/cvs ports/devel/cvs/patches/
-and were simply concatenated.
+# The thing behind epoch:upstreamversion- without any ~bpo etc.
+DEBIANVER=1
 
-The configure.in file was patched to reflect version and maintainership.
-Then, autoconf2.59_2.59-1_all was used to regenerate the configure files.
+set -x
+cd "$(dirname "$0")/.."
+debian/rules clean
+set -e
+rm -f .*
+rm -rf !(debian)
+(cd ..; tar xzf cvs_1.12.13.orig.tar.gz)
+
+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
+
+cat debian/CVSTEMP/* | patch -lp0
+find . -name \*.orig -o -name \*.rej
+ed -s configure.in <<-EOF
+       ,g/-MirPorts-QQ/s//-MirDebian-${DEBIANVER}/
+       ,g/miros-discuss@/s//tg@/
+       w
+       q
+EOF
+
+rm -f config.h.in configure
+autoheader2.59
+autoconf2.59
+debian/rules clean
+exit 0

diff --git a/debian/control b/debian/control
index 0441282..8d2879c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,12 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.1 2010/09/16 00:18:39 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.2 2010/09/16 18:55:45 tg Exp $
 #
 Source: cvs
 Section: vcs
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
-Build-Depends: debhelper (>= 5), autotools-dev, libbsd-dev, libpam0g-dev,
- texinfo, zlib1g-dev
+Homepage: http://www.nongnu.org/cvs/
+Build-Depends: debhelper (>= 5), autotools-dev, groff,
+ libbsd-dev, libpam0g-dev, texi2html, texinfo, zlib1g-dev
 Standards-Version: 3.9.1
 # First word is the $CVSROOT (-d arg) string, second word the module.
 Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/cvs

diff --git a/debian/copyright b/debian/copyright
index 3cddf54..50a921e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianised by Thorsten Glaser <tg@mirbsd.de> on
 Wed Sep 15 21:52:29 UTC 2010.
 
-$MirOS: contrib/hosted/tg/deb/cvs/debian/copyright,v 1.1 2010/09/16 00:18:39 tg Exp $
+$MirOS: contrib/hosted/tg/deb/cvs/debian/copyright,v 1.2 2010/09/16 18:55:45 tg Exp $
 
 It was downloaded from:
 http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz
@@ -16,4 +16,7 @@ but contains code from gnulib which raises the minimum required version
 of that licence to 2. On Debian systems, it can be found at
 (GPLv1) /usr/share/common-licenses/GPL-1 and GPL-2.
 
-The file cvs.pam was copied from that other Debian package.
+The file pam was copied from that other Debian package's cvs.pam file.
+
+Development of this package was partially sponsored by tarent GmbH.
+The packaging is covered by the same licence as GNU CVS itself.

diff --git a/debian/docs b/debian/docs
index 18dbefd..7e68689 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/docs,v 1.1 2010/09/16 00:18:39 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/docs,v 1.2 2010/09/16 18:55:46 tg Exp $
 #-
 AUTHORS
 BUGS
@@ -10,8 +10,13 @@ NEWS
 PROJECTS
 README
 TODO
-doc/*.ms
-doc/*.pdf
-doc/*.rtf
+debian/builddir/doc/*.html
+debian/builddir/doc/*.txt
+debian/builddir/doc/cvs.pdf
+debian/builddir/doc/cvsclient.pdf
+debian/stagedir/clogs/ChangeLog.*
 doc/HACKING.DOCS
 doc/RCSFILES
+doc/cvs-paper.ms
+doc/cvs-paper.pdf
+doc/writeproxy.rtf

diff --git a/debian/install b/debian/install
index e71fbe5..ad705a6 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.1 2010/09/16 00:18:39 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.2 2010/09/16 18:55:46 tg Exp $
 #-
 contrib/cvs_acls.html usr/share/cvs/contrib/
 contrib/cvshelp.man usr/share/cvs/contrib/
@@ -10,5 +10,4 @@ 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/cvs.info usr/share/info/
-debian/stagedir/usr/share/info/cvsclient.info usr/share/info/
+debian/stagedir/usr/share/info/*.info usr/share/info/

diff --git a/debian/lintian/cvs b/debian/lintian/cvs
index 7ab7641..70b54ae 100644 (file)
--- a/debian/lintian/cvs
+++ b/debian/lintian/cvs
@@ -1,4 +1,7 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.1 2010/09/16 00:18:41 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.2 2010/09/16 18:55:47 tg Exp $
+
+# exception granted by MirDebian WTF https master
+cvs: arch-dep-package-has-big-usr-share *
 
 # these are just contrib
 cvs: csh-considered-harmful ./usr/share/cvs/contrib/sccs2rcs

diff --git a/debian/cvs.pam b/debian/pam
similarity index 100%
rename from debian/cvs.pam
rename to debian/pam

diff --git a/debian/rules b/debian/rules
index f8763db..9cd334d 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.1 2010/09/16 00:18:40 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.2 2010/09/16 18:55:46 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -23,11 +23,11 @@ MAKEFLAGS+= -j${NUMJOBS}
 endif
 
 CPPFLAGS+=     -D_GNU_SOURCE
+CPPFLAGS+=     -include ${CURDIR}/debian/port.h
+
 CPPFLAGS+=     -DUSE_LIBBSD
 LIBS+=         -lbsd
 
-CPPFLAGS+=     -include ${CURDIR}/debian/port.h
-
 CONFIGURE_ENV:=                CC='${CC}'
 CONFIGURE_ENV+=                CFLAGS='${CFLAGS}'
 CONFIGURE_ENV+=                CPPFLAGS='${CPPFLAGS}'
@@ -65,37 +65,60 @@ CONFIGURE_ARGS+=    --disable-nls \
                        --with-umask=002 \
                        --with-cvs-admin-group=_cvsadmin
 
-MAKE_ARGS:=            MAKEINFO='makeinfo --no-split'
+MAKE_ARGS:=            MAKEINFO=makeinfo
+MAKE_ARGS+=            MAKEINFOFLAGS=--no-split
+
+CLEANFILES:=           autom4te.cache debian/CVSTEMP debian/.*_stamp \
+                       debian/builddir debian/stagedir \
+                       build-aux/config.guess build-aux/config.sub \
+                       doc/cvs.1 doc/cvs.info* doc/cvsclient.info* \
+                       doc/cvs.pdf doc/cvsclient.pdf
 
 debian/.configure_stamp:
        dh_testdir
-       -rm -f debian/.*_stamp build-aux/config.guess build-aux/config.sub
-       -rm -rf debian/builddir debian/stagedir
+       -rm -rf ${CLEANFILES}
        cp /usr/share/misc/config.guess /usr/share/misc/config.sub build-aux/
        mkdir debian/builddir debian/stagedir
        cd debian/builddir && \
            env ${CONFIGURE_ENV} sh ../../configure ${CONFIGURE_ARGS}
        @:>$@
 
-build: debian/.configure_stamp
+build: debian/.build_stamp
+
+debian/.build_stamp: debian/.configure_stamp
        dh_testdir
-       cd debian/builddir && ${MAKE}
+       cd debian/builddir && ${MAKE} ${MAKE_ARGS}
+       cd debian/builddir && ${MAKE} -C doc ${MAKE_ARGS} doc html info pdf txt
+       @:>$@
 
 clean:
        dh_testdir
-       -rm -f debian/.*_stamp build-aux/config.guess build-aux/config.sub
-       -rm -f doc/cvs.1 doc/cvs.info* doc/cvsclient.info*
-       -rm -rf debian/builddir debian/stagedir
+       -rm -rf ${CLEANFILES}
        dh_clean
 
-install: build
+install: debian/.install_stamp
+
+debian/.install_stamp: debian/.build_stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        -rm -rf debian/stagedir
-       _topdir=$$(pwd); cd debian/builddir && \
-           ${MAKE} DESTDIR=$$_topdir/debian/stagedir install
+       mkdir -p debian/stagedir/clogs
+       cd debian/builddir && \
+           ${MAKE} ${MAKE_ARGS} DESTDIR=${CURDIR}/debian/stagedir install
+       cat ChangeLog ChangeLog.zoo >debian/stagedir/clogs/ChangeLog
+       cat doc/ChangeLog doc/ChangeLog.fsf >debian/stagedir/clogs/ChangeLog.doc
+       cat lib/ChangeLog lib/ChangeLog.fsf >debian/stagedir/clogs/ChangeLog.lib
+       cat src/ChangeLog src/ChangeLog-97 src/ChangeLog-96 src/ChangeLog-9395 \
+           src/ChangeLog-9194 >debian/stagedir/clogs/ChangeLog.src
+       cp contrib/ChangeLog debian/stagedir/clogs/ChangeLog.contrib
+       cp contrib/pam/ChangeLog debian/stagedir/clogs/ChangeLog.pam
+       cp diff/ChangeLog debian/stagedir/clogs/ChangeLog.diff
+       cp m4/ChangeLog debian/stagedir/clogs/ChangeLog.m4
+       cp man/ChangeLog debian/stagedir/clogs/ChangeLog.man
+       cp tools/ChangeLog debian/stagedir/clogs/ChangeLog.tools
+       @:>$@
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -105,7 +128,7 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs ChangeLog
+       dh_installchangelogs debian/stagedir/clogs/ChangeLog
        dh_installdocs
 #      dh_installexamples
        dh_install

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644 (file)
index 0000000..9b721df
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,8 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/source.lintian-overrides,v 1.1 2010/09/16 18:55:46 tg Exp $
+
+# we know, who cares, this is the way this package works
+cvs source: direct-changes-in-diff-but-no-patch-system *
+
+# this is the way the distfile is
+cvs source: source-contains-cvs-control-dir zlib/CVS
+cvs source: source-contains-cvs-control-dir zlib/os2/CVS