This commit was generated by cvs2svn to compensate for changes in r36, which
authortg <tg@mirbsd.org>
Thu, 28 Jul 2011 10:44:52 +0000 (10:44 +0000)
committertg <tg@mirbsd.org>
Thu, 28 Jul 2011 10:44:52 +0000 (10:44 +0000)
included commits to RCS files with non-trunk default branches.

28 files changed:
debian/NEWS [new file with mode: 0644]
debian/README.source [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/cvs-switchroot [new file with mode: 0644]
debian/cvs-switchroot.1 [new file with mode: 0644]
debian/doc-base [new file with mode: 0644]
debian/doc-base.advice [new file with mode: 0644]
debian/doc-base.client [new file with mode: 0644]
debian/doc-base.faq [new file with mode: 0644]
debian/doc-base.intro [new file with mode: 0644]
debian/doc-base.paper [new file with mode: 0644]
debian/doc-base.rcsfiles [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/info [new file with mode: 0644]
debian/install [new file with mode: 0644]
debian/links [new file with mode: 0644]
debian/lintian/cvs [new file with mode: 0644]
debian/manpages [new file with mode: 0644]
debian/port.h [new file with mode: 0644]
debian/postinst [new file with mode: 0644]
debian/postrm [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source.lintian-overrides [new file with mode: 0644]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644 (file)
index 0000000..e7dd0f6
--- /dev/null
@@ -0,0 +1,32 @@
+cvs (2:1.12.13+real-5) unstable; urgency=low
+
+  This cvs package is a totally new packaging and has almost
+  nothing in common with what was in Debian before. The most
+  visible changes are outlined below:
+
+  pserver is no longer officially supported; the cvs package
+  does not install any service, inetd, or something similar.
+  If you want to set up a CVS server, use SSH, as shown in:
+  * http://www.stremler.net/Code/cvs_tricks/cvs-over-ssh.html
+  * http://www.stremler.net/Code/cvs_tricks/cvs-over-ssh-advanced.html
+  * http://www.stremler.net/Code/cvs_tricks/cvs-over-ssh-advanced2.html
+
+  Consequentially, PAM is also no longer supported, and this
+  package does not set up or manage any repositories; that's
+  the system administrator's job now.
+
+  For running "cvs admin" tasks the user must be a member of
+  the new "_cvsadmin" system group, or the repository be set
+  up (UserAdminOptions in CVSROOT/config) to allow everyone.
+
+  The date format for $Id$ and similar in checkouts has been
+  switched back from ISO 8601 to the standard RCS format, to
+  keep checksums over checkouts/exports consistent. This, as
+  well as the fact that only the :local: and :extssh: access
+  methods are officially supported, is not negotiable.
+
+  Please direct feature requests upstream, not to the BTS. I
+  do quite an amount of hacking CVS, but prefer to care only
+  about the packaging bits with "full power" in Debian.
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 11 Jun 2011 05:01:49 +0000
diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..febb5d6
--- /dev/null
@@ -0,0 +1,47 @@
+#!/bin/mksh
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/README.source,v 1.10 2011/06/11 05:25:57 tg Exp $
+#-
+# The patches are placed otherwhere in CVS:
+# Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs ports/devel/cvs/patches
+# Vcs-Browser: http://cvs.mirbsd.de/ports/devel/cvs/patches/
+# Please look here too:
+# Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs src/gnu/usr.bin/cvs
+# Vcs-Browser: http://cvs.mirbsd.de/src/gnu/usr.bin/cvs/
+
+# The thing behind epoch:upstreamversion- without any ~bpo etc.
+DEBIANVER=5
+
+set -x
+cd "$(dirname "$0")/.."
+[[ $(basename "$(pwd)") = cvs-1.12.13 ]] && exit 1
+debian/rules clean
+set -e
+(cd ..; tar xzf cvs_1.12.13+real.orig.tar.gz)
+mv debian ../cvs-1.12.13/
+cd ..
+rm -rf cvs-1.12.13+real
+mv cvs-1.12.13 cvs-1.12.13+real
+cd cvs-1.12.13+real
+
+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-* | 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
+#aclocal-1.9 -I m4
+autoheader2.59
+automake-1.9
+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
new file mode 100644 (file)
index 0000000..4b435e6
--- /dev/null
@@ -0,0 +1,65 @@
+cvs (2:1.12.13+real-6) xunstable; urgency=low
+
+  * d/watch: mangle the +real away until 1.12.14 is out,
+    as this is an artefact from the old (epoch 1) packaging
+  * Demote mksh to Suggests, recommended (hah!) by many
+    (Closes: #631110) (merges back 2:1.12.13+real-5ubuntu1)
+  * Honour Policy §11.4; fix by YOSHINO Yoshihito (Closes: #631936)
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Thu, 30 Jun 2011 13:50:47 +0000
+
+cvs (2:1.12.13+real-5) unstable; urgency=low
+
+  * Drop PAM entirely, it was specific to Debian anyway
+  * Add cvs-switchroot, from src/scripts/mnt-cvsroot (Closes: #41685)
+  * Drop some old and irrelevant changelogs from the binary package
+  * Update from MirPorts 1.12.13-11 = MirOS BSD 0AAE.2
+  * Revert most of 65_login_cvspass_message and just be silent if the
+    pserver client password file doesn't exist and create it silently
+    if needed (Closes: #524146)
+  * Honour noexec flag in 'cvs -n init' (Closes: #151982)
+  * Sync modules option list with cederqvist (Closes: #226888)
+  * Apply patch for assert on negated version numbers on diff
+    (Closes: #297551)
+    From: Peter Moulder <Peter.Moulder@infotech.monash.edu.au>
+  * Change cvs add dir message (Closes: #294094)
+  * Accept port when using extssh connection method (Closes: #151882)
+  * Write a new command for direct ,v file download (Closes: #421119)
+  * Drop broken libbsd.fd.o headers and shut up gcc 4.6 warnings
+  * Fix piuparts breakage: ignore delgroup non-existence on purge
+  * Deliver a NEWS.Debian (Closes: #626106)
+  * d/README.source: Update, call to automake is now also needed
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 11 Jun 2011 05:32:56 +0000
+
+cvs (2:1.12.13+real-4) unstable; urgency=low
+
+  * Renamed .orig.tar.gz due to archive pathname conflict
+  * d/README.source: Document patch location (VCS-CVS, VCS-Browser alike)
+  * New build from MirPorts 1.12.13-10 = MirOS BSD 0AAE.1
+    - Contains changes from cvs (1:1.12.13-12ubuntu1):
+      + Apply fix from Kees Cook to avoid %n in writable memory (LP: #296453)
+    - Other BTS relevant changes:
+      + Allow CVSROOT-less “version” (LP: #97683) and “cvs version”
+      + Update loginfo documentation, ‘%{t}’ is indeed gone (Closes: #329151)
+      + Lower syslog level from emergency (Closes: #563856)
+      + Fix awk substr start argument, thanks John Hughes (Closes: #518600)
+      + Rename nodes with colons in them (Closes: #113809)
+      + Fix typo (Closes: #464137)
+      + Document missing rcs2log(1) options (Closes: #306354) and fix dashes
+  * Upload new package to Debian unstable (Closes: #306432)
+    (Closes: #458864) (Closes: #464134) (Closes: #479752)
+    (Closes: #576035) (Closes: #614700) (Closes: #617578)
+    - Drop PAM (Closes: #340984) (Closes: #393436)
+    - No longer installs repositories (Closes: #168300)
+      (Closes: #408117) (Closes: #482301) (Closes: #499790)
+      (Closes: #511643) (Closes: #607297)
+    - Deprecate pserver (Closes: #343169) (Closes: #495938)
+    - Drop Origin and Bugs headers again (upload to Debian proper)
+      and old (pre-Debian upload) private repo changelog entries
+    - Thank you, Steve, for handing over package maintainership!
+  * Clarify package description (LP: #377411)
+  * Build with Kerberos V support (Closes: #60800) (LP: #157760)
+  * Recommends: openssh-client; Suggests: rcs
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 07 May 2011 01:00:39 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..98552c6
--- /dev/null
@@ -0,0 +1,47 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.17 2011/06/24 16:16:06 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, bsdmainutils, groff,
+ libbsd-dev, libkrb5-dev | heimdal-dev, texi2html, texinfo,
+ texlive-latex-base, zlib1g-dev
+Standards-Version: 3.9.2
+# 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
+Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/cvs/
+
+Package: cvs
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser,
+ dpkg (>= 1.15.4) | install-info
+Recommends: openssh-client
+Suggests: mksh (>= 40~), rcs
+Replaces: cvs-doc
+Conflicts: cvs-doc
+Provides: cvs-doc
+Description: Concurrent Versions System
+ CVS is a version control system, which allows you to keep old versions
+ of files (usually source code), keep a log of who, when, and why
+ changes occurred, etc., like RCS or SCCS.  It handles multiple
+ developers, multiple directories, triggers to enable/log/control
+ various operations, and can work over a wide area network.  The
+ following tasks are not included; they can be done in conjunction with
+ CVS but will tend to require some script-writing and software other
+ than CVS: bug-tracking, build management (that is, make and make-like
+ tools), and automated testing.
+ .
+ And a whole lot more.  See the manual for more information.
+ This package includes the client and server both, but pserver has been
+ deprecated in favour of ssh, so no repositories or inetd server entries
+ are created automatically any more.
+ .
+ GNU CVS, with the patches from here applied, is used (in this patched
+ version) heavily by the MirOS Project, internally, and to maintain the
+ MirOS BSD, MirPorts Framework, and other subprojects', as well as
+ hosted projects, such as FWCF, source code and associated other works.
+ .
+ This version also contains many patches originating from Debian.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..d6348e9
--- /dev/null
@@ -0,0 +1,20 @@
+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.4 2011/05/10 13:16:26 tg Exp $
+
+It was downloaded from:
+http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz
+
+
+GNU CVS itself is Copyright © 1986-2005
+       The Free Software Foundation, Inc.
+with portions contributed by others.
+
+It is licenced under the GNU General Public License, version 1 or later,
+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.
+
+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/cvs-switchroot b/debian/cvs-switchroot
new file mode 100644 (file)
index 0000000..934845e
--- /dev/null
@@ -0,0 +1,99 @@
+#!/bin/mksh
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/cvs-switchroot,v 1.1 2011/06/10 23:44:12 tg Exp $
+#-
+# Copyright © 2005, 2008, 2011
+#      Thorsten “mirabilos” Glaser <tg@mirbsd.org>
+#
+# Provided that these terms and disclaimer and all copyright notices
+# are retained or reproduced in an accompanying document, permission
+# is granted to deal in this work without restriction, including un‐
+# limited rights to use, publicly perform, distribute, sell, modify,
+# merge, give away, or sublicence.
+#
+# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
+# the utmost extent permitted by applicable law, neither express nor
+# implied; without malicious intent or gross negligence. In no event
+# may a licensor, author or contributor be held liable for indirect,
+# direct, other damage, loss, or other issues arising in any way out
+# of dealing in the work, even if advised of the possibility of such
+# damage or existence of a defect, except proven that it results out
+# of said person’s immediate fault when using the work as intended.
+#-
+# Change CVSROOT of a checked out tree (and save space with it)
+# With option -T: change Tag instead of Root
+
+me=${0##*/}
+if [[ $1 = -T ]]; then
+       tagmode=-T
+       fn=Tag
+       shift
+else
+       tagmode=
+       fn=Root
+fi
+newroot=$1
+useroot=0
+if [[ $newroot = - ]]; then
+       shift
+       newroot=$(realpath "$1")
+       [[ -d $newroot ]] && if [[ -d $newroot/CVS ]]; then
+               newroot=$newroot/CVS/$fn
+       else
+               newroot=$newroot/$fn
+       fi
+       useroot=1
+fi
+if [[ -z $newroot || $newroot = -? ]]; then
+       print -u2 "Syntax: $me newroot [dir [...]]"
+       print -u2 "\t$me - .../CVS/Root [dir [...]]"
+       print -u2 "\t$me -T - .../CVS/Tag [dir [...]]"
+       exit 1
+fi
+shift
+
+[[ -z $1 ]] && set -- .
+
+# realpath(2)ise arguments
+set -A arg
+let i=0
+for name in "$@"; do
+       arg[i++]=$(realpath "$name")
+done
+
+if ! T="$(mktemp ${arg[0]}/$me.XXXXXXXXXX)"; then
+       print -u2 "$me: fatal: cannot mktemp"
+       exit 1
+fi
+
+if (( useroot )); then
+       rm -f "$T"
+       ln "$newroot" "$T" || cp "$newroot" "$T"
+fi
+
+trap 'rm -f "$T"; exit 0' 0
+trap 'rm -f "$T"; trap - EXIT; exit 1' 1 2 3 5 13 15
+
+if (( !useroot )); then
+       chmod 664 "$T"
+       print -r -- "$newroot" >"$T"
+fi
+
+let rv=0
+find "${arg[@]}" -path \*/CVS/$fn -print0 |&
+while IFS= read -d '' -pr name; do
+       if ! rm "$name"; then
+               print -u2 "$me: error: cannot rm <$name>"
+               exit 1
+       fi
+       ln -f "$T" "$name" || if ! U="$(mktemp ${arg[0]}/$me.XXXXXXXXXX)"; then
+               cp "$T" "$name"
+       elif cat "$T" >"$U" && ln -f "$U" "$name"; then
+               rm -f "$T"
+               T="$U"
+       else
+               rm -f "$U"
+               cp "$T" "$name"
+       fi
+done
+
+exit 0
diff --git a/debian/cvs-switchroot.1 b/debian/cvs-switchroot.1
new file mode 100644 (file)
index 0000000..1ffe5b6
--- /dev/null
@@ -0,0 +1,78 @@
+.\" $MirOS: contrib/hosted/tg/deb/cvs/debian/cvs-switchroot.1,v 1.2 2011/06/24 16:16:06 tg Exp $
+.\"
+.Dd June 10, 2011
+.Dt CVS\-SWITCHROOT 1
+.Os
+.Sh NAME
+.Nm cvs\-switchroot
+.Nd change repository or tag in a cvs working copy
+.Sh SYNOPSIS
+.Nm
+.Op Fl T
+.Ar newroot
+.Op Ar
+.Pp
+.Nm
+.Op Fl T
+\-\&
+.Ar srcpath
+.Op Ar
+.Sh DESCRIPTION
+The
+.Nm
+utility manipulates a CVS working copy directly,
+modifying the information stored in the administrative
+subdirectory and saving space by hardlinking if possible.
+.Pp
+If the
+.Fl T
+option is given, the sticky tag is operated on,
+otherwise, the repository path
+.Pq Ev CVSROOT .
+.Pp
+The information (Tag or Root) is set to the same as in
+.Ar srcpath
+if the first non-option argument
+.Ar newroot
+is a sole dash
+.Pq Sq \-\& ,
+the literal value
+.Ar newroot
+otherwise.
+.Sh EXAMPLES
+Change all
+.Pa Root
+information in the current sandbox to 
+.Pa /cvs :
+.Bd -literal -offset ident
+$ cvs-switchroot /cvs .
+.Ed
+.Pp
+Set all roots in the current working directory and all
+its subdirectories to the
+.Pa Root
+of the parent directory:
+.Bd -literal -offset ident
+$ cvs-switchroot \- .. .
+.Ed
+.Pp
+Hardlink the
+.Pa Tag
+information in the current working directory, for example
+.Pa /usr/src ,
+and
+.Pa /usr/ports
+with each other:
+.Bd -literal -offset ident
+$ cvs-switchroot \-T \- . . /usr/ports
+.Ed
+.Sh SEE ALSO
+.Xr cvs 1
+.Sh HISTORY
+.Nm
+has existed in the MirBSD source tree since 2005.
+It was added to Debian's cvs package in 2011.
+.Sh CAVEATS
+.Nm
+depends on
+.Nm mksh .
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644 (file)
index 0000000..5b877d9
--- /dev/null
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
new file mode 100644 (file)
index 0000000..5218464
--- /dev/null
@@ -0,0 +1,23 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/docs,v 1.3 2010/09/16 20:26:16 tg Exp $
+#-
+AUTHORS
+BUGS
+DEVEL-CVS
+FAQ
+HACKING
+MINOR-BUGS
+NEWS
+PROJECTS
+README
+TODO
+debian/builddir/doc/*.html
+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
+doc/cvs-paper.pdf
+doc/writeproxy.rtf
diff --git a/debian/info b/debian/info
new file mode 100644 (file)
index 0000000..b714a3c
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..b4ef076
--- /dev/null
@@ -0,0 +1,13 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/install,v 1.4 2011/06/10 23:44:13 tg Exp $
+#-
+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/rcs2sccs.sh usr/share/cvs/contrib/
+contrib/sandbox_status.man usr/share/cvs/contrib/
+debian/cvs-switchroot usr/bin/
+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/
diff --git a/debian/links b/debian/links
new file mode 100644 (file)
index 0000000..548d564
--- /dev/null
@@ -0,0 +1,3 @@
+# $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
diff --git a/debian/lintian/cvs b/debian/lintian/cvs
new file mode 100644 (file)
index 0000000..e43d974
--- /dev/null
@@ -0,0 +1,9 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.8 2011/05/06 23:46:19 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
diff --git a/debian/manpages b/debian/manpages
new file mode 100644 (file)
index 0000000..022f8a8
--- /dev/null
@@ -0,0 +1,7 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/manpages,v 1.2 2011/06/10 23:44:13 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
+debian/stagedir/usr/share/man/man8/cvsbug.8
diff --git a/debian/port.h b/debian/port.h
new file mode 100644 (file)
index 0000000..6299eb9
--- /dev/null
@@ -0,0 +1,22 @@
+/* $MirOS: contrib/hosted/tg/deb/cvs/debian/port.h,v 1.1 2010/09/16 00:18:40 tg Exp $ */
+
+#ifndef DEBIAN__PORT_H
+#define DEBIAN__PORT_H
+
+/* taken from mksh/sh.h */
+#undef __IDSTRING
+#undef __IDSTRING_CONCAT
+#undef __IDSTRING_EXPAND
+#undef __COPYRIGHT
+#undef __RCSID
+#undef __SCCSID
+#define __IDSTRING_CONCAT(l,p)         __LINTED__ ## l ## _ ## p
+#define __IDSTRING_EXPAND(l,p)         __IDSTRING_CONCAT(l,p)
+#define __IDSTRING(prefix, string)                             \
+       static const char __IDSTRING_EXPAND(__LINE__,prefix) [] \
+           __attribute__((used)) = "@(""#)" #prefix ": " string
+#define __COPYRIGHT(x)         __IDSTRING(copyright,x)
+#define __RCSID(x)             __IDSTRING(rcsid,x)
+#define __SCCSID(x)            __IDSTRING(sccsid,x)
+
+#endif
diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..a342b42
--- /dev/null
@@ -0,0 +1,34 @@
+#! /bin/sh
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/postinst,v 1.3 2010/09/19 18:47:49 tg Exp $
+
+set -e
+
+# upgrade case from Debian CVS
+nukes='/etc/cvs.conf /etc/cvs-cron.conf /etc/cvs-pserver.conf /etc/cron.weekly/cvs'
+for x in $nukes; do
+       test -e $x || continue
+       rm -f $nukes
+       test -x /usr/sbin/update-inetd && update-inetd --remove "^cvspserver"
+       break
+done
+
+case $1 in
+configure)
+       addgroup --force-badname --system _cvsadmin
+       ;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+       ;;
+
+*)
+       echo "postinst called with unknown argument '$1'" >&2
+       exit 1
+       ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644 (file)
index 0000000..a675a95
--- /dev/null
@@ -0,0 +1,27 @@
+#! /bin/sh
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/postrm,v 1.3 2011/06/11 04:22:48 tg Exp $
+
+set -e
+
+case $1 in
+purge)
+       rm -f /etc/cvs.conf /etc/cvs-cron.conf /etc/cvs-pserver.conf /etc/cron.weekly/cvs
+       test -x /usr/sbin/update-inetd && update-inetd --remove "^cvspserver"
+       (delgroup --system --only-if-empty _cvsadmin || :)
+       ;;
+
+remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+       ;;
+
+*)
+       echo >&2 "postrm called with unknown argument '$1'"
+       exit 1
+       ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..c2cd240
--- /dev/null
@@ -0,0 +1,152 @@
+#!/usr/bin/make -f
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.8 2011/06/30 13:51:06 tg Exp $
+#-
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+CC?=           gcc
+CFLAGS=                -Wall -g
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS+=       -O0
+else
+CFLAGS+=       -O2
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS=       $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS+=    -j${NUMJOBS}
+endif
+
+CPPFLAGS+=     -D_GNU_SOURCE
+CPPFLAGS+=     -include ${CURDIR}/debian/port.h
+CFLAGS+=       -fno-strict-aliasing -Wformat
+
+CPPFLAGS+=     -DUSE_LIBBSD
+LIBS+=         -lbsd
+
+CONFIGURE_ENV:=                CC='${CC}'
+CONFIGURE_ENV+=                CFLAGS='${CFLAGS}'
+CONFIGURE_ENV+=                CPPFLAGS='${CPPFLAGS}'
+CONFIGURE_ENV+=                LIBS='${LIBS}'
+CONFIGURE_ENV+=                CSH=/bin/csh
+
+# check takes forever, so assume the safe choice
+CONFIGURE_ENV+=                ac_cv_func_working_mktime=no
+
+CONFIGURE_ARGS:=       --prefix=/usr \
+                       --infodir=/usr/share/info \
+                       --mandir=/usr/share/man \
+                       --sysconfdir=/etc \
+                       --disable-dependency-tracking \
+                       --disable-maintainer-mode \
+                       --disable-pam \
+                       --disable-nls \
+                       --enable-client \
+                       --enable-password-authenticated-client \
+                       --enable-server \
+                       --enable-proxy \
+                       --enable-case-sensitivity \
+                       --enable-encryption \
+                       --disable-lock-compatibility \
+                       --disable-rootcommit \
+                       --disable-old-info-format-support \
+                       --enable-config-override=no \
+                       --without-krb4 \
+                       --with-gssapi \
+                       --with-external-zlib \
+                       --with-rsh=ssh \
+                       --with-editor=/usr/bin/editor \
+                       --with-tmpdir=/var/tmp \
+                       --with-umask=002 \
+                       --with-cvs-admin-group=_cvsadmin
+
+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 \
+                       doc/getdate-cvs.texi \
+                       vms/config.h windows-NT/config.h
+
+debian/.configure_stamp:
+       dh_testdir
+       -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/.build_stamp
+
+debian/.build_stamp: debian/.configure_stamp
+       dh_testdir
+       cd debian/builddir && ${MAKE} ${MAKE_ARGS}
+       cd debian/builddir && ${MAKE} -C doc ${MAKE_ARGS} doc html info pdf txt
+       @:>$@
+
+clean:
+       dh_testdir
+       -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 && \
+           ${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 src/ChangeLog debian/stagedir/clogs/ChangeLog.src
+       cp contrib/ChangeLog debian/stagedir/clogs/ChangeLog.contrib
+       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
+       nroff -man -Tascii contrib/cvshelp.man | \
+           col -b >debian/stagedir/cvshelp.txt
+       @:>$@
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs debian/stagedir/clogs/ChangeLog
+       dh_installdocs
+       dh_install
+       dh_installinfo
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       cd debian/cvs/usr/share/cvs/contrib && chmod +x descend.sh rcs2sccs.sh
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install check
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644 (file)
index 0000000..e6a0be9
--- /dev/null
@@ -0,0 +1,8 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/source.lintian-overrides,v 1.3 2011/05/06 23:46:19 tg Exp $
+
+# we know, who cares, this is the way this package works
+cvs source: direct-changes-in-diff-but-no-patch-system *
+
+# not my fault
+cvs source: source-contains-cvs-control-dir zlib/CVS
+cvs source: source-contains-cvs-control-dir zlib/os2/CVS
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
@@ -0,0 +1 @@
+1.0
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..8db2673
--- /dev/null
@@ -0,0 +1,5 @@
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/watch,v 1.2 2011/06/11 23:00:31 tg Exp $
+
+version=3
+opts="dversionmangle=s/\+real$//" \
+http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/ cvs-([0-9.]*)\.tar\.gz