head	1.5;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.5
	OPENPKG_E1_MP:1.5
	OPENPKG_E1_MP_2_STABLE:1.5.2.2
	OPENPKG_E1_FP:1.5.2.2
	OPENPKG_2_STABLE_MP:1.5
	OPENPKG_2_STABLE_20061018:1.5.2.2
	OPENPKG_2_STABLE:1.5.0.2
	OPENPKG_CW_FP:1.3;
locks; strict;
comment	@# @;


1.5
date	2006.03.10.12.05.44;	author rse;	state Exp;
branches
	1.5.2.1;
next	1.4;
commitid	sLahx6bofLNNaDor;

1.4
date	2005.05.06.07.11.19;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2004.10.06.19.46.43;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2004.02.10.17.10.53;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.09.20.19.29.57;	author rse;	state Exp;
branches;
next	;

1.5.2.1
date	2006.03.10.12.05.44;	author rse;	state dead;
branches;
next	1.5.2.2;
commitid	iZxwRSmmWscPXUQr;

1.5.2.2
date	2006.10.16.14.51.59;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.5
log
@upgrading package: libnetdude 0.7 -> 0.8
@
text
@Index: plugins/BPF-Filter/Makefile.in
--- plugins/BPF-Filter/Makefile.in.orig	2006-01-15 00:46:59 +0100
+++ plugins/BPF-Filter/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -210,7 +210,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 pkg_LTLIBRARIES = libnd_bpf.la
 pkginclude_HEADERS = libnd_bpf.h
 libnd_bpf_la_SOURCES = libnd_bpf.c
Index: plugins/ChecksumFix/Makefile.in
--- plugins/ChecksumFix/Makefile.in.orig	2006-01-15 00:47:01 +0100
+++ plugins/ChecksumFix/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -210,7 +210,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 pkg_LTLIBRARIES = libnd_cksumfix.la
 pkginclude_HEADERS = libnd_cksumfix.h
 libnd_cksumfix_la_SOURCES = libnd_cksumfix.c
Index: protocols/802.11/Makefile.in
--- protocols/802.11/Makefile.in.orig	2006-01-15 00:47:04 +0100
+++ protocols/802.11/Makefile.in	2006-03-10 13:03:15 +0100
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_802_11.la 
 libnd_802_11_la_SOURCES = libnd_802_11.c libnd_802_11.h
 libnd_802_11_la_LDFLAGS = -module -avoid-version
Index: protocols/arp/Makefile.in
--- protocols/arp/Makefile.in.orig	2006-01-15 00:47:07 +0100
+++ protocols/arp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -75,7 +75,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/arp
+pkgincludedir = $(includedir)/libnetdude/protocols/arp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_arp.la 
 libnd_arp_la_SOURCES = libnd_arp.c libnd_arp.h
 libnd_arp_la_LDFLAGS = -module -avoid-version
Index: protocols/ether/Makefile.in
--- protocols/ether/Makefile.in.orig	2006-01-15 00:47:09 +0100
+++ protocols/ether/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_ethernet.la 
 libnd_ethernet_la_SOURCES = libnd_ether.c libnd_ether.h
 libnd_ethernet_la_LDFLAGS = -module -avoid-version
Index: protocols/fddi/Makefile.in
--- protocols/fddi/Makefile.in.orig	2006-01-15 00:47:11 +0100
+++ protocols/fddi/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/fddi
+pkgincludedir = $(includedir)/libnetdude/protocols/fddi
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_fddi.la 
 pkginclude_HEADERS = libnd_fddi.h
 libnd_fddi_la_SOURCES = libnd_fddi.c libnd_fddi.h
Index: protocols/icmp/Makefile.in
--- protocols/icmp/Makefile.in.orig	2006-01-15 00:47:13 +0100
+++ protocols/icmp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/icmp
+pkgincludedir = $(includedir)/libnetdude/protocols/icmp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_icmp.la 
 pkginclude_HEADERS = libnd_icmp.h
 libnd_icmp_la_SOURCES = libnd_icmp.c libnd_icmp.h
