update to latest Policy

diff --git a/debian/changelog b/debian/changelog
index b62c360..d9b12e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+cvs (2:1.12.13+real-24) UNRELEASED; urgency=high
+
+  * Update from MirBSD
+    - fix for CVE-2017-12836 (Closes: #871810)
+    - more robust $CVSROOT parsing
+  * Policy 4.0.1
+    - add nodoc build option
+      ‣ I’m unclear on how this mixes with build profiles and/or
+        Build-Depends exclusion; should I exclude ghostscript,
+        groff, texinfo, texlive-* with <!nodocs> now, or are
+        DEB_BUILD_OPTIONS=nodoc and the profile independent of
+        each other? Info and patches welcome.
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 12 Aug 2017 02:50:10 +0200
+
 cvs (2:1.12.13+real-23) unstable; urgency=low
 
   * Improve documentation:

diff --git a/debian/control b/debian/control
index 8fa9e3a..f5f6bd7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Homepage: http://www.nongnu.org/cvs/
 Build-Depends: debhelper (>= 10), autotools-dev, bsdmainutils,
  ghostscript, groff, libbsd-dev, libkrb5-dev | heimdal-dev, procps,
  texinfo, texlive-latex-recommended, texlive-fonts-recommended, zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.0.1
 VCS-git: https://anonscm.debian.org/git/collab-maint/cvs.git
 VCS-Browser: https://anonscm.debian.org/cgit/collab-maint/cvs.git
 

diff --git a/debian/rules b/debian/rules
index 1deadaf..3ce485c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -107,7 +107,9 @@ build build-arch: debian/.build_stamp
 debian/.build_stamp: debian/.configure_stamp
        dh_testdir
        cd debian/builddir && ${MAKE} ${MAKE_ARGS}
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
        cd debian/builddir && ${MAKE} -C doc ${MAKE_ARGS} doc html info pdf txt
+endif
 ifneq (,$(filter sanity,$(DEB_BUILD_OPTIONS)))
        # run the testsuite after build (DEB_BUILD_OPTIONS=sanity)
        # warning: this takes a *lot* of time!