r36062 - in /packages/libbft/trunk/debian: changelog control patches/ patches/libbft+kbsd.diff patches/series rules

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

Author: sylvestre-guest
Date: Sat Dec 12 14:42:15 2009
New Revision: 36062

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36062
Log:
+libbft (1.1.1-3) unstable; urgency=low
+
+  * FTBFS on kfreebsd-i386 on HAVE_LONG_LONG. Thanks to Cyril Brulebois for 
+    the patch (Closes: #557891)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 25 Nov 2009 10:21:31 +0100

Added:
    packages/libbft/trunk/debian/patches/
    packages/libbft/trunk/debian/patches/libbft+kbsd.diff
    packages/libbft/trunk/debian/patches/series
Modified:
    packages/libbft/trunk/debian/changelog
    packages/libbft/trunk/debian/control
    packages/libbft/trunk/debian/rules

Modified: packages/libbft/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/changelog?rev=36062&op=diff
==============================================================================
--- packages/libbft/trunk/debian/changelog (original)
+++ packages/libbft/trunk/debian/changelog Sat Dec 12 14:42:15 2009
@@ -1,3 +1,10 @@
+libbft (1.1.1-3) unstable; urgency=low
+
+  * FTBFS on kfreebsd-i386 on HAVE_LONG_LONG. Thanks to Cyril Brulebois for 
+    the patch (Closes: #557891)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 25 Nov 2009 10:21:31 +0100
+
 libbft (1.1.1-2) unstable; urgency=low
 
   * Missing dependency on zlib1g-dev (not mandatory for libbft but better)

Modified: packages/libbft/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/control?rev=36062&op=diff
==============================================================================
--- packages/libbft/trunk/debian/control (original)
+++ packages/libbft/trunk/debian/control Sat Dec 12 14:42:15 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, zlib1g-dev
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, zlib1g-dev, quilt
 Standards-Version: 3.8.3
 Homepage: http://www.code-saturne.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libbft/

Added: packages/libbft/trunk/debian/patches/libbft+kbsd.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/patches/libbft%2Bkbsd.diff?rev=36062&op=file
==============================================================================
--- packages/libbft/trunk/debian/patches/libbft+kbsd.diff (added)
+++ packages/libbft/trunk/debian/patches/libbft+kbsd.diff Sat Dec 12 14:42:15 2009
@@ -1,0 +1,11 @@
+--- libbft-1.1.1.orig/src/bft_file.c
++++ libbft-1.1.1/src/bft_file.c
+@@ -113,7 +113,7 @@
+ #  if (BFT_SIZEOF_Z_OFF_T == BFT_SIZEOF_LONG)
+ typedef long bft_z_off_t;
+ #  elif defined (HAVE_LONG_LONG)
+-#    if (BFT_SIZEOF_Z_OFF_T == BFT_SIZEOF_LONG)
++#    if (BFT_SIZEOF_Z_OFF_T == BFT_SIZEOF_LONG_LONG)
+ typedef long long bft_z_off_t;
+ #    else
+ #      error "z_off_t returned by zlibCompileFlags() neither long nor long long"

Added: packages/libbft/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/patches/series?rev=36062&op=file
==============================================================================
--- packages/libbft/trunk/debian/patches/series (added)
+++ packages/libbft/trunk/debian/patches/series Sat Dec 12 14:42:15 2009
@@ -1,0 +1,3 @@
+# Fix a FTBGS under kfreebsd-i386
+libbft+kbsd.diff
+

Modified: packages/libbft/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/rules?rev=36062&op=diff
==============================================================================
--- packages/libbft/trunk/debian/rules (original)
+++ packages/libbft/trunk/debian/rules Sat Dec 12 14:42:15 2009
@@ -3,6 +3,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # The website seems to break uscan - it simply does not find the
 # hyperlinks. That is why we are using wget here. :-(