[Pkg-utopia-commits] r770 - in packages/unstable/libnl/debian: . patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-04-01 03:00:51 +0000 (Sat, 01 Apr 2006)
New Revision: 770

Added:
   packages/unstable/libnl/debian/patches/
   packages/unstable/libnl/debian/patches/10-amd64-linux-types.patch
Modified:
   packages/unstable/libnl/debian/changelog
   packages/unstable/libnl/debian/rules
Log:
Added patch 10-amd64-linux-types.patch from Ubuntu which closes a FTBFS error on AMD64.


Modified: packages/unstable/libnl/debian/changelog
===================================================================
--- packages/unstable/libnl/debian/changelog	2006-03-30 23:21:51 UTC (rev 769)
+++ packages/unstable/libnl/debian/changelog	2006-04-01 03:00:51 UTC (rev 770)
@@ -1,3 +1,12 @@
+libnl (0.99+1.0.svn21-3) unstable; urgency=low
+
+  * Include simple-patchsys.mk in debian/rules.
+  * Merged debian/patches/10-amd64-linux-types.patch from Ubuntu which fixes
+    the FTBFS error on AMD64. Closes: #358887
+    Thanks to Scott James Remnant for this patch.
+
+ -- Michael Biebl <biebl at teco.edu>  Sat,  1 Apr 2006 04:52:13 +0200
+
 libnl (0.99+1.0.svn21-2) unstable; urgency=low
 
   * Initial upload to unstable.

Added: packages/unstable/libnl/debian/patches/10-amd64-linux-types.patch
===================================================================
--- packages/unstable/libnl/debian/patches/10-amd64-linux-types.patch	2006-03-30 23:21:51 UTC (rev 769)
+++ packages/unstable/libnl/debian/patches/10-amd64-linux-types.patch	2006-04-01 03:00:51 UTC (rev 770)
@@ -0,0 +1,16 @@
+diff -ruNp libnl-1.0~pre5+svn21~/include/netlink-local.h libnl-1.0~pre5+svn21/include/netlink-local.h
+--- libnl-1.0~pre5+svn21~/include/netlink-local.h	2005-12-12 08:24:15.000000000 +0000
++++ libnl-1.0~pre5+svn21/include/netlink-local.h	2006-03-22 01:59:51.000000000 +0000
+@@ -30,11 +30,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
+-typedef uint8_t		__u8;
+-typedef uint16_t	__u16;
+-typedef uint32_t	__u32;
+-typedef int32_t		__s32;
+-typedef uint64_t	__u64;
++#include <linux/types.h>
+ 
+ /* local header copies */
+ #include <linux/if.h>

Modified: packages/unstable/libnl/debian/rules
===================================================================
--- packages/unstable/libnl/debian/rules	2006-03-30 23:21:51 UTC (rev 769)
+++ packages/unstable/libnl/debian/rules	2006-04-01 03:00:51 UTC (rev 770)
@@ -2,5 +2,6 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --libdir=/usr/lib