tags 582439 + patch
tags 582439 + pending
thanks
Dear maintainer,
I've prepared an NMU for emacs23 (versioned as 23.2+1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru emacs23-23.2+1/debian/changelog emacs23-23.2+1/debian/changelog
--- emacs23-23.2+1/debian/changelog 2010-05-15 06:56:27.000000000 +0200
+++ emacs23-23.2+1/debian/changelog 2010-08-04 01:53:18.000000000 +0200
@@ -1,3 +1,17 @@
+emacs23 (23.2+1-2.1) 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
+
+ -- Stéphane Glondu <glo...@debian.org> Wed, 04 Aug 2010 01:53:18 +0200
+
emacs23 (23.2+1-2) unstable; urgency=low
* Respect DESTDIR in doc/misc/Makefile.in. (closes: #581642)
diff -Nru emacs23-23.2+1/debian/control emacs23-23.2+1/debian/control
--- emacs23-23.2+1/debian/control 2010-05-16 08:23:34.000000000 +0200
+++ emacs23-23.2+1/debian/control 2010-08-04 01:56:39.000000000 +0200
@@ -2,14 +2,13 @@
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 (>= 4),
libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev,
libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+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
+Homepage: http://www.gnu.org/software/emacs/
Package: emacs
-Section: editors
-Priority: optional
Architecture: all
-Depends: emacs23 | emacs23-lucid | emacs23-nox
+Depends: emacs23 | emacs23-lucid | emacs23-nox, ${misc:Depends}
Provides: emacsen, editor, mail-reader, news-reader
Description: The GNU Emacs editor (metapackage)
GNU Emacs is the extensible self-documenting text editor.
@@ -17,10 +16,8 @@
release.
Package: emacs23-lucid
-Section: editors
-Priority: optional
Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: emacs23, emacsen, editor, info-browser, mail-reader, news-reader
Suggests: emacs23-common-non-dfsg
Conflicts: emacs23, emacs23-nox, emacs23-gtk
@@ -30,10 +27,8 @@
This package contains a version of Emacs with a Lucid user interface.
Package: emacs23-nox
-Section: editors
-Priority: optional
Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
Suggests: emacs23-common-non-dfsg
Conflicts: emacs23, emacs23-lucid, emacs23-gtk
@@ -43,10 +38,8 @@
This package contains a version of Emacs compiled without support for X.
Package: emacs23
-Section: editors
-Priority: optional
Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk
Suggests: emacs23-common-non-dfsg
Conflicts: emacs23-lucid, emacs23-nox, emacs23-gtk
@@ -56,20 +49,16 @@
This package contains a version of Emacs with a GTK+ user interface.
Package: emacs23-bin-common
-Section: editors
-Priority: optional
Architecture: any
-Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}
+Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends},
${misc:Depends}
Description: The GNU Emacs editor's shared, architecture dependent files
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture dependent infrastructure
that's shared by emacs23, emacs23-lucid, and emacs23-nox.
Package: emacs23-common
-Section: editors
-Priority: optional
Architecture: all
-Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info,
${shlibs:Depends}
+Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info,
${shlibs:Depends}, ${misc:Depends}
Suggests: emacs23-el, emacs23-common-non-dfsg
Conflicts: emacs23-el (<< ${Source-Version})
Description: The GNU Emacs editor's shared, architecture independent
infrastructure
@@ -78,10 +67,8 @@
that's shared by emacs23, emacs23-lucid, and emacs23-nox.
Package: emacs23-el
-Section: editors
-Priority: optional
Architecture: all
-Depends: emacs23-common (= ${source:Version})
+Depends: emacs23-common (= ${source:Version}), ${misc:Depends}
Description: GNU Emacs LISP (.el) files
GNU Emacs is the extensible self-documenting text editor.
This package contains the elisp sources for the convenience of users,
diff -Nru emacs23-23.2+1/debian/control.in emacs23-23.2+1/debian/control.in
--- emacs23-23.2+1/debian/control.in 2010-05-11 02:01:19.000000000 +0200
+++ emacs23-23.2+1/debian/control.in 2010-08-04 01:41:40.000000000 +0200
@@ -2,14 +2,13 @@
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 (>= 4),
libxaw7-dev, sharutils, imagemagick, libgtk2.0-dev, libgconf2-dev,
libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+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
+Homepage: http://www.gnu.org/software/emacs/
Package: emacs
-Section: editors
-Priority: optional
Architecture: all
-Depends: @DEB_FLAVOR@ | @deb_fla...@-lucid | @deb_fla...@-nox
+Depends: @DEB_FLAVOR@ | @deb_fla...@-lucid | @deb_fla...@-nox, ${misc:Depends}
Provides: emacsen, editor, mail-reader, news-reader
Description: The GNU Emacs editor (metapackage)
GNU Emacs is the extensible self-documenting text editor.
@@ -17,10 +16,8 @@
release.
Package: @deb_fla...@-lucid
-Section: editors
-Priority: optional
Architecture: any
-Depends: @deb_fla...@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @deb_fla...@-bin-common (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader
Suggests: @deb_fla...@-common-non-dfsg
Conflicts: @DEB_FLAVOR@, @deb_fla...@-nox, emacs23-gtk
@@ -30,10 +27,8 @@
This package contains a version of Emacs with a Lucid user interface.
Package: @deb_fla...@-nox
-Section: editors
-Priority: optional
Architecture: any
-Depends: @deb_fla...@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @deb_fla...@-bin-common (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
Suggests: @deb_fla...@-common-non-dfsg
Conflicts: @DEB_FLAVOR@, @deb_fla...@-lucid, emacs23-gtk
@@ -43,10 +38,8 @@
This package contains a version of Emacs compiled without support for X.
Package: @DEB_FLAVOR@
-Section: editors
-Priority: optional
Architecture: any
-Depends: @deb_fla...@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @deb_fla...@-bin-common (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk
Suggests: @deb_fla...@-common-non-dfsg
Conflicts: @deb_fla...@-lucid, @deb_fla...@-nox, emacs23-gtk
@@ -56,20 +49,16 @@
This package contains a version of Emacs with a GTK+ user interface.
Package: @deb_fla...@-bin-common
-Section: editors
-Priority: optional
Architecture: any
-Depends: @deb_fla...@-common (= ${source:Version}), ${shlibs:Depends}
+Depends: @deb_fla...@-common (= ${source:Version}), ${shlibs:Depends},
${misc:Depends}
Description: The GNU Emacs editor's shared, architecture dependent files
GNU Emacs is the extensible self-documenting text editor.
This package contains the architecture dependent infrastructure
that's shared by @DEB_FLAVOR@, @deb_fla...@-lucid, and @deb_fla...@-nox.
Package: @deb_fla...@-common
-Section: editors
-Priority: optional
Architecture: all
-Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info,
${shlibs:Depends}
+Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info,
${shlibs:Depends}, ${misc:Depends}
Suggests: @deb_fla...@-el, @deb_fla...@-common-non-dfsg
Conflicts: @deb_fla...@-el (<< ${Source-Version})
Description: The GNU Emacs editor's shared, architecture independent
infrastructure
@@ -78,10 +67,8 @@
that's shared by @DEB_FLAVOR@, @deb_fla...@-lucid, and @deb_fla...@-nox.
Package: @deb_fla...@-el
-Section: editors
-Priority: optional
Architecture: all
-Depends: @deb_fla...@-common (= ${source:Version})
+Depends: @deb_fla...@-common (= ${source:Version}), ${misc:Depends}
Description: GNU Emacs LISP (.el) files
GNU Emacs is the extensible self-documenting text editor.
This package contains the elisp sources for the convenience of users,
diff -Nru emacs23-23.2+1/debian/emacsVER-bin-common.postinst
emacs23-23.2+1/debian/emacsVER-bin-common.postinst
--- emacs23-23.2+1/debian/emacsVER-bin-common.postinst 2009-08-03
01:39:27.000000000 +0200
+++ emacs23-23.2+1/debian/emacsVER-bin-common.postinst 2010-08-04
01:38:43.000000000 +0200
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
flav...@deb_flavor@
maj...@major_version@
diff -Nru emacs23-23.2+1/debian/emacsVER-common.postinst
emacs23-23.2+1/debian/emacsVER-common.postinst
--- emacs23-23.2+1/debian/emacsVER-common.postinst 2009-09-02
06:09:39.000000000 +0200
+++ emacs23-23.2+1/debian/emacsVER-common.postinst 2010-08-04
01:38:43.000000000 +0200
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
maj...@major_version@
min...@minor_version@
diff -Nru emacs23-23.2+1/debian/emacsVER.desktop
emacs23-23.2+1/debian/emacsVER.desktop
--- emacs23-23.2+1/debian/emacsVER.desktop 2009-09-06 06:21:07.000000000
+0200
+++ emacs23-23.2+1/debian/emacsVER.desktop 2010-08-04 01:38:43.000000000
+0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
Name=GNU Emacs @MENU_VERSION@
GenericName=Text Editor
Comment=View and edit files
diff -Nru emacs23-23.2+1/debian/rules emacs23-23.2+1/debian/rules
--- emacs23-23.2+1/debian/rules 2010-05-11 08:15:01.000000000 +0200
+++ emacs23-23.2+1/debian/rules 2010-08-04 01:55:14.000000000 +0200
@@ -172,13 +172,14 @@
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else # not noopt
- ifeq (m68k,$(DEB_HOST_ARCH))
- # fix problem with newer versions of gcc on m68k
+ 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
CFLAGS += -O1
- else # neq (m68k,$(DEB_HOST_ARCH))
+ else # neq {m68k,ia64}
CFLAGS += -O2
- endif # neq (m68k,$(DEB_HOST_ARCH))
+ endif # neq {m68k,ia64}
endif # not noopt
joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
