head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4.2.2 OPENPKG_E1_FP:1.4.2.2 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4.2.2 OPENPKG_2_STABLE:1.4.0.2 OPENPKG_CW_FP:1.3; locks; strict; comment @# @; 1.4 date 2005.05.06.07.28.12; author rse; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2004.02.10.17.11.13; author rse; state Exp; branches; next 1.2; 1.2 date 2003.09.21.10.18.08; author rse; state Exp; branches; next 1.1; 1.1 date 2003.09.20.19.30.18; author rse; state Exp; branches; next ; 1.4.2.1 date 2005.05.06.07.28.12; author rse; state dead; branches; next 1.4.2.2; commitid iZxwRSmmWscPXUQr; 1.4.2.2 date 2006.10.16.14.53.20; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.4 log @upgrading package: netdude 0.4.5 -> 0.4.6 @ text @Index: libltdl/ltdl.c --- libltdl/ltdl.c.orig 2005-05-04 03:31:31 +0200 +++ libltdl/ltdl.c 2005-05-06 09:26:00 +0200 @@@@ -53,10 +53,6 @@@@ # include #endif -#if HAVE_MALLOC_H -# include -#endif - #if HAVE_MEMORY_H # include #endif Index: pixmaps/Makefile.in --- pixmaps/Makefile.in.orig 2005-05-04 03:31:34 +0200 +++ pixmaps/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -95,7 +95,7 @@@@ version_major = @@version_major@@ version_minor = @@version_minor@@ -pixmapsdir = $(pkgdatadir)/$(version_major)/pixmaps +pixmapsdir = $(pkgdatadir)/pixmaps pixmaps_DATA = \ incomplete.xpm \ Index: plugins/BPF-Filter/Makefile.in --- plugins/BPF-Filter/Makefile.in.orig 2005-05-04 03:31:34 +0200 +++ plugins/BPF-Filter/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -102,7 +102,7 @@@@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @@gtk_cflags@@ @@LIBNETDUDE_CFLAGS@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkgdatadir)/plugins pkg_LTLIBRARIES = nd_bpf.la Index: plugins/ChecksumFix/Makefile.in --- plugins/ChecksumFix/Makefile.in.orig 2005-05-04 03:31:34 +0200 +++ plugins/ChecksumFix/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -102,7 +102,7 @@@@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @@gtk_cflags@@ @@LIBNETDUDE_CFLAGS@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkgdatadir)/plugins pkg_LTLIBRARIES = nd_cksumfix.la Index: protocols/arp/Makefile.in --- protocols/arp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/arp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/arp +pkgincludedir = $(includedir)/netdude/protocols/arp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_arp.la Index: protocols/ether/Makefile.in --- protocols/ether/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/ether/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ether +pkgincludedir = $(includedir)/netdude/protocols/ether AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_ethernet.la Index: protocols/fddi/Makefile.in --- protocols/fddi/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/fddi/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/fddi +pkgincludedir = $(includedir)/netdude/protocols/fddi AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_fddi.la Index: protocols/icmp/Makefile.in --- protocols/icmp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/icmp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/icmp +pkgincludedir = $(includedir)/netdude/protocols/icmp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_icmp.la Index: protocols/ip/Makefile.in --- protocols/ip/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/ip/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ip +pkgincludedir = $(includedir)/netdude/protocols/ip AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_ip.la Index: protocols/linux-sll/Makefile.in --- protocols/linux-sll/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/linux-sll/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/linux-sll +pkgincludedir = $(includedir)/netdude/protocols/linux-sll AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_sll.la Index: protocols/snap/Makefile.in --- protocols/snap/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/snap/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/snap +pkgincludedir = $(includedir)/netdude/protocols/snap AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_snap.la Index: protocols/tcp/Makefile.in --- protocols/tcp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/tcp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/tcp +pkgincludedir = $(includedir)/netdude/protocols/tcp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_tcp.la Index: protocols/udp/Makefile.in --- protocols/udp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/udp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/udp +pkgincludedir = $(includedir)/netdude/protocols/udp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_udp.la Index: src/Makefile.in --- src/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ src/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -65,7 +65,7 @@@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major) +pkgincludedir = $(includedir)/netdude AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ Index: src/nd_gui.c --- src/nd_gui.c.orig 2005-05-04 00:03:12 +0200 +++ src/nd_gui.c 2005-05-06 09:26:00 +0200 @@@@ -116,7 +116,7 @@@@ gtk_widget_realize(win); incomplete_pmap = gdk_pixmap_create_from_xpm(win->window, &incomplete_mask, &gs->bg[GTK_STATE_NORMAL], - PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps/incomplete.xpm"); + PACKAGE_DATA_DIR "/pixmaps/incomplete.xpm"); /* Init red and yellow: */ for (i = 0; i < 5; i++) Index: src/nd_main.c --- src/nd_main.c.orig 2004-05-11 01:39:18 +0200 +++ src/nd_main.c 2005-05-06 09:26:00 +0200 @@@@ -154,14 +154,14 @@@@ } else if (!strcmp(argv[i], "--include-dir")) { - printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR); + printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude"); exit(0); } else if (!strcmp(argv[i], "--cflags")) { printf("%s %s -I%s\n", LIBNETDUDE_CFLAGS, GTK_CFLAGS, - PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR); + PACKAGE_INCLUDE_DIR"/netdude"); exit(0); } else if (!strcmp(argv[i], "--proto-dir")) @@@@ -486,7 +486,7 @@@@ gtk_set_locale (); gtk_init (&argc, &argv); - add_pixmap_directory (PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps"); + add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps"); add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); /* @ 1.4.2.1 log @file netdude.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:20 +0000 @ text @d1 292 @ 1.4.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 292 Index: libltdl/ltdl.c --- libltdl/ltdl.c.orig 2005-05-04 03:31:31 +0200 +++ libltdl/ltdl.c 2005-05-06 09:26:00 +0200 @@@@ -53,10 +53,6 @@@@ # include #endif -#if HAVE_MALLOC_H -# include -#endif - #if HAVE_MEMORY_H # include #endif Index: pixmaps/Makefile.in --- pixmaps/Makefile.in.orig 2005-05-04 03:31:34 +0200 +++ pixmaps/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -95,7 +95,7 @@@@ version_major = @@version_major@@ version_minor = @@version_minor@@ -pixmapsdir = $(pkgdatadir)/$(version_major)/pixmaps +pixmapsdir = $(pkgdatadir)/pixmaps pixmaps_DATA = \ incomplete.xpm \ Index: plugins/BPF-Filter/Makefile.in --- plugins/BPF-Filter/Makefile.in.orig 2005-05-04 03:31:34 +0200 +++ plugins/BPF-Filter/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -102,7 +102,7 @@@@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @@gtk_cflags@@ @@LIBNETDUDE_CFLAGS@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkgdatadir)/plugins pkg_LTLIBRARIES = nd_bpf.la Index: plugins/ChecksumFix/Makefile.in --- plugins/ChecksumFix/Makefile.in.orig 2005-05-04 03:31:34 +0200 +++ plugins/ChecksumFix/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -102,7 +102,7 @@@@ AM_LDFLAGS = -L$(top_srcdir)/src INCLUDES = @@gtk_cflags@@ @@LIBNETDUDE_CFLAGS@@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkgdatadir)/plugins pkg_LTLIBRARIES = nd_cksumfix.la Index: protocols/arp/Makefile.in --- protocols/arp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/arp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/arp +pkgincludedir = $(includedir)/netdude/protocols/arp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_arp.la Index: protocols/ether/Makefile.in --- protocols/ether/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/ether/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ether +pkgincludedir = $(includedir)/netdude/protocols/ether AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_ethernet.la Index: protocols/fddi/Makefile.in --- protocols/fddi/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/fddi/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/fddi +pkgincludedir = $(includedir)/netdude/protocols/fddi AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_fddi.la Index: protocols/icmp/Makefile.in --- protocols/icmp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/icmp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/icmp +pkgincludedir = $(includedir)/netdude/protocols/icmp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_icmp.la Index: protocols/ip/Makefile.in --- protocols/ip/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/ip/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ip +pkgincludedir = $(includedir)/netdude/protocols/ip AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_ip.la Index: protocols/linux-sll/Makefile.in --- protocols/linux-sll/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/linux-sll/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/linux-sll +pkgincludedir = $(includedir)/netdude/protocols/linux-sll AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_sll.la Index: protocols/snap/Makefile.in --- protocols/snap/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/snap/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/snap +pkgincludedir = $(includedir)/netdude/protocols/snap AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_snap.la Index: protocols/tcp/Makefile.in --- protocols/tcp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/tcp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/tcp +pkgincludedir = $(includedir)/netdude/protocols/tcp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_tcp.la Index: protocols/udp/Makefile.in --- protocols/udp/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ protocols/udp/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -64,7 +64,7 @@@@ EXEEXT = @@EXEEXT@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/udp +pkgincludedir = $(includedir)/netdude/protocols/udp AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -103,7 +103,7 @@@@ -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/protocols +pkgdir = $(pkgdatadir)/protocols pkg_LTLIBRARIES = nd_udp.la Index: src/Makefile.in --- src/Makefile.in.orig 2005-05-04 03:31:35 +0200 +++ src/Makefile.in 2005-05-06 09:26:00 +0200 @@@@ -65,7 +65,7 @@@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ -pkgincludedir = $(includedir)/netdude/$(version_major) +pkgincludedir = $(includedir)/netdude AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ Index: src/nd_gui.c --- src/nd_gui.c.orig 2005-05-04 00:03:12 +0200 +++ src/nd_gui.c 2005-05-06 09:26:00 +0200 @@@@ -116,7 +116,7 @@@@ gtk_widget_realize(win); incomplete_pmap = gdk_pixmap_create_from_xpm(win->window, &incomplete_mask, &gs->bg[GTK_STATE_NORMAL], - PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps/incomplete.xpm"); + PACKAGE_DATA_DIR "/pixmaps/incomplete.xpm"); /* Init red and yellow: */ for (i = 0; i < 5; i++) Index: src/nd_main.c --- src/nd_main.c.orig 2004-05-11 01:39:18 +0200 +++ src/nd_main.c 2005-05-06 09:26:00 +0200 @@@@ -154,14 +154,14 @@@@ } else if (!strcmp(argv[i], "--include-dir")) { - printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR); + printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude"); exit(0); } else if (!strcmp(argv[i], "--cflags")) { printf("%s %s -I%s\n", LIBNETDUDE_CFLAGS, GTK_CFLAGS, - PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR); + PACKAGE_INCLUDE_DIR"/netdude"); exit(0); } else if (!strcmp(argv[i], "--proto-dir")) @@@@ -486,7 +486,7 @@@@ gtk_set_locale (); gtk_init (&argc, &argv); - add_pixmap_directory (PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps"); + add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps"); add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); /* @ 1.3 log @upgrading package: netdude 0.4.3 -> 0.4.4 @ text @d2 2 a3 2 --- libltdl/ltdl.c.orig 2003-09-18 16:36:14.000000000 +0200 +++ libltdl/ltdl.c 2003-09-21 12:15:24.000000000 +0200 d15 6 a20 6 Index: src/Makefile.in --- src/Makefile.in.orig 2003-09-19 23:24:07.000000000 +0200 +++ src/Makefile.in 2003-09-21 12:15:24.000000000 +0200 @@@@ -65,7 +65,7 @@@@ OBJEXT = @@OBJEXT@@ PATH_SEPARATOR = @@PATH_SEPARATOR@@ d22 2 a23 7 -pkgincludedir = $(includedir)/netdude/$(version_major) +pkgincludedir = $(includedir)/netdude AMTAR = @@AMTAR@@ AS = @@AS@@ AWK = @@AWK@@ @@@@ -539,7 +539,7 @@@@ done d25 8 a32 3 install-exec-local: - if test ! -f "$(bindir)/netdude"; then $(LN_S) netdude$(version_major) $(bindir)/netdude; fi + if test ! -f "$(DESTDIR)$(bindir)/netdude"; then $(LN_S) netdude$(version_major) $(DESTDIR)$(bindir)/netdude; fi d34 2 a35 11 uninstall-local: if test -L "$(bindir)/netdude"; then rm -f $(bindir)/netdude; fi Index: src/nd_gui.c --- src/nd_gui.c.orig 2003-09-18 16:36:09.000000000 +0200 +++ src/nd_gui.c 2003-09-21 12:16:40.000000000 +0200 @@@@ -109,7 +109,7 @@@@ gtk_widget_realize(win); incomplete_pmap = gdk_pixmap_create_from_xpm(win->window, &incomplete_mask, &gs->bg[GTK_STATE_NORMAL], - PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps/incomplete.xpm"); + PACKAGE_DATA_DIR "/pixmaps/incomplete.xpm"); d37 1 a37 25 /* Init red and yellow: */ for (i = 0; i < 5; i++) Index: src/nd_main.c --- src/nd_main.c.orig 2003-09-19 18:00:50.000000000 +0200 +++ src/nd_main.c 2003-09-21 12:17:07.000000000 +0200 @@@@ -145,14 +145,14 @@@@ } else if (!strcmp(argv[i], "--include-dir")) { - printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR); + printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude"); exit(0); } else if (!strcmp(argv[i], "--cflags")) { printf("%s %s -I%s\n", LIBNETDUDE_CFLAGS, GTK_CFLAGS, - PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR); + PACKAGE_INCLUDE_DIR"/netdude"); exit(0); } else if (!strcmp(argv[i], "--proto-dir")) @@@@ -400,7 +400,7 @@@@ gtk_set_locale (); gtk_init (&argc, &argv); a38 5 - add_pixmap_directory (PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps"); + add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps"); add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps"); /* d40 5 a44 5 --- plugins/ChecksumFix/Makefile.in.orig 2003-09-19 23:24:57.000000000 +0200 +++ plugins/ChecksumFix/Makefile.in 2003-09-21 12:15:24.000000000 +0200 @@@@ -127,7 +127,7 @@@@ LDFLAGS = -L$(top_srcdir)/src INCLUDES = @@gtk_cflags@@ @@LIBNETDUDE_CFLAGS@@ -I$(top_srcdir) $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall a50 12 Index: plugins/BPF-Filter/Makefile.in --- plugins/BPF-Filter/Makefile.in.orig 2003-09-19 23:25:08.000000000 +0200 +++ plugins/BPF-Filter/Makefile.in 2003-09-21 12:15:24.000000000 +0200 @@@@ -127,7 +127,7 @@@@ LDFLAGS = -L$(top_srcdir)/src INCLUDES = @@gtk_cflags@@ @@LIBNETDUDE_CFLAGS@@ -I$(top_srcdir) $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall -pkgdir = $(pkgdatadir)/$(version_major)/plugins +pkgdir = $(pkgdatadir)/plugins pkg_LTLIBRARIES = nd_bpf.la d52 2 a53 2 --- protocols/arp/Makefile.in.orig 2003-09-19 23:25:30.000000000 +0200 +++ protocols/arp/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d63 2 a64 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d73 2 a74 2 --- protocols/ether/Makefile.in.orig 2003-09-19 23:25:36.000000000 +0200 +++ protocols/ether/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d84 2 a85 2 @@@@ -128,7 +128,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d94 2 a95 2 --- protocols/fddi/Makefile.in.orig 2003-09-19 23:25:42.000000000 +0200 +++ protocols/fddi/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d105 2 a106 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d115 2 a116 2 --- protocols/icmp/Makefile.in.orig 2003-09-19 23:25:47.000000000 +0200 +++ protocols/icmp/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d126 2 a127 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d136 2 a137 2 --- protocols/ip/Makefile.in.orig 2003-09-19 23:25:54.000000000 +0200 +++ protocols/ip/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d147 2 a148 2 @@@@ -128,7 +128,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d157 2 a158 2 --- protocols/linux-sll/Makefile.in.orig 2003-09-19 23:26:07.000000000 +0200 +++ protocols/linux-sll/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d168 2 a169 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d178 2 a179 2 --- protocols/snap/Makefile.in.orig 2003-09-19 23:26:12.000000000 +0200 +++ protocols/snap/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d189 2 a190 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d199 2 a200 2 --- protocols/tcp/Makefile.in.orig 2003-09-19 23:26:18.000000000 +0200 +++ protocols/tcp/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d210 2 a211 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d220 2 a221 2 --- protocols/udp/Makefile.in.orig 2003-09-19 23:26:29.000000000 +0200 +++ protocols/udp/Makefile.in 2003-09-21 12:15:24.000000000 +0200 d231 2 a232 2 @@@@ -126,7 +126,7 @@@@ $(intl_includes) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall d240 21 a260 6 Index: pixmaps/Makefile.in --- pixmaps/Makefile.in.orig 2003-09-19 23:26:35.000000000 +0200 +++ pixmaps/Makefile.in 2003-09-21 12:15:24.000000000 +0200 @@@@ -115,7 +115,7 @@@@ version_major = @@version_major@@ version_minor = @@version_minor@@ d262 25 a286 2 -pixmapsdir = $(pkgdatadir)/$(version_major)/pixmaps +pixmapsdir = $(pkgdatadir)/pixmaps d288 3 a290 8 pixmaps_DATA = \ incomplete.xpm \ Index: protocols/fddi/nd_fddi.c --- protocols/fddi/nd_fddi.c.orig 2004-02-02 18:59:24.000000000 +0100 +++ protocols/fddi/nd_fddi.c 2004-02-10 18:07:14.000000000 +0100 @@@@ -31,8 +31,6 @@@@ #include #include d292 1 a292 5 -#include - static ND_ProtoField fddi_fields[] = { { ND_VAL_FIELD, N_("Frame\nCtrl.\n(0x%.2x)"), N_("Frame Control"), 8, nd_fddi_fc_cb }, { ND_VAL_FIELD, N_("Dst. addr.\n(%s)\n"), N_("Destination host"), 48, nd_fddi_dhost_cb }, @ 1.2 log @adjust more paths @ text @d302 12 @ 1.1 log @new package: netdude 0.4.0 (NETwork DUmp data Displayer and Editor) @ text @d3 1 a3 1 +++ libltdl/ltdl.c 2003-09-20 21:25:40.000000000 +0200 d17 1 a17 1 +++ src/Makefile.in 2003-09-20 21:27:27.000000000 +0200 d36 41 d79 1 a79 1 +++ plugins/ChecksumFix/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d91 1 a91 1 +++ plugins/BPF-Filter/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d103 1 a103 1 +++ protocols/arp/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d124 1 a124 1 +++ protocols/ether/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d145 1 a145 1 +++ protocols/fddi/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d166 1 a166 1 +++ protocols/icmp/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d187 1 a187 1 +++ protocols/ip/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d208 1 a208 1 +++ protocols/linux-sll/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d229 1 a229 1 +++ protocols/snap/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d250 1 a250 1 +++ protocols/tcp/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d271 1 a271 1 +++ protocols/udp/Makefile.in 2003-09-20 21:25:40.000000000 +0200 d292 1 a292 1 +++ pixmaps/Makefile.in 2003-09-20 21:27:06.000000000 +0200 @