first round of update packaging

diff --git a/debian/README.source b/debian/README.source
index 4473fe6..7c30dff 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -10,12 +10,9 @@
 # sudo apt-get install autoconf2.59 automake1.9
 #
 # The patchlevel is kept in configure.in (and regenerated as below).
-# MirDebian-11 is in sync with MirOS-0AB3.1 revision.
+# MirDebian-16 is in sync with MirOS-0AB7.2 revision.
 #
-# The patches should be kept in sync with those in The MirPorts Framework:
-# Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs ports/devel/cvs/patches
-# Vcs-Browser: http://cvs.mirbsd.de/ports/devel/cvs/patches/
-# The gist of the patches should also be in sync with MirBSD base:
+# The patches should be kept in sync with those in MirBSD base:
 # Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs src/gnu/usr.bin/cvs
 # Vcs-Browser: http://cvs.mirbsd.de/src/gnu/usr.bin/cvs/
 

diff --git a/debian/changelog b/debian/changelog
index e93c5e2..85d54dc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-cvs (2:1.12.13+real-16) UNRELEASED; urgency=low
+cvs (2:1.12.13+real-16) unstable; urgency=medium
 
   * Take back the package (Closes: #764397)
   * Fix typo in changelog entry for cvs (2:1.12.13+real-9)
+  * Bump Policy; no changes
+  * Update code with bugfixes from MirBSD (Closes: #839669)
 
- -- Thorsten Glaser <tg@mirbsd.de>  Thu, 06 Oct 2016 16:15:32 +0200
+ -- Thorsten Glaser <tg@mirbsd.de>  Fri, 21 Oct 2016 23:34:20 +0200
 
 cvs (2:1.12.13+real-15) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index b79cdcf..127e41e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5), autopoint, autotools-dev,
  libkrb5-dev | heimdal-dev, procps, texinfo,
  texlive-latex-base, texlive-fonts-recommended,
  texlive-latex-recommended, zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 VCS-git: git://anonscm.debian.org/collab-maint/cvs.git
 VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/cvs.git
 

diff --git a/debian/copyright b/debian/copyright
index a4a37c5..1818623 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -59,10 +59,10 @@ advertising clause was rescinded, so it’s GPL compatible now:
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
 
-Parts are covered by the following GPL-compatible licence:
+Parts and the packaging are covered by the following GPL-compatible licence:
 
 # Copyright © 2005, 2008, 2011
-#      Thorsten “mirabilos” Glaser <tg@mirbsd.org>
+#      mirabilos <m@mirbsd.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
 # are retained or reproduced in an accompanying document, permission

diff --git a/debian/postinst b/debian/postinst
index 2dc8454..19b3979 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -22,7 +22,7 @@ set -e
 # * postinst "triggered" "${triggers[*]}"
 # For trigger-only calls, i.e. if "configure" is not called.
 
-# upgrade case from Debian CVS
+# upgrade case from Epoch 1 Debian CVS
 nukes='/etc/cvs.conf /etc/cvs-cron.conf /etc/cvs-pserver.conf /etc/cron.weekly/cvs /etc/pam.d/cvs'
 for x in $nukes; do
        test -e "$x" || continue

diff --git a/debian/postrm b/debian/postrm
index ec25222..c0e6c7e 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -12,12 +12,15 @@ set -e
 # kages may be available; skip gracefully actions requiring Depends.
 #
 # * new-postrm "failed-upgrade" $old_version
+# * new-postrm "failed-upgrade" $old_version $new_version # 1.18.5, stretch
 # Called when 'old-postrm "upgrade"' fails; the new package is unpacked,
 # Essential packages and Pre-Depends are available; the latter have been
 # configured and never removed but may be Unpacked or Half-Configured.
 #
 # * new-postrm "abort-install" [$old_version]
+# * new-postrm "abort-install" $old_version $new_version # 1.18.5, stretch
 # * new-postrm "abort-upgrade" $old_version
+# * new-postrm "abort-upgrade" $old_version $new_version # 1.18.5, stretch
 # Called when preinst fails; package is not unpacked. Essential packages
 # and (unpacked or Half-Configured) Pre-Depends are available.