Hi Rob,

I intend to upload the attached NMU to DELAYED/2-days later today.  I
hope that's ok with you?  It makes emacs23 buildable again in sid and
adjusts the build-dependency on libjpeg to use the right dev package.

Kind regards
Philipp Kern
diff -Nru emacs23-23.3+1/debian/changelog emacs23-23.3+1/debian/changelog
--- emacs23-23.3+1/debian/changelog     2011-04-10 19:40:31.000000000 +0200
+++ emacs23-23.3+1/debian/changelog     2011-09-09 12:55:51.000000000 +0200
@@ -1,3 +1,13 @@
+emacs23 (23.3+1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build-depend on libjpeg-dev instead of libjpeg62-dev.
+    (Closes: #633744)
+  * Add multiarch compatibility by passing the right crt-dir
+    to configure.  (Closes: #629567)
+
+ -- Philipp Kern <pk...@debian.org>  Fri, 09 Sep 2011 12:55:18 +0200
+
 emacs23 (23.3+1-1) unstable; urgency=low
 
   * Incorporate new upstream version 23.3.
diff -Nru emacs23-23.3+1/debian/control emacs23-23.3+1/debian/control
--- emacs23-23.3+1/debian/control       2011-04-10 19:41:48.000000000 +0200
+++ emacs23-23.3+1/debian/control       2011-09-09 13:19:49.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Rob Browning <r...@defaultvalue.org>
 Build-Depends: bsd-mailx | 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,
+ libpng12-dev, libjpeg-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,
diff -Nru emacs23-23.3+1/debian/control.in emacs23-23.3+1/debian/control.in
--- emacs23-23.3+1/debian/control.in    2011-04-10 19:33:31.000000000 +0200
+++ emacs23-23.3+1/debian/control.in    2011-09-09 13:18:37.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Rob Browning <r...@defaultvalue.org>
 Build-Depends: bsd-mailx | 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,
+ libpng12-dev, libjpeg-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,
diff -Nru emacs23-23.3+1/debian/rules emacs23-23.3+1/debian/rules
--- emacs23-23.3+1/debian/rules 2011-04-10 19:33:31.000000000 +0200
+++ emacs23-23.3+1/debian/rules 2011-09-09 12:55:14.000000000 +0200
@@ -446,6 +446,9 @@
 confflags += --with-pop=yes
 confflags += --enable-locallisppath=$(local_lpath)
 
+# multiarch compatibility
+confflags += --with-crt-dir=/usr/lib/$(shell dpkg-architecture 
-qDEB_HOST_MULTIARCH)
+
 # x configure flags
 confflags_x := $(confflags) 
 confflags_x += --with-x=yes

Attachment: signature.asc
Description: Digital signature

Reply via email to