Index: protocols/ip/Makefile.in
--- protocols/ip/Makefile.in.orig	2006-01-15 00:47:15 +0100
+++ protocols/ip/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/ip
+pkgincludedir = $(includedir)/libnetdude/protocols/ip
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_ip.la 
 pkginclude_HEADERS = libnd_ip.h
 libnd_ip_la_SOURCES = libnd_ip.c libnd_ip.h
Index: protocols/linux-sll/Makefile.in
--- protocols/linux-sll/Makefile.in.orig	2006-01-15 00:47:17 +0100
+++ protocols/linux-sll/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -75,7 +75,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/sll
+pkgincludedir = $(includedir)/libnetdude/protocols/sll
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_sll.la 
 libnd_sll_la_SOURCES = libnd_sll.c libnd_sll.h
 libnd_sll_la_LDFLAGS = -module -avoid-version
Index: protocols/snap/Makefile.in
--- protocols/snap/Makefile.in.orig	2006-01-15 00:47:19 +0100
+++ protocols/snap/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/snap
+pkgincludedir = $(includedir)/libnetdude/protocols/snap
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_snap.la 
 pkginclude_HEADERS = libnd_snap.h
 libnd_snap_la_SOURCES = libnd_snap.c libnd_snap.h
Index: protocols/tcp/Makefile.in
--- protocols/tcp/Makefile.in.orig	2006-01-15 00:47:21 +0100
+++ protocols/tcp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/tcp
+pkgincludedir = $(includedir)/libnetdude/protocols/tcp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_tcp.la 
 pkginclude_HEADERS = libnd_tcp.h libnd_tcb.h
 libnd_tcp_la_SOURCES = \
Index: protocols/udp/Makefile.in
--- protocols/udp/Makefile.in.orig	2006-01-15 00:47:23 +0100
+++ protocols/udp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/udp
+pkgincludedir = $(includedir)/libnetdude/protocols/udp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_udp.la 
 pkginclude_HEADERS = libnd_udp.h
 libnd_udp_la_SOURCES = libnd_udp.c libnd_udp.h
Index: src/Makefile.in
--- src/Makefile.in.orig	2006-01-15 00:47:27 +0100
+++ src/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -88,7 +88,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)
+pkgincludedir = $(includedir)/libnetdude
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
Index: src/libnd_prefs.c
--- src/libnd_prefs.c.orig	2006-01-15 00:44:05 +0100
+++ src/libnd_prefs.c	2006-03-10 13:00:23 +0100
@@@@ -130,8 +130,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-	     PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+	     PACKAGE_DATA_DIR);
 
   return dir;
 }
@@@@ -145,8 +145,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-	     libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+	     libnd_prefs_get_netdude_dir());
 
   return dir;
 }
@@@@ -160,8 +160,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-	     PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+	     PACKAGE_DATA_DIR);
 
   return dir;
 }
@@@@ -175,8 +175,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-	     libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+	     libnd_prefs_get_netdude_dir());
 
   return dir;
 }
@@@@ -515,8 +515,8 @@@@
 	    return FALSE;
 	}
 
-      g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-		 libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+      g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+		 libnd_prefs_get_netdude_dir());
 
       if (mkdir(dir, mode_755) < 0)
 	{
@@@@ -524,8 +524,8 @@@@
 	    return FALSE;
 	}
 
