[Pkg-utopia-commits] r1962 - in /packages/unstable/libnl/debian: changelog patches/01-ip_mg_alg_internal_only.patch patches/10-amd64-linux-types.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Dec 20 06:51:17 2007
New Revision: 1962

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1962
Log:
* debian/patches/10-amd64-linux-types.patch
  - Removed, merged upstream.
* debian/patches/01-ip_mg_alg_internal_only.patch
  - Pull a fix from upstream. The header linux/ip_mp_alg.h is no longer part
    of the linux kernel headers (i.e. linux-libc-dev) so remove it from
    netlink/netlink.h.

Added:
    packages/unstable/libnl/debian/patches/01-ip_mg_alg_internal_only.patch
Removed:
    packages/unstable/libnl/debian/patches/10-amd64-linux-types.patch
Modified:
    packages/unstable/libnl/debian/changelog

Modified: packages/unstable/libnl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/libnl/debian/changelog?rev=1962&op=diff
==============================================================================
--- packages/unstable/libnl/debian/changelog (original)
+++ packages/unstable/libnl/debian/changelog Thu Dec 20 06:51:17 2007
@@ -9,8 +9,14 @@
        not coinstallable.
     - [libnl-dev] Change Depends to libnl1-pre8.
   * Rename debian/libnl1-pre6.install to debian/libnl1-pre8.install.
+  * debian/patches/10-amd64-linux-types.patch
+    - Removed, merged upstream.
+  * debian/patches/01-ip_mg_alg_internal_only.patch
+    - Pull a fix from upstream. The header linux/ip_mp_alg.h is no longer part
+      of the linux kernel headers (i.e. linux-libc-dev) so remove it from
+      netlink/netlink.h.
 
- -- Michael Biebl <biebl at debian.org>  Thu, 20 Dec 2007 07:40:47 +0100
+ -- Michael Biebl <biebl at debian.org>  Thu, 20 Dec 2007 07:45:03 +0100
 
 libnl (1.0~pre6-6) unstable; urgency=low
 

Added: packages/unstable/libnl/debian/patches/01-ip_mg_alg_internal_only.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/libnl/debian/patches/01-ip_mg_alg_internal_only.patch?rev=1962&op=file
==============================================================================
--- packages/unstable/libnl/debian/patches/01-ip_mg_alg_internal_only.patch (added)
+++ packages/unstable/libnl/debian/patches/01-ip_mg_alg_internal_only.patch Thu Dec 20 06:51:17 2007
@@ -1,0 +1,37 @@
+From 865bbb464a08ef2c20238cb17337423763d6f0ca Mon Sep 17 00:00:00 2001
+From: Thomas Graf <tgr at deb.localdomain>
+Date: Tue, 18 Dec 2007 12:30:09 +0100
+Subject: [PATCH] Include linux/ip_mg_alg.h internally for compatibility only
+
+---
+ include/netlink-local.h   |    1 +
+ include/netlink/netlink.h |    1 -
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/netlink-local.h b/include/netlink-local.h
+index 3ab1b27..3c50ea0 100644
+--- a/include/netlink-local.h
++++ b/include/netlink-local.h
+@@ -43,6 +43,7 @@
+ #include <linux/pkt_sched.h>
+ #include <linux/pkt_cls.h>
+ #include <linux/gen_stats.h>
++#include <linux/ip_mp_alg.h>
+ 
+ #include <netlink/netlink.h>
+ #include <netlink/handlers.h>
+diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h
+index 138535b..2cdf345 100644
+--- a/include/netlink/netlink.h
++++ b/include/netlink/netlink.h
+@@ -24,7 +24,6 @@
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/genetlink.h>
+-#include <linux/ip_mp_alg.h>
+ #include <linux/netfilter/nfnetlink.h>
+ #include <netlink/types.h>
+ #include <netlink/handlers.h>
+-- 
+1.5.3.7
+