tags 640319 + pending
thanks

Dear maintainer,

I've prepared an NMU for jed (versioned as 1:0.99.19-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    NP: Sophie Hunger: Citylights Forever
diff -u jed-0.99.19/debian/changelog jed-0.99.19/debian/changelog
--- jed-0.99.19/debian/changelog
+++ jed-0.99.19/debian/changelog
@@ -1,3 +1,16 @@
+jed (1:0.99.19-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ peter green ]
+  * Make debian/rules pass in the include and library paths of the multi-arched
+    slang and make it strip the rpaths out of the built executables. Also add
+    appropriate build-dependencies (multiarch slang, dpkg-dev that supports
+    multiarch variables and chrpath).
+    (Closes: #640319)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 24 Dec 2011 14:22:36 +0100
+
 jed (1:0.99.19-2) unstable; urgency=low
 
   * Dropped install-info from the Depends field of jed and xjed. This
diff -u jed-0.99.19/debian/rules jed-0.99.19/debian/rules
--- jed-0.99.19/debian/rules
+++ jed-0.99.19/debian/rules
@@ -35,6 +35,12 @@
   configure_flags += --disable-xft
 endif
 
+DEB_HOST_MULTIARCH ?=$(shell dpgk-architecture -qDEB_HOST_MULTIARCH)
+
+#to successfully build with a multiarch slang we need to explicitly specify
+#include and library directories.
+configure_flags += --with-slanglib=/usr/lib/$(DEB_HOST_MULTIARCH) --with-slanginc=/usr/include
+
 export DEB_BUILD_HARDENING=1
 
 include /usr/share/dpatch/dpatch.make
@@ -81,6 +87,10 @@
 	$(MAKE) -C src runtests
 endif
 
+	#unfortunately passing the multiarch dir for slang results in the
+	#upstream build system adding a rpath. Remove this with chrpath
+	chrpath -d src/objs/jed
+	chrpath -d src/objs/xjed
 	touch build-stamp
 
 binary-indep: config.status
diff -u jed-0.99.19/debian/control jed-0.99.19/debian/control
--- jed-0.99.19/debian/control
+++ jed-0.99.19/debian/control
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 7), dpatch (>= 2.0.30),
  libxft-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libxt-dev, pkg-config, hardening-wrapper, autotools-dev, slsh,
- libslang2-dev (>= 2.0.7-2)
+ libslang2-dev (>= 2.2.4-3), dpkg-dev (>= 1.16.0), chrpath
 Homepage: http://www.jedsoft.org/jed/
 Vcs-Git: git://git.debian.org/git/pkg-jed/jed.git
 Vcs-Browser: http://git.debian.org/?p=pkg-jed/jed.git

Attachment: signature.asc
Description: Digital signature

Reply via email to