-      g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-		 libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+      g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+		 libnd_prefs_get_netdude_dir());
       
       if (mkdir(dir, mode_755) < 0)
 	{
Index: tools/Makefile.in
--- tools/Makefile.in.orig	2006-01-15 00:47:32 +0100
+++ tools/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -203,6 +203,7 @@@@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @@glib_cflags@@ @@pcapnav_cflags@@ -W -Wall ## -DMEMDEBUG
 lndtool_SOURCES = lndtool.c
 lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude
+lndtool_LDFLAGS = -static -export-dynamic -export-symbols-regex='.*'
 all: all-am
 
 .SUFFIXES:
Index: tools/lndtool.c.in
--- tools/lndtool.c.in.orig	2005-05-04 19:48:03 +0200
+++ tools/lndtool.c.in	2006-03-10 13:00:23 +0100
@@@@ -158,7 +158,7 @@@@
 
 	  if (strcmp("@@PACKAGE_INCLUDE_DIR@@", "/usr/include"))
 	    includes = "-I@@PACKAGE_INCLUDE_DIR@@ ";
-	  printf("%s-I@@prefix@@/include/libnetdude/@@version_major@@.@@version_minor@@ @@glib_cflags@@ @@pcapnav_cflags@@\n",
+	  printf("%s-I@@prefix@@/include/libnetdude @@glib_cflags@@ @@pcapnav_cflags@@\n",
 		 includes);
 	}
       else if (! strcmp(argv[i], "--libs"))
@@@@ -167,15 +167,15 @@@@
 	}
       else if (! strcmp(argv[i], "--include-dir"))
 	{
-	  printf("@@prefix@@/include/libnetdude/@@version_major@@.@@version_minor@@\n");
+	  printf("@@prefix@@/include/libnetdude\n");
 	}
       else if (! strcmp(argv[i], "--plugin-dir"))
 	{
-	  printf("@@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/plugins\n");
+	  printf("@@PACKAGE_DATA_DIR@@/plugins\n");
 	}
       else if (! strcmp(argv[i], "--proto-dir"))
 	{
-	  printf("@@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/protocols\n");
+	  printf("@@PACKAGE_DATA_DIR@@/protocols\n");
 	}
       else if (! strcmp(argv[i], "--plugins") ||
 	       ! strcmp(argv[i], "-p"))
@


1.5.2.1
log
@file libnetdude.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:59 +0000
@
text
@d1 357
@


1.5.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 357
Index: plugins/BPF-Filter/Makefile.in
--- plugins/BPF-Filter/Makefile.in.orig	2006-01-15 00:46:59 +0100
+++ plugins/BPF-Filter/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -210,7 +210,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 pkg_LTLIBRARIES = libnd_bpf.la
 pkginclude_HEADERS = libnd_bpf.h
 libnd_bpf_la_SOURCES = libnd_bpf.c
Index: plugins/ChecksumFix/Makefile.in
--- plugins/ChecksumFix/Makefile.in.orig	2006-01-15 00:47:01 +0100
+++ plugins/ChecksumFix/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -210,7 +210,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 pkg_LTLIBRARIES = libnd_cksumfix.la
 pkginclude_HEADERS = libnd_cksumfix.h
 libnd_cksumfix_la_SOURCES = libnd_cksumfix.c
Index: protocols/802.11/Makefile.in
--- protocols/802.11/Makefile.in.orig	2006-01-15 00:47:04 +0100
+++ protocols/802.11/Makefile.in	2006-03-10 13:03:15 +0100
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_802_11.la 
 libnd_802_11_la_SOURCES = libnd_802_11.c libnd_802_11.h
 libnd_802_11_la_LDFLAGS = -module -avoid-version
Index: protocols/arp/Makefile.in
--- protocols/arp/Makefile.in.orig	2006-01-15 00:47:07 +0100
+++ protocols/arp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -75,7 +75,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/arp
+pkgincludedir = $(includedir)/libnetdude/protocols/arp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_arp.la 
 libnd_arp_la_SOURCES = libnd_arp.c libnd_arp.h
 libnd_arp_la_LDFLAGS = -module -avoid-version
Index: protocols/ether/Makefile.in
--- protocols/ether/Makefile.in.orig	2006-01-15 00:47:09 +0100
+++ protocols/ether/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_ethernet.la 
 libnd_ethernet_la_SOURCES = libnd_ether.c libnd_ether.h
 libnd_ethernet_la_LDFLAGS = -module -avoid-version
