Merge branch 'master' of ssh://git.debian.org/git/dbnpolicy/policy

diff --git a/Makefile b/Makefile
index a10b93d7092ebb6e22e33e3023d94b892f7422c4..4b7f62dbb6b7f12189c7247715a967d975c0b8a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,13 @@ menu-policy.sgml: version.ent
 perl-policy.sgml: version.ent
 
 %.txt: %.org
-       $(EMACS) --batch -Q -l ./README-css.el -l org -l org-ascii --visit $^ \
-          --funcall org-export-as-ascii >/dev/null 2>&1
+       $(EMACS) --batch -Q -l ./README-css.el -l org --visit $^ \
+          --funcall org-ascii-export-to-ascii
        test "$@" != "README.txt"  ||                            \
            perl -pli -e 's,./Process.org,Process.txt,g' $@
 %.html: %.org
        $(EMACS) --batch -Q -l ./README-css.el -l org --visit $^ \
-          --funcall org-export-as-html-batch >/dev/null 2>&1
+          --funcall org-html-export-to-html
 
 %.validate: %
        nsgmls -wall -gues $<

diff --git a/Process.org b/Process.org
index a0f6ab7d35920d8c3508e639e8566e2dfa2d357b..75d3c2c965c2ea8b584fea811e8bee84f43b8167 100644 (file)
--- a/Process.org
+++ b/Process.org
@@ -1,4 +1,4 @@
--*- mode: org; fill-column: 78 -*-
+# -*- mode: org; fill-column: 78 -*-
 #+STARTUP: showall
 #+STARTUP: lognotedone lognotestate
 #+OPTIONS: H:4 toc:2
@@ -8,28 +8,7 @@
 #+OPTIONS:   H:3 num:nil toc:nil \n:nil @:t ::t |:t ^:t -:t f:t *:t TeX:t LaTeX:nil skip:t d:nil tags:not-in-toc
 #+LINK_HOME: http://wiki.debian.org/Teams/Policy
 #+LINK_UP: http://www.debian.org/
-
-\usepackage{landscape}
-
-\setlength{\oddsidemargin}{0in}                % default=0in
-\setlength{\textwidth}{9in}            % default=9in
-
-\setlength{\columnsep}{0.5in}          % default=10pt
-\setlength{\columnseprule}{1pt}                % default=0pt (no line)
-
-\setlength{\textheight}{5.85in}                % default=5.15in
-\setlength{\topmargin}{-0.15in}                % default=0.20in
-\setlength{\headsep}{0.25in}           % default=0.35in
-
-\setlength{\parskip}{1.2ex}
-\setlength{\parindent}{0mm}
-\pagestyle{empty}
-
-\setlength{\headheight}{0pt}
-\setlength{\headsep}{0pt}
-\setlength{\footskip}{5pt}
-\setlength{\textheight}{9.0in}
-\setlength{\textwidth}{6.5in}
+#+LATEX_HEADER: \input{README-header.tex}
 
 To introduce a change in the current DebianPolicy, the change proposal
 has to go through a certain process.

diff --git a/README-header.tex b/README-header.tex
new file mode 100644 (file)
index 0000000..6073d76
--- /dev/null
+++ b/README-header.tex
@@ -0,0 +1,22 @@
+\usepackage{landscape}
+
+\setlength{\oddsidemargin}{0in}                % default=0in
+\setlength{\textwidth}{9in}            % default=9in
+
+\setlength{\columnsep}{0.5in}          % default=10pt
+\setlength{\columnseprule}{1pt}                % default=0pt (no line)
+
+\setlength{\textheight}{5.85in}                % default=5.15in
+\setlength{\topmargin}{-0.15in}                % default=0.20in
+\setlength{\headsep}{0.25in}           % default=0.35in
+
+\setlength{\parskip}{1.2ex}
+\setlength{\parindent}{0mm}
+\pagestyle{empty}
+
+\setlength{\headheight}{0pt}
+\setlength{\headsep}{0pt}
+\setlength{\footskip}{5pt}
+\setlength{\textheight}{9.0in}
+\setlength{\textwidth}{6.5in}
+

diff --git a/README.org b/README.org
index 0dbf2e7d76e4e4097217bfd8af6034a18c018847..a86f9e3c9c062a9def83faf7fa8e102295b2f35a 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
--*- mode: org; fill-column: 78 -*-
+# -*- mode: org; fill-column: 78 -*-
 #+STARTUP: showall
 #+STARTUP: lognotedone lognotestate
 #+OPTIONS: H:4 toc:2
@@ -8,30 +8,7 @@
 #+OPTIONS:   H:3 num:nil toc:nil \n:nil @:t ::t |:t ^:t -:t f:t *:t TeX:t LaTeX:nil skip:t d:nil tags:not-in-toc
 #+LINK_HOME: http://wiki.debian.org/Teams/Policy
 #+LINK_UP: http://www.debian.org/
-
-\usepackage{landscape}
-
-\setlength{\oddsidemargin}{0in}                % default=0in
-\setlength{\textwidth}{9in}            % default=9in
-
-\setlength{\columnsep}{0.5in}          % default=10pt
-\setlength{\columnseprule}{1pt}                % default=0pt (no line)
-
-\setlength{\textheight}{5.85in}                % default=5.15in
-\setlength{\topmargin}{-0.15in}                % default=0.20in
-\setlength{\headsep}{0.25in}           % default=0.35in
-
-\setlength{\parskip}{1.2ex}
-\setlength{\parindent}{0mm}
-\pagestyle{empty}
-
-\setlength{\headheight}{0pt}
-\setlength{\headsep}{0pt}
-\setlength{\footskip}{5pt}
-\setlength{\textheight}{9.0in}
-\setlength{\textwidth}{6.5in}
-
-
+#+LATEX_HEADER: \input{README-header.tex}
 * Infrastructure
 
 + Website:: http://www.debian.org/doc/devel-manuals#policy

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>