Reset version to 3.9.6.1

diff --git a/debian/changelog b/debian/changelog
index 17e93300f93d4984bdba5aefa11caedffdf8e269..8f1b31bad1987b1fc20eec5072535ba822433b4d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-debian-policy (3.9.7.0) unstable; urgency=low
+debian-policy (3.9.6.1) unstable; urgency=low
 
-  * 
+  * Fix FTBFS with emacs 24.4. Thanks to David Bremner <david@tethera.net>
+    for the help. Closes: #769219
 
- -- Bill Allombert <ballombe@debian.org>  Wed, 17 Sep 2014 20:35:51 +0200
+ -- Bill Allombert <ballombe@debian.org>  Mon, 17 Nov 2014 11:55:55 +0100
 
 debian-policy (3.9.6.0) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 662f98b1ed2e9da55016094cd9cca689863857d8..b7f5ed04dd778468856aae48d580a9b9180ef40a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: bsdmainutils,
                debiandoc-sgml (>= 1.1.47),
                docbook-dsssl,
                docbook-xml,
-               emacs-nox|emacs,
+               emacs-nox (>= 24.4) | emacs (>= 24.4),
                groff,
                jade,
                links | elinks,

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 1751f35c7c3f4069d6847a2c10fa7af7ac3057b5..7a1b5e5b23afe273e646c4c0c9d3b5b404377fd2 100644 (file)
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -34,13 +34,6 @@ picking your way through this list.
 
 <chapt> The checklist
 
-<sect id="3.9.7.0"> Version 3.9.7.0
-<p>
-
-Released xxx, 2014.
-
-</p>
-
 <sect id="3.9.6.0"> Version 3.9.6.0
 <p>