[Pkg-irc-commits] r294 - in /packages/inspircd2/trunk/debian: changelog patches/04_FTBFS_kfreebsd.diff patches/05_FTBFS_gcc-4.7.diff patches/series watch

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

Author: kcd-guest
Date: Sun Apr 15 21:00:28 2012
New Revision: 294

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=294
Log:
Fix FTBFS with kfreebsd and gcc-4.7 and change watch file to github

Added:
    packages/inspircd2/trunk/debian/patches/04_FTBFS_kfreebsd.diff
    packages/inspircd2/trunk/debian/patches/05_FTBFS_gcc-4.7.diff
Modified:
    packages/inspircd2/trunk/debian/changelog
    packages/inspircd2/trunk/debian/patches/series
    packages/inspircd2/trunk/debian/watch

Modified: packages/inspircd2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/changelog?rev=294&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/changelog (original)
+++ packages/inspircd2/trunk/debian/changelog Sun Apr 15 21:00:28 2012
@@ -1,3 +1,13 @@
+inspircd (2.0.5-1) unstable; urgency=low
+
+  * debian/patches/04_FTBFS_kfreebsd.diff: Fix FTBFS on kfreebsd,
+    thanks Christoph Egger (Closes: #668689)
+  * debian/patches/05_FTBFS_gcc-4.7.diff: Fix FTBFS with gcc-4.7,
+    include <unistd.h>
+  * debian/watch: Update to github since upstream has moved the project
+
+ -- Guillaume Delacour <gui at iroqwa.org>  Sun, 15 Apr 2012 17:35:01 +0200
+
 inspircd (2.0.5-0.1) unstable; urgency=low
 
   [ Guillaume Delacour ]

Added: packages/inspircd2/trunk/debian/patches/04_FTBFS_kfreebsd.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/04_FTBFS_kfreebsd.diff?rev=294&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/patches/04_FTBFS_kfreebsd.diff (added)
+++ packages/inspircd2/trunk/debian/patches/04_FTBFS_kfreebsd.diff Sun Apr 15 21:00:28 2012
@@ -1,0 +1,18 @@
+Subject: FTBFS on kfreebsd-{amd64,i386}
+Author: Christoph Egger <christoph at debian.org>
+Bug-Debian: http://bugs.debian.org/668689
+Last-Update: 2012-04-14
+Forwarded: https://github.com/inspircd/inspircd/issues/64
+
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -38,6 +38,9 @@
+ @IFEQ $(SYSTEM) linux
+   LDLIBS += -ldl -lrt
+ @ENDIF
++ at IFEQ $(SYSTEM) gnukfreebsd
++  LDLIBS += -ldl -lrt
++ at ENDIF
+ @IFEQ $(SYSTEM) solaris
+   LDLIBS += -lsocket -lnsl -lrt -lresolv
+ @ENDIF

Added: packages/inspircd2/trunk/debian/patches/05_FTBFS_gcc-4.7.diff
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/05_FTBFS_gcc-4.7.diff?rev=294&op=file
==============================================================================
--- packages/inspircd2/trunk/debian/patches/05_FTBFS_gcc-4.7.diff (added)
+++ packages/inspircd2/trunk/debian/patches/05_FTBFS_gcc-4.7.diff Sun Apr 15 21:00:28 2012
@@ -1,0 +1,15 @@
+From: Guillaume Delacour <gui at iroqwa.org>
+Subject: FTBFS with gcc-4.7, include unistd.h
+Origin: http://gcc.gnu.org/gcc-4.7/porting_to.html
+Forwarded: https://github.com/inspircd/inspircd/issues/65
+
+--- a/include/inspircd.h
++++ b/include/inspircd.h
+@@ -43,6 +43,7 @@
+ #include <cstring>
+ #include <climits>
+ #include <cstdio>
++#include <unistd.h>
+ 
+ #include <sstream>
+ #include <string>

Modified: packages/inspircd2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/patches/series?rev=294&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/patches/series (original)
+++ packages/inspircd2/trunk/debian/patches/series Sun Apr 15 21:00:28 2012
@@ -1,3 +1,5 @@
 01_spelling_error.diff
 02_disable_rpath_for_extra_modules.diff
 03_CVE-2012-1836.diff
+04_FTBFS_kfreebsd.diff
+05_FTBFS_gcc-4.7.diff

Modified: packages/inspircd2/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd2/trunk/debian/watch?rev=294&op=diff
==============================================================================
--- packages/inspircd2/trunk/debian/watch (original)
+++ packages/inspircd2/trunk/debian/watch Sun Apr 15 21:00:28 2012
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+dfsg$// \
-http://www.inspircd.org/?p=olddownloads /\?p=download&version=([\d\.]+)
+https://github.com/inspircd/inspircd/downloads /downloads/inspircd/inspircd/InspIRCd-(.+)\.tar\.bz2