this is lintian -vIiE --pedantic clean \o/ and builds on etch and sid

diff --git a/debian/README.source b/debian/README.source
index a9063fd..1a1e241 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.2 2010/09/16 18:55:45 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/README.source,v 1.3 2010/09/16 20:26:14 tg Exp $
 #-
 
 # The thing behind epoch:upstreamversion- without any ~bpo etc.
@@ -30,4 +30,5 @@ rm -f config.h.in configure
 autoheader2.59
 autoconf2.59
 debian/rules clean
+find debian -name CVS -a -type d -print0 | xargs -0r rm -rf --
 exit 0

diff --git a/debian/changelog b/debian/changelog
index 393292b..fe7a406 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 cvs (2:1.12.13-1~beta1) unstable; urgency=low
 
-  * Initial release. (Closes: #9999999999 to please lintian.)
+  * Initial release.
 
- -- Thorsten Glaser <tg@mirbsd.de>  Wed, 15 Sep 2010 21:45:20 +0000
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 16 Sep 2010 20:06:04 +0000

diff --git a/debian/control b/debian/control
index 8d2879c..fea03e9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.2 2010/09/16 18:55:45 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.3 2010/09/16 20:26:15 tg Exp $
 #
 Source: cvs
 Section: vcs
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
 Homepage: http://www.nongnu.org/cvs/
-Build-Depends: debhelper (>= 5), autotools-dev, groff,
- libbsd-dev, libpam0g-dev, texi2html, texinfo, zlib1g-dev
+Build-Depends: debhelper (>= 5), autotools-dev, bsdmainutils, groff,
+ libbsd-dev, libpam0g-dev, texi2html, texinfo, texlive-latex-base,
+ 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/doc-base b/debian/doc-base
new file mode 100644 (file)
index 0000000..5b877d9
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,21 @@
+Document: cvs-doc
+Title: Cederqvist - The CVS manual
+Author: FSF, Derek R. Price, Ximbiot, Signum Support AB, and others
+Abstract: This manual describes how to use and administer CVS.
+ It is both a manual and a tutorial, as well as a reference guide,
+ also known as The Cederqvist, and *the* book to read before using CVS.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/cvs/cvs.html
+Files: /usr/share/doc/cvs/cvs.html*
+
+Format: Text
+Files: /usr/share/doc/cvs/cvs.txt*
+
+Format: PDF
+Files: /usr/share/doc/cvs/cvs.pdf*
+
+Format: Info
+Index: /usr/share/info/cvs.info.gz
+Files: /usr/share/info/cvs.info*

diff --git a/debian/doc-base.advice b/debian/doc-base.advice
new file mode 100644 (file)
index 0000000..9dd8b7d
--- /dev/null
+++ b/debian/doc-base.advice
@@ -0,0 +1,7 @@
+Document: cvs-doc-advice
+Title: Advice on using the Concurrent Versions System
+Author: Lowell Skoog <fluke!lowell@uunet.uu.net>
+Section: Programming
+
+Format: Text
+Files: /usr/share/doc/cvs/cvshelp.txt*

diff --git a/debian/doc-base.client b/debian/doc-base.client
new file mode 100644 (file)
index 0000000..934f4d4
--- /dev/null
+++ b/debian/doc-base.client
@@ -0,0 +1,18 @@
+Document: cvs-doc-client
+Title: CVS client/server protocol description
+Abstract: This document describes the client/server protocol used by CVS.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/cvs/cvsclient.html
+Files: /usr/share/doc/cvs/cvsclient.html*
+
+Format: Text
+Files: /usr/share/doc/cvs/cvsclient.txt*
+
+Format: PDF
+Files: /usr/share/doc/cvs/cvsclient.pdf*
+
+Format: Info
+Index: /usr/share/info/cvsclient.info.gz
+Files: /usr/share/info/cvsclient.info*

diff --git a/debian/doc-base.faq b/debian/doc-base.faq
new file mode 100644 (file)
index 0000000..c47af90
--- /dev/null
+++ b/debian/doc-base.faq
@@ -0,0 +1,10 @@
+Document: cvs-doc-faq
+Title: CVS - Frequently Asked Questions
+Author: David Grubbs, Dr. Pascal Molli, and others
+Abstract: Packaged FAQ-O-MATIC dump containing a number of answers
+ to frequently asked questions about CVS. The document may be out of
+ date; http://ximbiot.com/cvs/wiki/CVS%20FAQ contains an updated version.
+Section: Programming
+
+Format: Text
+Files: /usr/share/doc/cvs/FAQ*

diff --git a/debian/doc-base.intro b/debian/doc-base.intro
new file mode 100644 (file)
index 0000000..55429e1
--- /dev/null
+++ b/debian/doc-base.intro
@@ -0,0 +1,7 @@
+Document: cvs-doc-intro
+Title: Introduction to using CVS
+Author: Steven Pemberton <Steven.Pemberton@cwi.nl>
+Section: Programming
+
+Format: Text
+Files: /usr/share/cvs/contrib/intro.doc*

diff --git a/debian/doc-base.paper b/debian/doc-base.paper
new file mode 100644 (file)
index 0000000..6fe37be
--- /dev/null
+++ b/debian/doc-base.paper
@@ -0,0 +1,14 @@
+Document: cvs-doc-paper
+Title: CVS II: Parallelizing Software Development
+Author: Brian Berliner <berliner@prisma.com>
+Abstract: This paper is the cvs USENIX article, Winter 1990.
+ The program described in this paper fills a need in the UNIX community
+ for a freely available tool to manage software revision and release
+ control in a multi-developer, multi-directory, multi-group environment.
+ This tool also addresses the increasing need for tracking third-party
+ vendor source distributions while trying to maintain local modifications
+ to earlier releases.
+Section: Programming
+
+Format: PDF
+Files: /usr/share/doc/cvs/cvs-paper.pdf*

diff --git a/debian/doc-base.rcsfiles b/debian/doc-base.rcsfiles
new file mode 100644 (file)
index 0000000..7a98a4b
--- /dev/null
+++ b/debian/doc-base.rcsfiles
@@ -0,0 +1,11 @@
+Document: cvs-doc-rcsfiles
+Title: RCS file format description
+Author: Jim Kingdon
+Abstract: This file attempts to document the RCS file format (which is
+ implemented by a great many tools, both free and non-free, both by
+ calling GNU RCS and by reimplementing access to RCS files) in some
+ standard separate from any one tool.
+Section: Programming
+
+Format: Text
+Files: /usr/share/doc/cvs/RCSFILES*

diff --git a/debian/docs b/debian/docs
index 7e68689..5218464 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/docs,v 1.2 2010/09/16 18:55:46 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/docs,v 1.3 2010/09/16 20:26:16 tg Exp $
 #-
 AUTHORS
 BUGS
@@ -15,6 +15,7 @@ debian/builddir/doc/*.txt
 debian/builddir/doc/cvs.pdf
 debian/builddir/doc/cvsclient.pdf
 debian/stagedir/clogs/ChangeLog.*
+debian/stagedir/cvshelp.txt
 doc/HACKING.DOCS
 doc/RCSFILES
 doc/cvs-paper.ms

diff --git a/debian/lintian/cvs b/debian/lintian/cvs
index 70b54ae..e0d1dd4 100644 (file)
--- a/debian/lintian/cvs
+++ b/debian/lintian/cvs
@@ -1,8 +1,8 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.2 2010/09/16 18:55:47 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.3 2010/09/16 20:26:17 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
-cvs: missing-dep-for-interpreter csh => tcsh | csh | c-shell (./usr/share/cvs/contrib/sccs2rcs)
+cvs: missing-dep-for-interpreter csh *

diff --git a/debian/rules b/debian/rules
index 9cd334d..f1a597b 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.2 2010/09/16 18:55:46 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.3 2010/09/16 20:26:16 tg Exp $
 #-
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
@@ -24,6 +24,7 @@ endif
 
 CPPFLAGS+=     -D_GNU_SOURCE
 CPPFLAGS+=     -include ${CURDIR}/debian/port.h
+CFLAGS+=       -fno-strict-aliasing -Wformat
 
 CPPFLAGS+=     -DUSE_LIBBSD
 LIBS+=         -lbsd
@@ -72,7 +73,9 @@ 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
+                       doc/cvs.pdf doc/cvsclient.pdf \
+                       doc/getdate-cvs.texi \
+                       vms/config.h windows-NT/config.h
 
 debian/.configure_stamp:
        dh_testdir
@@ -118,6 +121,8 @@ debian/.install_stamp: debian/.build_stamp
        cp m4/ChangeLog debian/stagedir/clogs/ChangeLog.m4
        cp man/ChangeLog debian/stagedir/clogs/ChangeLog.man
        cp tools/ChangeLog debian/stagedir/clogs/ChangeLog.tools
+       nroff -man -Tascii contrib/cvshelp.man | \
+           col -b >debian/stagedir/cvshelp.txt
        @:>$@
 
 # Build architecture-independent files here.