rev 16474 - in kde-extras/icecream/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-12-22 16:07:20 +0000 (Tue, 22 Dec 2009)
New Revision: 16474

Added:
   kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff
Modified:
   kde-extras/icecream/trunk/debian/changelog
   kde-extras/icecream/trunk/debian/control
   kde-extras/icecream/trunk/debian/patches/series
   kde-extras/icecream/trunk/debian/rules
Log:
Merge Kibi NMU.


Modified: kde-extras/icecream/trunk/debian/changelog
===================================================================
--- kde-extras/icecream/trunk/debian/changelog	2009-12-22 11:35:41 UTC (rev 16473)
+++ kde-extras/icecream/trunk/debian/changelog	2009-12-22 16:07:20 UTC (rev 16474)
@@ -1,3 +1,23 @@
+icecc (0.9.4-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS due to auto* version mismatch:
+     - Add autoconf to Build-Depends.
+     - Use “autoreconf -vfi” to regenerate everything.
+
+ -- Cyril Brulebois <kibi at debian.org>  Sun, 13 Dec 2009 18:28:15 +0100
+
+icecc (0.9.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS on GNU/kFreeBSD (Closes: #544576):
+     - Add libdevstat-dev to Build-Depends and to libicecc-dev's Depends,
+       only for kfreebsd-*.
+     - Add upstream patch: 20_fix_ftbfs_on_kfreebsd.diff
+     - Thanks to Petr Salinger for both Debian and upstream patches.
+
+ -- Cyril Brulebois <kibi at debian.org>  Sun, 06 Dec 2009 17:03:00 +0100
+
 icecc (0.9.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/icecream/trunk/debian/control
===================================================================
--- kde-extras/icecream/trunk/debian/control	2009-12-22 11:35:41 UTC (rev 16473)
+++ kde-extras/icecream/trunk/debian/control	2009-12-22 16:07:20 UTC (rev 16474)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> 
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7), quilt, automake, libtool, docbook2x
+Build-Depends: debhelper (>= 7), quilt, autoconf, automake, libtool, docbook2x,
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64]
 Homepage: http://en.opensuse.org/Icecream
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/icecream/trunk/
@@ -28,7 +29,7 @@
 Package: libicecc-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdevstat-dev [kfreebsd-any]
 Description: development files for icecc (distributed compiler)
  This package is part if icecc. It provides files which are necessary to build
  icecc-monitor.

Added: kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff
===================================================================
--- kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff	                        (rev 0)
+++ kde-extras/icecream/trunk/debian/patches/20_fix_ftbfs_on_kfreebsd.diff	2009-12-22 16:07:20 UTC (rev 16474)
@@ -0,0 +1,43 @@
+Fix FTBFS on GNU/kFreeBSD, thanks to Petr Salinger.
+--- icecc-0.9.4.orig/minilzo/lzodefs.h
++++ icecc-0.9.4/minilzo/lzodefs.h
+@@ -356,7 +356,7 @@
+ #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
+ #    define LZO_OS_POSIX_AIX        1
+ #    define LZO_INFO_OS_POSIX       "aix"
+-#  elif defined(__FreeBSD__)
++#  elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #    define LZO_OS_POSIX_FREEBSD    1
+ #    define LZO_INFO_OS_POSIX       "freebsd"
+ #  elif defined(__hpux__) || defined(__hpux)
+--- icecc-0.9.4.orig/minilzo/minilzo.c
++++ icecc-0.9.4/minilzo/minilzo.c
+@@ -377,7 +377,7 @@
+ #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
+ #    define LZO_OS_POSIX_AIX        1
+ #    define LZO_INFO_OS_POSIX       "aix"
+-#  elif defined(__FreeBSD__)
++#  elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #    define LZO_OS_POSIX_FREEBSD    1
+ #    define LZO_INFO_OS_POSIX       "freebsd"
+ #  elif defined(__hpux__) || defined(__hpux)
+--- icecc-0.9.4.orig/daemon/ncpus.c
++++ icecc-0.9.4/daemon/ncpus.c
+@@ -89,7 +89,7 @@
+      return 0;
+ }
+ 
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__bsdi__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__bsdi__) || defined(__DragonFly__)
+ 
+ /* http://www.FreeBSD.org/cgi/man.cgi?query=sysctl&sektion=3&manpath=FreeBSD+4.6-stable
+    http://www.openbsd.org/cgi-bin/man.cgi?query=sysctl&sektion=3&manpath=OpenBSD+Current
+@@ -100,7 +100,7 @@
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #undef HAVE_RS_LOG_ERROR
+ #else
+ #define HAVE_RS_LOG_ERROR

Modified: kde-extras/icecream/trunk/debian/patches/series
===================================================================
--- kde-extras/icecream/trunk/debian/patches/series	2009-12-22 11:35:41 UTC (rev 16473)
+++ kde-extras/icecream/trunk/debian/patches/series	2009-12-22 16:07:20 UTC (rev 16474)
@@ -1,3 +1,4 @@
 10_rename_scheduler.diff
 # Disabled 12_fix_crosstool_distribution_bug494692.diff
 # Disabled 13_fix_nonblocking_sockets_for_icemon_bug503152.diff
+20_fix_ftbfs_on_kfreebsd.diff

Modified: kde-extras/icecream/trunk/debian/rules
===================================================================
--- kde-extras/icecream/trunk/debian/rules	2009-12-22 11:35:41 UTC (rev 16473)
+++ kde-extras/icecream/trunk/debian/rules	2009-12-22 16:07:20 UTC (rev 16474)
@@ -6,7 +6,7 @@
 	dh $@
 
 build: $(QUILT_STAMPFN)
-	autoreconf --force
+	autoreconf -vfi
 
 	for i in debian/man/*.xml; do \
 		/usr/bin/docbook2x-man $$i; \