I just uploaded emacs23 23.2+1-3 to unstable, and I'd like to include it
in squeeze if possible. It contains all of the relevant changes from
the current 23.2+1-2.1 NMU (already in squeeze), one minor build fix,
and a patch for the GNU/kFreeBSD startup hang (#559392, serious).
Here are the new changelog entries. These are the new changes:
* Don't try to "mkdir $(infodir)" in doc/*/Makefile.in.
* Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff).
Thanks to antoine beaupre <anar...@anarcat.ath.cx> for the report
and Petr Salinger <petr.salin...@seznam.cz> for the patch.
(closes: #559392)
and these are the entries that were incorporated from the previous NMU:
* Use -O1 rather than -O2 on ia64. Fixes a build failure (looks
like a broken byte compiler) with newer versions of gcc
(c.f. #207580). Thanks to Sven Joachim <svenj...@gmx.de> for the
report and thanks to Stéphane Glondu <glo...@debian.org> for the
23.2+1-2.1 NMU. (closes: 582439)
* Remove deprecated Encoding field from emacsVER.desktop. Thanks to
Stéphane Glondu <glo...@debian.org> for the 23.2+1-2.1
NMU.
* Use "set -e" rather than "/bin/sh -e" in emacsVER-common.postinst
and emacsVER-bin-common.postinst. Thanks to Stéphane Glondu
<glo...@debian.org> for the 23.2+1-2.1 NMU.
* Add a Homepage field to debian/control.in. Thanks to Stéphane
Glondu <glo...@debian.org> for the 23.2+1-2.1 NMU.
* Remove redundant Section and Priority fields from binary packages
in debian/control.in. Thanks to Stéphane Glondu
<glo...@debian.org> for the 23.2+1-2.1 NMU.
* Change quilt Build-Depends from (>= 0.42-1) to (>= 0.42). Thanks
to Stéphane Glondu <glo...@debian.org> for the 23.2+1-2.1 NMU.
* Change debhelper Build-Depends from (>=4) to (>= 7.0.50~) to
support rules overrides. Thanks to Sven Joachim
<svenj...@gmx.de>, and thanks to Stéphane Glondu
<glo...@debian.org> for the 23.2+1-2.1 NMU.
* Add ${misc:Depends} to debian/control for debhelper. Thanks to
Stéphane Glondu <glo...@debian.org> for the 23.2+1-2.1 NMU.
diff -Nru emacs23-23.2+1/debian/changelog emacs23-23.2+1/debian/changelog
--- emacs23-23.2+1/debian/changelog 2010-08-03 18:53:18.000000000 -0500
+++ emacs23-23.2+1/debian/changelog 2010-08-14 11:57:49.000000000 -0500
@@ -1,16 +1,45 @@
-emacs23 (23.2+1-2.1) unstable; urgency=low
+emacs23 (23.2+1-3) unstable; urgency=low
- * Non-maintainer upload.
- * Compile with -O1 on ia64 (Closes: #582439)
- * Fix various Lintian warnings:
- - debian/control:
- + add missing ${misc:Depends}
- + add Homepage field
- + remove duplicate Section/Priority fields
- - call explicitly "set -e" in maintainer scripts
- - remove Encoding field from .desktop file
+ * Don't try to "mkdir $(infodir)" in doc/*/Makefile.in.
- -- Stéphane Glondu <glo...@debian.org> Wed, 04 Aug 2010 01:53:18 +0200
+ * Use -O1 rather than -O2 on ia64. Fixes a build failure (looks
+ like a broken byte compiler) with newer versions of gcc
+ (c.f. #207580). Thanks to Sven Joachim <svenj...@gmx.de> for the
+ report and thanks to Stéphane Glondu <glo...@debian.org> for the
+ 23.2+1-2.1 NMU. (closes: 582439)
+
+ * Remove deprecated Encoding field from emacsVER.desktop. Thanks to
+ Stéphane Glondu <glo...@debian.org> for the 23.2+1-2.1
+ NMU.
+
+ * Use "set -e" rather than "/bin/sh -e" in emacsVER-common.postinst
+ and emacsVER-bin-common.postinst. Thanks to Stéphane Glondu
+ <glo...@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Add a Homepage field to debian/control.in. Thanks to Stéphane
+ Glondu <glo...@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Remove redundant Section and Priority fields from binary packages
+ in debian/control.in. Thanks to Stéphane Glondu
+ <glo...@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Change quilt Build-Depends from (>= 0.42-1) to (>= 0.42). Thanks
+ to Stéphane Glondu <glo...@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Change debhelper Build-Depends from (>=4) to (>= 7.0.50~) to
+ support rules overrides. Thanks to Sven Joachim
+ <svenj...@gmx.de>, and thanks to Stéphane Glondu
+ <glo...@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Add ${misc:Depends} to debian/control for debhelper. Thanks to
+ Stéphane Glondu <glo...@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff).
+ Thanks to antoine beaupre <anar...@anarcat.ath.cx> for the report
+ and Petr Salinger <petr.salin...@seznam.cz> for the patch.
+ (closes: #559392)
+
+ -- Rob Browning <r...@defaultvalue.org> Sat, 14 Aug 2010 11:57:17 -0500
emacs23 (23.2+1-2) unstable; urgency=low
diff -Nru emacs23-23.2+1/debian/control emacs23-23.2+1/debian/control
--- emacs23-23.2+1/debian/control 2010-08-03 18:56:39.000000000 -0500
+++ emacs23-23.2+1/debian/control 2010-08-14 11:58:20.000000000 -0500
@@ -2,9 +2,15 @@
Section: editors
Priority: optional
Maintainer: Rob Browning <r...@defaultvalue.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1~), debhelper (>= 7), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
-Standards-Version: 3.7.2
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
+ libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev,
+ libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev,
+ libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev,
+ autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
+ debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
+ libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Homepage: http://www.gnu.org/software/emacs/
+Standards-Version: 3.7.2
Package: emacs
Architecture: all
diff -Nru emacs23-23.2+1/debian/control.in emacs23-23.2+1/debian/control.in
--- emacs23-23.2+1/debian/control.in 2010-08-03 18:41:40.000000000 -0500
+++ emacs23-23.2+1/debian/control.in 2010-08-14 11:54:18.000000000 -0500
@@ -2,9 +2,15 @@
Section: editors
Priority: optional
Maintainer: Rob Browning <r...@defaultvalue.org>
-Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev, libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev, autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42-1~), debhelper (>= 7), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
-Standards-Version: 3.7.2
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
+ libgif-dev | libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev,
+ libpng12-dev, libjpeg62-dev, libm17n-dev, libotf-dev,
+ libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libdbus-1-dev,
+ autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
+ debhelper (>= 7.0.50~), libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev,
+ libgconf2-dev, libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Homepage: http://www.gnu.org/software/emacs/
+Standards-Version: 3.7.2
Package: emacs
Architecture: all
diff -Nru emacs23-23.2+1/debian/patches/fix-gnu-kfreebsd-startup.diff emacs23-23.2+1/debian/patches/fix-gnu-kfreebsd-startup.diff
--- emacs23-23.2+1/debian/patches/fix-gnu-kfreebsd-startup.diff 1969-12-31 18:00:00.000000000 -0600
+++ emacs23-23.2+1/debian/patches/fix-gnu-kfreebsd-startup.diff 2010-08-13 00:03:45.000000000 -0500
@@ -0,0 +1,20 @@
+* Emacs should no longer hang on startup on Debian GNU/kFreeBSD.
+ Patch: fix-gnu-kfreebsd-startup.diff
+ Date: Thu Aug 12 04:21:09 UTC 2010
+ Added-by: Rob Browning <r...@defaultvalue.org>
+ Provided-By: Petr Salinger <petr.salin...@seznam.cz>
+ Bug: 559392
+ Status: new
+
+diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
+index a1e8c02..89563de 100644
+--- a/src/s/gnu-kfreebsd.h
++++ b/src/s/gnu-kfreebsd.h
+@@ -7,2 +7,7 @@
+
++#undef INTERRUPT_INPUT
++#define BROKEN_SIGIO
++#define BROKEN_SIGURG
++#define BROKEN_SIGPOLL
++
+ #define NO_TERMIO /* use only <termios.h> */
diff -Nru emacs23-23.2+1/debian/patches/handle-dfsg-split.diff emacs23-23.2+1/debian/patches/handle-dfsg-split.diff
--- emacs23-23.2+1/debian/patches/handle-dfsg-split.diff 2010-05-14 23:53:52.000000000 -0500
+++ emacs23-23.2+1/debian/patches/handle-dfsg-split.diff 2010-05-16 02:59:24.000000000 -0500
@@ -255,19 +255,19 @@
PDF_TARGETS = \
ada-mode.pdf \
-@@ -198,9 +104,9 @@
+@@ -198,10 +104,7 @@
ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
-info: $(infodir) $(INFO_TARGETS)
-+info: $(DESTDIR)$(infodir) $(INFO_TARGETS)
-
+-
-$(infodir):
-+$(DESTDIR)$(infodir):
- mkdir $@
+- mkdir $@
++info: $(INFO_TARGETS)
dvi: $(DVI_TARGETS)
-@@ -213,150 +119,6 @@
+
+@@ -213,150 +116,6 @@
# In a distribution of Emacs, the Info files should be up to date.
## "short" target names for convenience, to just rebuild one manual.
@@ -418,7 +418,7 @@
efaq : $(infodir)/efaq
$(infodir)/efaq: faq.texi
cd $(srcdir); $(MAKEINFO) faq.texi
-@@ -365,249 +127,6 @@
+@@ -365,249 +124,6 @@
faq.pdf: faq.texi
$(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
diff -Nru emacs23-23.2+1/debian/patches/series emacs23-23.2+1/debian/patches/series
--- emacs23-23.2+1/debian/patches/series 2010-05-09 14:04:17.000000000 -0500
+++ emacs23-23.2+1/debian/patches/series 2010-08-13 00:03:45.000000000 -0500
@@ -9,3 +9,4 @@
look-for-news-to-find-etc.diff
fix-flymake-xmlstarlet-invocation.diff
add-unix-to-cpp-undefs.diff
+fix-gnu-kfreebsd-startup.diff
diff -Nru emacs23-23.2+1/debian/rules emacs23-23.2+1/debian/rules
--- emacs23-23.2+1/debian/rules 2010-08-03 18:55:14.000000000 -0500
+++ emacs23-23.2+1/debian/rules 2010-08-10 00:23:11.000000000 -0500
@@ -172,14 +172,14 @@
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else # not noopt
- ifneq (,$(findstring $(DEB_HOST_ARCH),m68k ia64))
- # fix problem with newer versions of gcc on {m68k,ia64}
- # -O2 causes a build failure (broken byte compiler)
- # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582439
+ ifneq (,$(filter $(DEB_HOST_ARCH),m68k ia64))
+ # Fix a problem with newer versions of gcc on m68k and ia64.
+ # There -O2 causes a build failure (broken byte compiler) - see
+ # bugs #207580 and #582439.
CFLAGS += -O1
- else # neq {m68k,ia64}
+ else # neq (m68k or ia64)
CFLAGS += -O2
- endif # neq {m68k,ia64}
+ endif # neq (m68k or ia64)
endif # not noopt
joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
Thanks, and please let me know if I can provide any further information.
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