Index: protocols/fddi/Makefile.in
--- protocols/fddi/Makefile.in.orig	2006-01-15 00:47:11 +0100
+++ protocols/fddi/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/fddi
+pkgincludedir = $(includedir)/libnetdude/protocols/fddi
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_fddi.la 
 pkginclude_HEADERS = libnd_fddi.h
 libnd_fddi_la_SOURCES = libnd_fddi.c libnd_fddi.h
Index: protocols/icmp/Makefile.in
--- protocols/icmp/Makefile.in.orig	2006-01-15 00:47:13 +0100
+++ protocols/icmp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/icmp
+pkgincludedir = $(includedir)/libnetdude/protocols/icmp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_icmp.la 
 pkginclude_HEADERS = libnd_icmp.h
 libnd_icmp_la_SOURCES = libnd_icmp.c libnd_icmp.h
Index: protocols/ip/Makefile.in
--- protocols/ip/Makefile.in.orig	2006-01-15 00:47:15 +0100
+++ protocols/ip/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/ip
+pkgincludedir = $(includedir)/libnetdude/protocols/ip
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_ip.la 
 pkginclude_HEADERS = libnd_ip.h
 libnd_ip_la_SOURCES = libnd_ip.c libnd_ip.h
Index: protocols/linux-sll/Makefile.in
--- protocols/linux-sll/Makefile.in.orig	2006-01-15 00:47:17 +0100
+++ protocols/linux-sll/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -75,7 +75,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/sll
+pkgincludedir = $(includedir)/libnetdude/protocols/sll
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -205,7 +205,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_sll.la 
 libnd_sll_la_SOURCES = libnd_sll.c libnd_sll.h
 libnd_sll_la_LDFLAGS = -module -avoid-version
Index: protocols/snap/Makefile.in
--- protocols/snap/Makefile.in.orig	2006-01-15 00:47:19 +0100
+++ protocols/snap/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/snap
+pkgincludedir = $(includedir)/libnetdude/protocols/snap
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_snap.la 
 pkginclude_HEADERS = libnd_snap.h
 libnd_snap_la_SOURCES = libnd_snap.c libnd_snap.h
Index: protocols/tcp/Makefile.in
--- protocols/tcp/Makefile.in.orig	2006-01-15 00:47:21 +0100
+++ protocols/tcp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/tcp
+pkgincludedir = $(includedir)/libnetdude/protocols/tcp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_tcp.la 
 pkginclude_HEADERS = libnd_tcp.h libnd_tcb.h
 libnd_tcp_la_SOURCES = \
Index: protocols/udp/Makefile.in
--- protocols/udp/Makefile.in.orig	2006-01-15 00:47:23 +0100
+++ protocols/udp/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -79,7 +79,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/udp
+pkgincludedir = $(includedir)/libnetdude/protocols/udp
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
@@@@ -209,7 +209,7 @@@@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols
+pkgdir = $(pkgdatadir)/protocols
 pkg_LTLIBRARIES = libnd_udp.la 
 pkginclude_HEADERS = libnd_udp.h
 libnd_udp_la_SOURCES = libnd_udp.c libnd_udp.h
Index: src/Makefile.in
--- src/Makefile.in.orig	2006-01-15 00:47:27 +0100
+++ src/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -88,7 +88,7 @@@@
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)
+pkgincludedir = $(includedir)/libnetdude
 ACLOCAL = @@ACLOCAL@@
 AMDEP_FALSE = @@AMDEP_FALSE@@
 AMDEP_TRUE = @@AMDEP_TRUE@@
Index: src/libnd_prefs.c
--- src/libnd_prefs.c.orig	2006-01-15 00:44:05 +0100
+++ src/libnd_prefs.c	2006-03-10 13:00:23 +0100
@@@@ -130,8 +130,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-	     PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+	     PACKAGE_DATA_DIR);
 
   return dir;
 }
