Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package debian-policy This fix a FTBFS with emacs 24.4 that did not occu with emacs 24.3 debian-policy (3.9.6.1) unstable; urgency=low * Fix FTBFS with emacs 24.4. Thanks to David Bremner <da...@tethera.net> for the help. Closes: #769219 -- Bill Allombert <ballo...@debian.org> Mon, 17 Nov 2014 11:55:55 +0100 I join the full diff. Note that there is two useless files that are removed (they were included by mistake in the previous upload, sorry about that). unblock debian-policy/3.9.6.1 -- System Information: Debian Release: 7.7 APT prefers stable APT policy: (500, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- Bill. <ballo...@debian.org> Imagine a large red swirl here.
diff -Nru debian-policy-3.9.6.0/0001-All-packages-using-Perl-vendorarch-directory-need-a-.patch debian-policy-3.9.6.1/0001-All-packages-using-Perl-vendorarch-directory-need-a-.patch --- debian-policy-3.9.6.0/0001-All-packages-using-Perl-vendorarch-directory-need-a-.patch 2014-06-13 21:38:13.000000000 +0200 +++ debian-policy-3.9.6.1/0001-All-packages-using-Perl-vendorarch-directory-need-a-.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ ->From 007c07db2c549adef83b0c9019d90746117bd7df Mon Sep 17 00:00:00 2001 -From: Niko Tyni <nt...@debian.org> -Date: Fri, 30 May 2014 14:10:22 +0300 -Subject: [PATCH] All packages using Perl vendorarch directory need a perlapi-* - dependency - -Having $Config{vendorarch} change between Perl major versions (for -multiarch or other reasons) implies that packages using it need a strict -dependency on those versions of perl-base that have a compatible search -path (@INC). - -The vast majority of these packages are binary ("XS") modules, where we -already require a dependency on the virtual package perlapi-*, provided -by perl-base. The name of this virtual package will change when the -interface between the Perl interpreter and the modules changes. - -If we consider @INC part of that interface, we can use the existing -mechanism also for the few nonbinary modules using $Config{vendorarch}. -This is a new requirement that currently affects six packages in -the archive. ---- - perl-policy.sgml | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/perl-policy.sgml b/perl-policy.sgml -index c23f7c3..12cd82c 100644 ---- a/perl-policy.sgml -+++ b/perl-policy.sgml -@@ -388,14 +388,15 @@ $(MAKE) install DESTDIR=$(CURDIR)/debian/<tmp> - </sect1> - - <sect1 id="binary_modules"> -- <heading>Binary Modules</heading> -+ <heading>Binary and Other Architecture Dependent Modules</heading> - <p> - Binary modules must specify a dependency on either - <package>perl</package> or <package>perl-base</package> with - a minimum version of the <package>perl</package> package -- used to build the module, and must additionally depend on -- the expansion of -- <package>perlapi-$Config{debian_abi}</package> using -+ used to build the module. Additionally, all binary modules -+ (regardless of their installation directory) and any other modules -+ installed into <tt>$Config{vendorarch}</tt> must depend on the -+ expansion of <package>perlapi-$Config{debian_abi}</package> using - the <tt>Config</tt> module. If <tt>$Config{debian_abi}</tt> - is empty or not set, <tt>$Config{version}</tt> must be used. - </p> --- -2.0.0.rc4 - diff -Nru debian-policy-3.9.6.0/debian/changelog debian-policy-3.9.6.1/debian/changelog --- debian-policy-3.9.6.0/debian/changelog 2014-09-17 20:03:26.000000000 +0200 +++ debian-policy-3.9.6.1/debian/changelog 2014-11-17 11:56:18.000000000 +0100 @@ -1,3 +1,10 @@ +debian-policy (3.9.6.1) unstable; urgency=low + + * Fix FTBFS with emacs 24.4. Thanks to David Bremner <da...@tethera.net> + for the help. Closes: #769219 + + -- Bill Allombert <ballo...@debian.org> Mon, 17 Nov 2014 11:55:55 +0100 + debian-policy (3.9.6.0) unstable; urgency=low [ Bill Allombert ] diff -Nru debian-policy-3.9.6.0/debian/control debian-policy-3.9.6.1/debian/control --- debian-policy-3.9.6.0/debian/control 2014-09-17 20:02:32.000000000 +0200 +++ debian-policy-3.9.6.1/debian/control 2014-11-17 11:46:37.000000000 +0100 @@ -10,7 +10,7 @@ debiandoc-sgml (>= 1.1.47), docbook-dsssl, docbook-xml, - emacs-nox|emacs, + emacs-nox (>= 24.4) | emacs (>= 24.4), groff, jade, links | elinks, diff -Nru debian-policy-3.9.6.0/patch debian-policy-3.9.6.1/patch --- debian-policy-3.9.6.0/patch 2014-07-30 15:46:36.000000000 +0200 +++ debian-policy-3.9.6.1/patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -commit 94af6993b04df63bb2b677b1a8b0d6efcb848549 -Author: Bill Allombert <bill.allomb...@math.u-bordeaux1.fr> -Date: Wed Jul 30 15:28:56 2014 +0200 - - policy.sgml 9.1.1: Remove 'the planned development of' before multiarch - -diff --git a/policy.sgml b/policy.sgml -index 4855506..ae9d173 100644 ---- a/policy.sgml -+++ b/policy.sgml -@@ -6972,8 +6972,7 @@ Built-Using: grub2 (= 1.99-9), loadlin (= 1.6e-1) - <footnote> - This is necessary in order to reserve the directories for - use in cross-installation of library packages from other -- architectures, as part of the planned deployment of -- <tt>multiarch</tt>. -+ architectures, as part of <tt>multiarch</tt>. - </footnote> - </p> - <p> diff -Nru debian-policy-3.9.6.0/Process.org debian-policy-3.9.6.1/Process.org --- debian-policy-3.9.6.0/Process.org 2010-06-19 11:16:28.000000000 +0200 +++ debian-policy-3.9.6.1/Process.org 2014-11-17 11:10:10.000000000 +0100 @@ -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 -Nru debian-policy-3.9.6.0/README-header.tex debian-policy-3.9.6.1/README-header.tex --- debian-policy-3.9.6.0/README-header.tex 1970-01-01 01:00:00.000000000 +0100 +++ debian-policy-3.9.6.1/README-header.tex 2014-11-15 10:59:58.000000000 +0100 @@ -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 -Nru debian-policy-3.9.6.0/README.org debian-policy-3.9.6.1/README.org --- debian-policy-3.9.6.0/README.org 2014-08-02 21:33:52.000000000 +0200 +++ debian-policy-3.9.6.1/README.org 2014-11-15 10:59:58.000000000 +0100 @@ -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