Merge lp:~cyphermox/ubuntu/precise/libnl3/merge-3.0-2 into lp:ubuntu/precise/libnl3

[Mathieu Trudel-Lapierre]

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-05 13:35:04 +0000
+++ debian/changelog	2011-12-07 22:46:27 +0000
@@ -1,3 +1,19 @@
+libnl3 (3.0-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with Debian unstable; remaining changes: (LP: #901438)
+    - debian/patches/lp854719_single_path_fixes.patch: if dealing with a single
+      nexthop object for a route, apply the destination and interface directly
+      to the underlying route object.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 07 Dec 2011 16:12:25 -0500
+
+libnl3 (3.0-2) unstable; urgency=low
+
+  * Acknowledge NMU
+  * Install config-files to /etc/libnl3 (Closes: #632790)
+
+ -- Heiko Stuebner <[e-mail]>  Mon, 26 Sep 2011 20:27:45 +0200
+
 libnl3 (3.0-1.1ubuntu1) oneiric; urgency=low
 
   * debian/patches/lp854719_single_path_fixes.patch: if dealing with a single
@@ -15,7 +31,7 @@
 
 libnl3 (3.0-1.1) unstable; urgency=low
 
-  * Non-maintainer upload with agreement from Heiko Stübner
+  * Non-maintainer upload with agreement from Heiko Stuebner
   * Add libnl3-udeb package with seperate build for 
     debian-installer (Closes: #635962).
 

=== modified file 'debian/control'
--- debian/control	2011-10-05 13:35:04 +0000
+++ debian/control	2011-12-07 22:46:27 +0000
@@ -68,4 +68,4 @@
  The library provides an interface for raw netlink messaging and various 
  netlink family specific interfaces.
  .
- This package is a udeb. It's only usefull inside of debian-installer.
\ No newline at end of file
+ This package is a udeb. It's only useful inside of debian-installer.

=== modified file 'debian/libnl3.install'
--- debian/libnl3.install	2011-05-21 19:25:13 +0000
+++ debian/libnl3.install	2011-12-07 22:46:27 +0000
@@ -1,1 +1,2 @@
 debian/tmp/usr/lib/libnl*.so.*
+debian/tmp/etc/libnl/* etc/libnl3

=== modified file 'debian/patches/0003-fix-out-of-tree-build.patch'
--- debian/patches/0003-fix-out-of-tree-build.patch	2011-07-29 23:25:48 +0000
+++ debian/patches/0003-fix-out-of-tree-build.patch	2011-12-07 22:46:27 +0000
@@ -19,7 +19,7 @@
  # -*- Makefile -*-
  
 -AM_CPPFLAGS  = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
-+AM_CPPFLAGS  = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -I${builddir}/route/cls -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
++AM_CPPFLAGS  = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -I${builddir}/route/cls -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl3\"
  AM_LDFLAGS = -version-info 3:0:0
  
  lib_LTLIBRARIES = \
@@ -30,7 +30,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
-+AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -I${builddir}/route/cls -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
++AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -I${builddir}/route -I${builddir}/route/cls -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl3\"
  AM_LDFLAGS = -version-info 3:0:0
  lib_LTLIBRARIES = \
  	libnl.la libnl-genl.la libnl-route.la libnl-nf.la