@@@@ -145,8 +145,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-	     libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+	     libnd_prefs_get_netdude_dir());
 
   return dir;
 }
@@@@ -160,8 +160,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-	     PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+	     PACKAGE_DATA_DIR);
 
   return dir;
 }
@@@@ -175,8 +175,8 @@@@
   if (dir[0] != 0)
     return dir;
 
-  g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-	     libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+  g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+	     libnd_prefs_get_netdude_dir());
 
   return dir;
 }
@@@@ -515,8 +515,8 @@@@
 	    return FALSE;
 	}
 
-      g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins",
-		 libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+      g_snprintf(dir, MAXPATHLEN, "%s/plugins",
+		 libnd_prefs_get_netdude_dir());
 
       if (mkdir(dir, mode_755) < 0)
 	{
@@@@ -524,8 +524,8 @@@@
 	    return FALSE;
 	}
 
-      g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols",
-		 libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR);
+      g_snprintf(dir, MAXPATHLEN, "%s/protocols",
+		 libnd_prefs_get_netdude_dir());
       
       if (mkdir(dir, mode_755) < 0)
 	{
Index: tools/Makefile.in
--- tools/Makefile.in.orig	2006-01-15 00:47:32 +0100
+++ tools/Makefile.in	2006-03-10 13:00:23 +0100
@@@@ -203,6 +203,7 @@@@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @@glib_cflags@@ @@pcapnav_cflags@@ -W -Wall ## -DMEMDEBUG
 lndtool_SOURCES = lndtool.c
 lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude
+lndtool_LDFLAGS = -static -export-dynamic -export-symbols-regex='.*'
 all: all-am
 
 .SUFFIXES:
Index: tools/lndtool.c.in
--- tools/lndtool.c.in.orig	2005-05-04 19:48:03 +0200
+++ tools/lndtool.c.in	2006-03-10 13:00:23 +0100
@@@@ -158,7 +158,7 @@@@
 
 	  if (strcmp("@@PACKAGE_INCLUDE_DIR@@", "/usr/include"))
 	    includes = "-I@@PACKAGE_INCLUDE_DIR@@ ";
-	  printf("%s-I@@prefix@@/include/libnetdude/@@version_major@@.@@version_minor@@ @@glib_cflags@@ @@pcapnav_cflags@@\n",
+	  printf("%s-I@@prefix@@/include/libnetdude @@glib_cflags@@ @@pcapnav_cflags@@\n",
 		 includes);
 	}
       else if (! strcmp(argv[i], "--libs"))
@@@@ -167,15 +167,15 @@@@
 	}
       else if (! strcmp(argv[i], "--include-dir"))
 	{
-	  printf("@@prefix@@/include/libnetdude/@@version_major@@.@@version_minor@@\n");
+	  printf("@@prefix@@/include/libnetdude\n");
 	}
       else if (! strcmp(argv[i], "--plugin-dir"))
 	{
-	  printf("@@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/plugins\n");
+	  printf("@@PACKAGE_DATA_DIR@@/plugins\n");
 	}
       else if (! strcmp(argv[i], "--proto-dir"))
 	{
-	  printf("@@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/protocols\n");
+	  printf("@@PACKAGE_DATA_DIR@@/protocols\n");
 	}
       else if (! strcmp(argv[i], "--plugins") ||
 	       ! strcmp(argv[i], "-p"))
@


1.4
log
@upgrading package: libnetdude 0.6 -> 0.7
@
text
@d2 6
a7 6
--- plugins/BPF-Filter/Makefile.in.orig	2005-05-04 02:24:36 +0200
+++ plugins/BPF-Filter/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d10 6
a15 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -106,7 +106,7 @@@@
 LDFLAGS = -L$(top_srcdir)/src
a16 1
 
a18 1
 
