Bug#664932: aprsdigi: diff for NMU version 2.4.4-3.2

[Luk Claes <luk@debian.org>]

tags 664932 + pending
thanks

Dear maintainer,

I've prepared an NMU for aprsdigi (versioned as 2.4.4-3.2) and
will have it uploaded soon.

Cheers

Luk

diff -u aprsdigi-2.4.4/debian/changelog aprsdigi-2.4.4/debian/changelog
--- aprsdigi-2.4.4/debian/changelog
+++ aprsdigi-2.4.4/debian/changelog
@@ -1,3 +1,10 @@
+aprsdigi (2.4.4-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * include linux/ax25.h instead of netax25/* (Closes: #664932).
+
+ -- Luk Claes <luk@debian.org>  Fri, 08 Jun 2012 23:23:13 +0200
+
 aprsdigi (2.4.4-3.1) unstable; urgency=low
 
   * Retiring - remove myself from the uploaders list.
only in patch2:
unchanged:
--- aprsdigi-2.4.4.orig/libax25ext.c
+++ aprsdigi-2.4.4/libax25ext.c
@@ -9,7 +9,6 @@
 
 #include <netax25/ax25.h>
 #include <netrose/rose.h>
-#include <netax25/axlib.h>
 #include "libax25ext.h"
 #include <string.h>
 
only in patch2:
unchanged:
--- aprsdigi-2.4.4.orig/aprsdigi.c
+++ aprsdigi-2.4.4/aprsdigi.c
@@ -53,11 +53,7 @@
 #include <time.h>
 #include <signal.h>
 #include <errno.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
-#include <netax25/ax25.h>
-#include <netax25/axlib.h>
-#include <netax25/axconfig.h>
+#include <linux/ax25.h>
 #ifndef AX25_MTU
 #define AX25_MTU 256
 #endif
only in patch2:
unchanged:
--- aprsdigi-2.4.4.orig/aprsmon.c
+++ aprsdigi-2.4.4/aprsmon.c
@@ -61,11 +61,7 @@
 #include <time.h>
 #include <signal.h>
 
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
-#include <netax25/ax25.h>
-#include <netax25/axlib.h>
-#include <netax25/axconfig.h>
+#include <linux/ax25.h>
 
 #ifndef HAVE_LIBAX25_EXTENSIONS
 #include "libax25ext.h"
only in patch2:
unchanged:
--- aprsdigi-2.4.4.orig/aprsshm.c
+++ aprsdigi-2.4.4/aprsshm.c
@@ -44,9 +44,7 @@
 #include <ctype.h>
 #include <time.h>
 
-#include <netax25/ax25.h>
 
-#include <netax25/axconfig.h>
 #include "aprsshm.h"
 
 #define MAXPPM 10
only in patch2:
unchanged:
--- aprsdigi-2.4.4.orig/testmcast.c
+++ aprsdigi-2.4.4/testmcast.c
@@ -16,11 +16,7 @@
 #include <time.h>
 #include <signal.h>
 #include <errno.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
-#include <netax25/ax25.h>
-#include <netax25/axlib.h>
-#include <netax25/axconfig.h>
+#include <linux/ax25.h>
 #ifndef AX25_MTU
 #define AX25_MTU 256
 #endif
only in patch2:
unchanged:
--- aprsdigi-2.4.4.orig/testparse.c
+++ aprsdigi-2.4.4/testparse.c
@@ -16,11 +16,7 @@
 #include <time.h>
 #include <signal.h>
 #include <errno.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
-#include <netax25/ax25.h>
-#include <netax25/axlib.h>
-#include <netax25/axconfig.h>
+#include <linux/ax25.h>
 #include <netdb.h>
 #include "libax25ext.h"
 static void print_it(FILE *f,