Bug#643339: most: diff for NMU version 5.0.0a-2.1

tags 643339 + patch
tags 643339 + pending
thanks

Dear maintainer,

I've prepared an NMU for most (versioned as 5.0.0a-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: Red Hot Chili Peppers: Make You Feel Better


diff -u most-5.0.0a/debian/rules most-5.0.0a/debian/rules
most-5.0.0a/debian/rules
+++ most-5.0.0a/debian/rules
@@ -14,6 +14,7 @@

# This is the debhelper compatibility version to use.
# export DH_COMPAT=4
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

CC = gcc
CFLAGS = -O2 -g -Wall -DUTF8
@@ -28,7 +29,7 @@
build-stamp:
dh_testdir
@echo "Building the binaries ..."
- CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure
+ CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure --with-slanglib=/usr/lib/"$(DEB_HOST_MULTIARCH)"
$(MAKE) SYS_INITFILE=/etc/most.conf
touch $@

@@ -62,6 +63,7 @@
dh_installmime
dh_installman most.1
$(install_binary) src/objs/most debian/most/usr/bin/most
+ chrpath --delete debian/most/usr/bin/most
dh_strip
dh_compress
dh_shlibdeps
diff -u most-5.0.0a/debian/changelog most-5.0.0a/debian/changelog
most-5.0.0a/debian/changelog
+++ most-5.0.0a/debian/changelog
@@ -1,3 +1,15 @@
+most (5.0.0a-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "build fails on configure-step (couldn't find slang.h)":
+ add patch from Ubuntu / Daniel T Chen:
+ - debian/rules: Handle multiarch slang2. Fixes FTBFS.
+ Additionally, build-depend on dpkg-dev >= 1.16.0, and delete the RPATH
+ that gets introduced because the autofoo detects the "non-standard" slang
+ directory. (Closes: #643339)
+
+ -- gregor herrmann <gregoa@debian.org> Sun, 04 Dec 2011 16:01:26 +0100
+
most (5.0.0a-2) unstable; urgency=low

* Lots of improvements to documentation.
diff -u most-5.0.0a/debian/control most-5.0.0a/debian/control
most-5.0.0a/debian/control
+++ most-5.0.0a/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Benjamin Mako Hill <mako@debian.org>
Standards-Version: 3.9.1.0
-Build-Depends: debhelper (>=4), libslang2-dev
+Build-Depends: debhelper (>=4), libslang2-dev, dpkg-dev (>= 1.16.0), chrpath

Package: most
Architecture: any







To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org