d21 1
d23 6
a28 6
--- plugins/ChecksumFix/Makefile.in.orig	2005-05-04 02:24:36 +0200
+++ plugins/ChecksumFix/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d31 6
a36 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -106,7 +106,7 @@@@
 LDFLAGS = -L$(top_srcdir)/src
a37 1
 
a39 1
 
d42 13
d56 6
a61 6
--- protocols/arp/Makefile.in.orig	2005-05-04 02:24:36 +0200
+++ protocols/arp/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d64 6
a69 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a70 1
 
a72 1
 
d74 2
a75 1
 
d77 5
a81 4
--- protocols/ether/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/ether/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -102,7 +102,7 @@@@
 
a82 1
 
a84 1
 
d86 2
a87 1
 
d89 6
a94 6
--- protocols/fddi/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/fddi/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d97 6
a102 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a103 1
 
a105 1
 
d108 1
d110 6
a115 6
--- protocols/icmp/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/icmp/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d118 6
a123 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a124 1
 
a126 1
 
d129 1
d131 6
a136 6
--- protocols/ip/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/ip/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d139 6
a144 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a145 1
 
a147 1
 
d150 1
d152 6
a157 6
--- protocols/linux-sll/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/linux-sll/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d160 6
a165 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a166 1
 
a168 1
 
d170 2
a171 1
 
d173 6
a178 6
--- protocols/snap/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/snap/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d181 6
a186 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a187 1
 
a189 1
 
d191 2
a192 1
 
d194 6
a199 6
--- protocols/tcp/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/tcp/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d202 6
a207 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a208 1
 
a210 1
 
d212 2
a213 1
 
d215 6
a220 6
--- protocols/udp/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ protocols/udp/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
d223 6
a228 5
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -102,7 +102,7 @@@@
 
a229 1
 
a231 1
 
d234 1
d236 6
a241 6
--- src/Makefile.in.orig	2005-05-04 02:24:37 +0200
+++ src/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -65,7 +65,7 @@@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
 
d244 3
a246 3
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
d248 2
a249 2
--- src/libnd_prefs.c.orig	2004-05-11 00:51:37 +0200
+++ src/libnd_prefs.c	2005-05-06 09:09:20 +0200
d294 1
a294 1
@@@@ -492,8 +492,8 @@@@
d305 1
a305 1
@@@@ -501,8 +501,8 @@@@
d317 6
a322 7
--- tools/Makefile.in.orig	2005-05-04 02:24:38 +0200
+++ tools/Makefile.in	2005-05-06 09:09:20 +0200
@@@@ -116,7 +116,7 @@@@
 am_lndtool_OBJECTS = lndtool.$(OBJEXT)
 lndtool_OBJECTS = $(am_lndtool_OBJECTS)
 lndtool_DEPENDENCIES =
-lndtool_LDFLAGS =
d324 1
d326 1
a326 2
 DEFS = @@DEFS@@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
d328 2
a329 2
--- tools/lndtool.c.in.orig	2005-03-26 16:37:35 +0100
+++ tools/lndtool.c.in	2005-05-06 09:09:20 +0200
@


