Merge lp:~cyphermox/ubuntu/precise/ntrack/libnl3-transition into lp:ubuntu/precise/ntrack

[Mathieu Trudel-Lapierre]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-13 14:30:30 +0000
+++ debian/changelog	2011-12-23 15:37:26 +0000
@@ -1,3 +1,13 @@
+ntrack (016-1ubuntu1) precise; urgency=low
+
+  * debian/control: update Build-Depends: libnl3-dev -> libnl-3-dev,
+    libnl-route-3-dev. 
+  * debian/patches/disable-pedantic.patch: don't pass -pedantic in CFLAGS, it
+    makes the build fail to complete against libnl3 3.2 and glib.
+  * debian/libntrack-qt4-1.symbols: add missing symbol: ZN15QNtrackListenerD2Ev.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 22 Dec 2011 20:46:23 -0500
+
 ntrack (016-1) unstable; urgency=low
 
   Package upstream release 016

=== modified file 'debian/control'
--- debian/control	2011-11-13 14:30:30 +0000
+++ debian/control	2011-12-23 15:37:26 +0000
@@ -1,10 +1,12 @@
 Source: ntrack
-Maintainer: Alexander Sack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alexander Sack <[e-mail]>
 Section: net
 Priority: optional
 Build-Depends: debhelper (>=5), cdbs, quilt,
  libglib2.0-dev,
- libnl3-dev,
+ libnl-3-dev,
+ libnl-route-3-dev,
  python-gtk2-dev,
  libqt4-dev
 Standards-Version: 3.9.1

=== modified file 'debian/libntrack-qt4-1.symbols'
--- debian/libntrack-qt4-1.symbols	2011-11-13 14:30:30 +0000
+++ debian/libntrack-qt4-1.symbols	2011-12-23 15:37:26 +0000
@@ -6,6 +6,7 @@
  _ZN15QNtrackListener16staticMetaObjectE@Base 005
  _ZN15QNtrackListenerD0Ev@Base 005
  _ZN15QNtrackListenerD1Ev@Base 005
+ _ZN15QNtrackListenerD2Ev@Base 016
  _ZN7QNtrack11qt_metacallEN11QMetaObject4CallEiPPv@Base 005
  _ZN7QNtrack11qt_metacastEPKc@Base 005
  _ZN7QNtrack12monitorEventE14ntrack_event_t@Base 005

=== added file 'debian/patches/disable-pedantic.patch'
--- debian/patches/disable-pedantic.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-pedantic.patch	2011-12-23 15:37:26 +0000
@@ -0,0 +1,100 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Disable -pedantic, it makes ntrack fail to build against
+ libnl3 3.2 and glib.
+
+Index: ntrack/glib/Makefile.am
+===================================================================
+--- ntrack.orig/glib/Makefile.am	2011-12-22 19:25:13.137470000 -0500
++++ ntrack/glib/Makefile.am	2011-12-22 20:07:10.243344976 -0500
+@@ -26,7 +26,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/
+ 
+ AM_LDFLAGS =
+Index: ntrack/glib/Makefile.in
+===================================================================
+--- ntrack.orig/glib/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/glib/Makefile.in	2011-12-22 20:07:14.871344769 -0500
+@@ -325,7 +325,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/
+ 
+ AM_LDFLAGS = 
+Index: ntrack/glib/test/Makefile.am
+===================================================================
+--- ntrack.orig/glib/test/Makefile.am	2011-12-22 19:25:13.137470000 -0500
++++ ntrack/glib/test/Makefile.am	2011-12-22 20:07:19.451344565 -0500
+@@ -27,7 +27,6 @@
+ 	../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+ 	-Werror \
+ 	-I$(srcdir)/.. \
+Index: ntrack/glib/test/Makefile.in
+===================================================================
+--- ntrack.orig/glib/test/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/glib/test/Makefile.in	2011-12-22 20:07:23.903344367 -0500
+@@ -260,7 +260,6 @@
+ 	../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-	-pedantic \
+ 	-Wall \
+ 	-Werror \
+ 	-I$(srcdir)/.. \
+Index: ntrack/gobject/Makefile.am
+===================================================================
+--- ntrack.orig/gobject/Makefile.am	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/gobject/Makefile.am	2011-12-22 20:07:27.515344206 -0500
+@@ -26,7 +26,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/ \
+ 	-I$(srcdir)/../glib/
+ 
+Index: ntrack/gobject/Makefile.in
+===================================================================
+--- ntrack.orig/gobject/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/gobject/Makefile.in	2011-12-22 20:07:31.519344028 -0500
+@@ -347,7 +347,6 @@
+ AM_CFLAGS = \
+ 	-Wall \
+ 	-Werror \
+-	-pedantic \
+ 	-I$(srcdir)/../common/ \
+ 	-I$(srcdir)/../glib/
+ 
+Index: ntrack/modules/Makefile.am
+===================================================================
+--- ntrack.orig/modules/Makefile.am	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/modules/Makefile.am	2011-12-22 20:07:35.519343851 -0500
+@@ -26,7 +26,6 @@
+ 	-Wall \
+ 	-Werror \
+ 	-Wno-variadic-macros \
+-	-pedantic \
+ 	-I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS =
+Index: ntrack/modules/Makefile.in
+===================================================================
+--- ntrack.orig/modules/Makefile.in	2011-12-22 20:05:46.243208000 -0500
++++ ntrack/modules/Makefile.in	2011-12-22 20:07:39.391343676 -0500
+@@ -352,7 +352,6 @@
+ 	-Wall \
+ 	-Werror \
+ 	-Wno-variadic-macros \
+-	-pedantic \
+ 	-I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS = 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-11-13 14:30:30 +0000
+++ debian/patches/series	2011-12-23 15:37:26 +0000
@@ -1,1 +1,2 @@
 # put your quilt patches here
+disable-pedantic.patch