tags 709055 + pending
thanks

Dear maintainer,
I've prepared an NMU for netmrg (versioned as 0.20-6.2) 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 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Derek Patton: Apes in the Rotunda
diff -u netmrg-0.20/debian/rules netmrg-0.20/debian/rules
--- netmrg-0.20/debian/rules
+++ netmrg-0.20/debian/rules
@@ -11,6 +11,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 
 CFLAGS = -Wall -g
@@ -24,10 +25,16 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ifneq (,$(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libsnmp.so))
+	confflags := --with-snmp-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH)
+else
+	confflags :=
+endif
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/netmrg --localstatedir=/var --libexecdir=/usr/lib
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/netmrg --localstatedir=/var --libexecdir=/usr/lib $(confflags)
 
 
 build: build-stamp
diff -u netmrg-0.20/debian/control netmrg-0.20/debian/control
--- netmrg-0.20/debian/control
+++ netmrg-0.20/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Uwe Steinmann <ste...@debian.org>
-Build-Depends: rrdtool (>= 1.3.1-4), debhelper (>= 5), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl
+Build-Depends: rrdtool (>= 1.3.1-4), debhelper (>= 5), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl, docbook-xml
 Standards-Version: 3.7.2
 
 Package: netmrg
diff -u netmrg-0.20/debian/changelog netmrg-0.20/debian/changelog
--- netmrg-0.20/debian/changelog
+++ netmrg-0.20/debian/changelog
@@ -1,3 +1,19 @@
+netmrg (0.20-6.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with multiarch net-snmp":
+    apply patch from Ubuntu / Colin Watson:
+
+  - Work around configure wanting to know too much detail about where a
+    system libsnmp.so is installed rather than trusting the linker.
+
+    (Closes: #709055)
+
+  * Add build-dependency on docbook-xml, otherwise xsltproc tries to download
+    the dtd from the net.
+
+ -- gregor herrmann <gre...@debian.org>  Thu, 30 May 2013 13:38:37 +0200
+
 netmrg (0.20-6.1) unstable; urgency=low
 
   * Non-maintainer upload.

Attachment: signature.asc
Description: Digital signature

Reply via email to