1.3
log
@fix building under gcc 3.4
@
text
@d1 5
a5 4
Index: src/Makefile.in
--- src/Makefile.in.orig	2003-09-19 21:51:15.000000000 +0200
+++ src/Makefile.in	2003-09-20 21:03:46.000000000 +0200
@@@@ -65,7 +65,7 @@@@
d8 8
d17 14
a30 2
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)
+pkgincludedir = $(includedir)/libnetdude
d34 9
d44 2
a45 2
--- protocols/arp/Makefile.in.orig	2003-09-19 21:51:18.000000000 +0200
+++ protocols/arp/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d55 1
a55 1
@@@@ -100,7 +100,7 @@@@
d65 2
a66 2
--- protocols/ether/Makefile.in.orig	2003-09-19 21:51:20.000000000 +0200
+++ protocols/ether/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d77 2
a78 2
--- protocols/fddi/Makefile.in.orig	2003-09-19 21:51:22.000000000 +0200
+++ protocols/fddi/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d88 1
a88 1
@@@@ -100,7 +100,7 @@@@
d98 2
a99 2
--- protocols/icmp/Makefile.in.orig	2003-09-19 21:51:23.000000000 +0200
+++ protocols/icmp/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d109 1
a109 1
@@@@ -100,7 +100,7 @@@@
d119 2
a120 2
--- protocols/ip/Makefile.in.orig	2003-09-19 21:51:25.000000000 +0200
+++ protocols/ip/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d130 1
a130 1
@@@@ -100,7 +100,7 @@@@
d140 2
a141 2
--- protocols/linux-sll/Makefile.in.orig	2003-09-19 21:51:26.000000000 +0200
+++ protocols/linux-sll/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d151 1
a151 1
@@@@ -100,7 +100,7 @@@@
d161 2
a162 2
--- protocols/snap/Makefile.in.orig	2003-09-19 21:51:28.000000000 +0200
+++ protocols/snap/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d172 1
a172 1
@@@@ -100,7 +100,7 @@@@
d182 2
a183 2
--- protocols/tcp/Makefile.in.orig	2003-09-19 21:51:30.000000000 +0200
+++ protocols/tcp/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d193 1
a193 1
@@@@ -100,7 +100,7 @@@@
d203 2
a204 2
--- protocols/udp/Makefile.in.orig	2003-09-19 21:51:31.000000000 +0200
+++ protocols/udp/Makefile.in	2003-09-20 21:03:46.000000000 +0200
d214 1
a214 1
@@@@ -100,7 +100,7 @@@@
d223 4
a226 5
Index: plugins/ChecksumFix/Makefile.in
--- plugins/ChecksumFix/Makefile.in.orig	2003-09-19 21:51:35.000000000 +0200
+++ plugins/ChecksumFix/Makefile.in	2003-09-20 21:03:46.000000000 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
a228 8
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
 AMTAR = @@AMTAR@@
 AS = @@AS@@
 AWK = @@AWK@@
@@@@ -104,7 +104,7 @@@@
 LDFLAGS = -L$(top_srcdir)/src
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
d230 2
a231 14
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 
 pkg_LTLIBRARIES = libnd_cksumfix.la
 pkginclude_HEADERS = libnd_cksumfix.h
Index: plugins/BPF-Filter/Makefile.in
--- plugins/BPF-Filter/Makefile.in.orig	2003-09-19 21:51:36.000000000 +0200
+++ plugins/BPF-Filter/Makefile.in	2003-09-20 21:03:46.000000000 +0200
@@@@ -64,7 +64,7 @@@@
 EXEEXT = @@EXEEXT@@
 OBJEXT = @@OBJEXT@@
 PATH_SEPARATOR = @@PATH_SEPARATOR@@
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
+pkgincludedir = $(includedir)/libnetdude/plugins/
a234 40
@@@@ -104,7 +104,7 @@@@
 LDFLAGS = -L$(top_srcdir)/src
 INCLUDES = @@glib_cflags@@ @@pcapnav_cflags@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins
+pkgdir = $(pkgdatadir)/plugins
 
 pkg_LTLIBRARIES = libnd_bpf.la
 pkginclude_HEADERS = libnd_bpf.h
Index: tools/lndtool.c.in
--- tools/lndtool.c.in.orig	2004-02-02 16:13:55.000000000 +0100
+++ tools/lndtool.c.in	2004-02-10 17:35:08.000000000 +0100
@@@@ -125,7 +125,7 @@@@
 
 	  if (strcmp("@@PACKAGE_INCLUDE_DIR@@", "/usr/include"))
 	    includes = "-I@@PACKAGE_INCLUDE_DIR@@ ";
