[Pkg-irc-commits] r296 - in /packages/inspircd2/trunk/debian: changelog control patches/06_FTBFS-hurd.diff patches/series

[kcd-guest at users.alioth.debian.org]

Author: kcd-guest
Date: Tue May 15 20:22:33 2012
New Revision: 296

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=296
Log:
FTBFS on GNU Hurd and bump Standards-Version to 3.9.3

Added:
    packages/inspircd2/trunk/debian/patches/06_FTBFS-hurd.diff
Modified:
    packages/inspircd2/trunk/debian/changelog
    packages/inspircd2/trunk/debian/control
    packages/inspircd2/trunk/debian/patches/series

Modified: packages/inspircd2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/changelog?rev=296&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog (original)
+++ packages/inspircd2/trunk/debian/changelog Tue May 15 20:22:33 2012
@@ -1,3 +1,11 @@
+inspircd (2.0.5-2) unstable; urgency=low
+
+  * debian/patches/06_FTBFS-hurd.diff: Fix FTBFS on Hurd (Closes: #669176)
+    thanks Jonathan Wiltshire
+  * Bump to Standards-Version 3.9.3 (no changes needed)
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Sat, 12 May 2012 07:52:49 +0200
+
 inspircd (2.0.5-1) unstable; urgency=low
 
   * debian/patches/04_FTBFS_kfreebsd.diff: Fix FTBFS on kfreebsd,

Modified: packages/inspircd2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/control?rev=296&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/control (original)
+++ packages/inspircd2/trunk/debian/control Tue May 15 20:22:33 2012
@@ -11,9 +11,9 @@
   Guillaume Delacour <gui at iroqwa.org>
 Build-Depends: debhelper (>= 8.0.0), perl-modules, libgnutls-dev, pkg-config,
                libldap2-dev, libpcre3-dev, libmysqlclient-dev, libpq-dev,
-               libsqlite3-dev, libssl-dev, zlib1g-dev, libgeoip-dev,
+               libsqlite3-dev, zlib1g-dev, libgeoip-dev,
                libtre-dev, hardening-wrapper
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.inspircd.org/
 Vcs-Svn: svn://svn.debian.org/pkg-irc/packages/inspircd2/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/

Added: packages/inspircd2/trunk/debian/patches/06_FTBFS-hurd.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/06_FTBFS-hurd.diff?rev=296&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/patches/06_FTBFS-hurd.diff (added)
+++ packages/inspircd2/trunk/debian/patches/06_FTBFS-hurd.diff Tue May 15 20:22:33 2012
@@ -1,0 +1,18 @@
+Description: fix FTBFS on GNU Hurd by explicitly linking librt and libdl
+Author: Jonathan Wiltshire <jmw at debian.org>
+Origin: Debian
+Forwarded: https://github.com/inspircd/inspircd/issues/98
+Last-Update: 2012-04-17
+
+--- inspircd-2.0.5.orig/make/template/main.mk
++++ inspircd-2.0.5/make/template/main.mk
+@@ -41,6 +41,9 @@ INSTMODE_LIB = 0644
+ @IFEQ $(SYSTEM) gnukfreebsd
+   LDLIBS += -ldl -lrt
+ @ENDIF
++ at IFEQ $(SYSTEM) gnu
++  LDLIBS += -ldl -lrt
++ at ENDIF
+ @IFEQ $(SYSTEM) solaris
+   LDLIBS += -lsocket -lnsl -lrt -lresolv
+ @ENDIF

Modified: packages/inspircd2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/series?rev=296&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/series (original)
+++ packages/inspircd2/trunk/debian/patches/series Tue May 15 20:22:33 2012
@@ -3,3 +3,4 @@
 03_CVE-2012-1836.diff
 04_FTBFS_kfreebsd.diff
 05_FTBFS_gcc-4.7.diff
+06_FTBFS-hurd.diff