tags 651231 + patch tags 651231 + pending thanks Dear maintainer,
I've prepared an NMU for xymon (versioned as 4.3.0~beta2.dfsg-9.1) and uploaded it to DELAYED/5. 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: Larimar: If I See You
diff -u xymon-4.3.0~beta2.dfsg/debian/control xymon-4.3.0~beta2.dfsg/debian/control --- xymon-4.3.0~beta2.dfsg/debian/control +++ xymon-4.3.0~beta2.dfsg/debian/control @@ -2,8 +2,9 @@ Section: net Priority: extra Maintainer: Christoph Berg <m...@debian.org> -Build-Depends: debhelper (>= 7), librrd-dev, libssl-dev, libldap2-dev, libpcre3-dev, - imagemagick, po-debconf, quilt (>= 0.40) +Build-Depends: debhelper (>= 7), librrd-dev, + libssl-dev (>= 1.0.0e-1~), libldap2-dev (>= 2.4.25-2~), libpcre3-dev (>= 8.12-4~), + imagemagick, po-debconf, quilt (>= 0.40), dpkg-dev (>= 1.16.0) Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/collab-maint/xymon.git Vcs-Browser: http://git.debian.org/?p=collab-maint/xymon.git diff -u xymon-4.3.0~beta2.dfsg/debian/rules xymon-4.3.0~beta2.dfsg/debian/rules --- xymon-4.3.0~beta2.dfsg/debian/rules +++ xymon-4.3.0~beta2.dfsg/debian/rules @@ -4,6 +4,8 @@ CFLAGS = -Wall -g +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -36,7 +38,10 @@ INSTALLEXTDIR=/usr/lib/hobbit/server/ext \ INSTALLTMPDIR=/var/lib/hobbit/tmp \ INSTALLWWWDIR=/var/lib/hobbit/www \ - ./configure + ./configure --server \ + --pcrelib /usr/lib/$(DEB_HOST_MULTIARCH) \ + --ssllib /usr/lib/$(DEB_HOST_MULTIARCH) \ + --ldaplib /usr/lib/$(DEB_HOST_MULTIARCH) build: build-stamp build-stamp: Makefile diff -u xymon-4.3.0~beta2.dfsg/debian/changelog xymon-4.3.0~beta2.dfsg/debian/changelog --- xymon-4.3.0~beta2.dfsg/debian/changelog +++ xymon-4.3.0~beta2.dfsg/debian/changelog @@ -1,3 +1,20 @@ +xymon (4.3.0~beta2.dfsg-9.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: PCRE not found": patch from Ubuntu / Steve Langasek: + - debian/rules: pass --pcrelib to find libpcre in the multiarch dir + LP: #749190. + Additionally build-depend on dpkg-dev (>= 1.16.0) and + libpcre3-dev (>= 8.12-4~). (Closes: #651231) + * Since this Ubuntu patch, SSL and LDAP also went multiarch, so: + - also pass --ssllib and --ldaplib to configure in debian/rules + - build-depend on libssl-dev (>= 1.0.0e-1~) and libldap2-dev (>= 2.4.25-2~) + * libpng also went multiarch, so build/rrd.sh doesn't find it, and there's + no option for configure. Add patch png-multiarch that changes build/rrd.sh + to use libpng12-config instead of guessing. + + -- gregor herrmann <gre...@debian.org> Mon, 26 Dec 2011 23:40:38 +0100 + xymon (4.3.0~beta2.dfsg-9) unstable; urgency=low [ Axel Beckert ] diff -u xymon-4.3.0~beta2.dfsg/debian/patches/series xymon-4.3.0~beta2.dfsg/debian/patches/series --- xymon-4.3.0~beta2.dfsg/debian/patches/series +++ xymon-4.3.0~beta2.dfsg/debian/patches/series @@ -20,0 +21 @@ +png-multiarch only in patch2: unchanged: --- xymon-4.3.0~beta2.dfsg.orig/debian/patches/png-multiarch +++ xymon-4.3.0~beta2.dfsg/debian/patches/png-multiarch @@ -0,0 +1,17 @@ +Description: tell the build script how to link to libpng +Origin: vendor +Forwarded: no +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2011-12-26 + +--- a/build/rrd.sh ++++ b/build/rrd.sh +@@ -3,7 +3,7 @@ + RRDDEF="" + RRDINC="" + RRDLIB="" +- PNGLIB="" ++ PNGLIB="$(libpng12-config --ldflags)" + ZLIB="" + for DIR in /opt/rrdtool* /usr/local/rrdtool* /usr/local /usr /usr/pkg /opt/csw /opt/sfw /usr/sfw + do
signature.asc
Description: Digital signature