-	  printf("%s-I@@prefix@@/include/libnetdude/@@version_major@@.@@version_minor@@ @@glib_cflags@@ @@pcapnav_cflags@@\n",
+	  printf("%s-I@@prefix@@/include/libnetdude @@glib_cflags@@ @@pcapnav_cflags@@\n",
 		 includes);
 	}
       else if (! strcmp(argv[i], "--libs"))
@@@@ -134,15 +134,15 @@@@
 	}
       else if (! strcmp(argv[i], "--include-dir"))
 	{
-	  printf("@@prefix@@/include/libnetdude/@@version_major@@.@@version_minor@@\n");
+	  printf("@@prefix@@/include/libnetdude\n");
 	}
       else if (! strcmp(argv[i], "--plugin-dir"))
 	{
-	  printf("@@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/plugins\n");
+	  printf("@@PACKAGE_DATA_DIR@@/plugins\n");
 	}
       else if (! strcmp(argv[i], "--proto-dir"))
 	{
-	  printf("@@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/protocols\n");
+	  printf("@@PACKAGE_DATA_DIR@@/protocols\n");
 	}
       else if (! strcmp(argv[i], "--plugins"))
 	{
d236 3
a238 3
--- src/libnd_prefs.c.orig	2003-11-05 17:21:47.000000000 +0100
+++ src/libnd_prefs.c	2004-02-10 17:41:13.000000000 +0100
@@@@ -129,8 +129,8 @@@@
d249 1
a249 1
@@@@ -144,8 +144,8 @@@@
d260 1
a260 1
@@@@ -159,8 +159,8 @@@@
d271 1
a271 1
@@@@ -174,8 +174,8 @@@@
d282 1
a282 1
@@@@ -491,8 +491,8 @@@@
d293 1
a293 1
@@@@ -500,8 +500,8 @@@@
d305 2
a306 2
--- tools/Makefile.in.orig	2003-12-14 18:01:00.000000000 +0100
+++ tools/Makefile.in	2004-02-10 17:34:39.000000000 +0100
d316 4
a319 10
Index: protocols/icmp/libnd_icmp.c
--- protocols/icmp/libnd_icmp.c.orig	2004-04-19 00:30:23 +0200
+++ protocols/icmp/libnd_icmp.c	2004-10-06 21:45:47 +0200
@@@@ -266,7 +266,7 @@@@
 	return ((guchar *) icmphdr + 8 + icmphdr_adv->icmp_hun.ih_rtradv.irt_num_addrs * 8 <= libnd_packet_get_end(packet));
       }
 
-    default:
+    default: break;
     }
d321 26
a346 1
   return FALSE;
@


1.2
log
@upgrading package: libnetdude 0.4 -> 0.5
@
text
@d347 12
@


1.1
log
@new package: libnetdude 0.1 (NetDude Library)
@
text
@d235 112
a346 25
Index: libnetdude-config.in
--- libnetdude-config.in.orig	2003-09-17 15:22:19.000000000 +0200
+++ libnetdude-config.in	2003-09-20 21:04:22.000000000 +0200
@@@@ -35,7 +35,7 @@@@
       if test @@includedir@@ != /usr/include ; then
         includes=-I@@includedir@@
       fi
-      echo $includes -I$prefix/include/libnetdude/@@version_major@@.@@version_minor@@ @@glib_cflags@@ @@pcapnav_cflags@@
+      echo $includes -I$prefix/include/libnetdude @@glib_cflags@@ @@pcapnav_cflags@@
 
       ;;
     --libs)
@@@@ -43,10 +43,10 @@@@
       echo $libdirs @@glib_libs@@ @@pcapnav_libs@@ -lnetdude
       ;;
     --plugin-dir)
-      echo @@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/plugins
+      echo @@PACKAGE_DATA_DIR@@/plugins
       ;;
     --proto-dir)
-      echo @@PACKAGE_DATA_DIR@@/@@version_major@@.@@version_minor@@/protocols
+      echo @@PACKAGE_DATA_DIR@@/protocols
       ;;
     *)
       echo "${usage}" 1>&2
@