summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@golden-gryphon.com>2016-03-09 13:38:10 -0800
committerManoj Srivastava <srivasta@golden-gryphon.com>2016-03-09 13:38:10 -0800
commit05389f26451783096836e1e2f96449c5bbb176d7 (patch)
treeb825219488cd5489489dd1b359a31b420bd2cea7
parentb53d1e6af61ed74e618d4de5d5766e901f70a64c (diff)
[master]: Update with cherry picks from upstreamdebian/4.1-3
Updated standards version to 3.9.7. No changes needed. Bug fix: "inconsistant description of ifdef directive behavior", thanks to Britton Leo Kerin. Cherry picked changes from upstream. (Closes: #620209). Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f8e902b7..6e9bdc97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+make-doc-non-dfsg (4.1-3) unstable; urgency=low
+
+ * Updated standards version to 3.9.7. No changes needed.
+ * Bug fix: "inconsistant description of ifdef directive behavior",
+ thanks to Britton Leo Kerin. Cherry picked changes from upstream.
+ (Closes: #620209).
+
+ -- Manoj Srivastava <srivasta@debian.org> Wed, 09 Mar 2016 13:36:21 -0800
+
make-doc-non-dfsg (4.1-2) unstable; urgency=low
* Fix typos in the copyright file.
diff --git a/debian/control b/debian/control
index 5d0207c6..74efc102 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ VCS-Browser: http://git.debian.org/git/users/srivasta/debian/make-doc-non-dfsg.g
Section: non-free/doc
Priority: optional
Maintainer: Manoj Srivastava <srivasta@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: http://www.gnu.org/software/make/
Build-Depends-Indep: texinfo, gettext, po-debconf,
debhelper (>= 9.0.0), dh-autoreconf, autoconf,