[hamradio-commits] [aprsdigi] 03/08: Imported Debian patch 2.4.4-3.2

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository aprsdigi.

commit 08023b609956ba1a03d63d1d7709b4d96ad2aa1a
Author: Luk Claes <luk at debian.org>
Date:   Fri Jun 8 23:23:13 2012 +0200

    Imported Debian patch 2.4.4-3.2
---
 aprsdigi.c       | 6 +-----
 aprsmon.c        | 6 +-----
 aprsshm.c        | 2 --
 debian/changelog | 7 +++++++
 libax25ext.c     | 1 -
 testmcast.c      | 6 +-----
 testparse.c      | 6 +-----
 7 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/aprsdigi.c b/aprsdigi.c
index 5fdd7dc..2c90df8 100644
--- a/aprsdigi.c
+++ b/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
diff --git a/aprsmon.c b/aprsmon.c
index 8f5b055..215bfb8 100644
--- a/aprsmon.c
+++ b/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"
diff --git a/aprsshm.c b/aprsshm.c
index 6543c45..ad8b2b3 100644
--- a/aprsshm.c
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 2dad197..42f3e2e 100644
--- a/debian/changelog
+++ b/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 at 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.
diff --git a/libax25ext.c b/libax25ext.c
index e9af48c..e3d6db1 100644
--- a/libax25ext.c
+++ b/libax25ext.c
@@ -9,7 +9,6 @@
 
 #include <netax25/ax25.h>
 #include <netrose/rose.h>
-#include <netax25/axlib.h>
 #include "libax25ext.h"
 #include <string.h>
 
diff --git a/testmcast.c b/testmcast.c
index b83b39a..1a9bda5 100644
--- a/testmcast.c
+++ b/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
diff --git a/testparse.c b/testparse.c
index 3daeb38..599ec0b 100644
--- a/testparse.c
+++ b/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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/aprsdigi.git