19 files changed, 182 insertions, 48 deletions
diff --git a/debian/README.debian b/debian/README.debian
index f698b00722..30ded89a6d 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -1,6 +1,11 @@
-Ethereal for DEBIAN
+Ethereal for Debian
 -------------------
 
-This software is beta but really usable.
+Q. Why isn't ethereal linked against libssl ?
+A. Because it can't be linked against libssl.
+   See http://www.openssl.org/support/faq.html#LEGAL2
+ 
+Q. Why isn't ethereal linked against libsnmp ?
+A. Because it would also need to be linked against libssl
 
-Frederic Peters <fpeters@debian.org>, Mon,  3 Aug 1998 13:13:03 +0200
+Frederic Peters <fpeters@debian.org>, Tue, 21 May 2002 08:37:52 +0200
diff --git a/debian/control b/debian/control
index f7e0e57c49..3af455b359 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,56 @@ Source: ethereal
 Section: net
 Priority: optional
 Maintainer: Frederic Peters <fpeters@debian.org>
-Standards-Version: 3.1.0
-Build-Depends: libgtk1.2-dev, libpcap-dev, libsnmp4.1-dev, flex, libz-dev, debhelper
+Standards-Version: 3.5.6
+Build-Depends: libgtk1.2-dev, libgtk2.0-dev, libpcap-dev, flex, libz-dev, debhelper, libtool, python, automake, autoconf
 
-Package: ethereal
+Package: ethereal-common
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: ethereal (>= 0.9.1-3) | tethereal (>= 0.9.1-3)
+Conflicts: ethereal (<< 0.9.1-3), tethereal (<< 0.9.1-3)
+Description: Network traffic analyser (common files)
+ Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Unix-like operating systems. A sniffer is a tool used to capture
+ packets off the wire. Ethereal decodes numerous protocols (too many
+ to list).
+ .
+ This package provides files common to both ethereal (the GTK+ version)
+ and tethereal (the console version).
+
+Package: ethereal
+Architecture: any
+Depends: ${shlibs:Depends}, ethereal-common
 Description: Network traffic analyzer
  Ethereal is a network traffic analyzer, or "sniffer", for Unix and
- Unix-like operating systems.  It uses GTK+, a graphical user interface
- library, and libpcap, a packet capture and filtering library.
+ Unix-like operating systems. A sniffer is a tool used to capture
+ packets off the wire. Ethereal decodes numerous protocols (too many
+ to list).
+ .
+ This package provides ethereal (the GTK+ version)
+
+Package: tethereal
+Architecture: any
+Depends: ${shlibs:Depends}, ethereal-common
+Description: Network traffic analyzer (console)
+ Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Unix-like operating systems. A sniffer is a tool used to capture
+ packets off the wire. Ethereal decodes numerous protocols (too many
+ to list).
+ .
+ This package provides the console version of ethereal, named
+ "tethereal".
+
+Package: ethereal-dev
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ethereal-common, omniidl-python, libpcap-dev, libtool, python (>= 2.2), python (<< 2.3)
+Description: Network traffic analyser (development tools)
+ Ethereal is a network traffic analyzer, or "sniffer", for Unix and
+ Unix-like operating systems. A sniffer is a tool used to capture
+ packets off the wire. Ethereal decodes numerous protocols (too many
+ to list).
+ .
+ This package provides idl2eth and other necessary files to develop
+ new packet dissectors.
 
diff --git a/debian/copyright b/debian/copyright
index 7077d114b2..d412409e40 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,12 @@ Sun, 13 Sep 1998 23:05:47 +0200
 
 It was downloaded from http://www.ethereal.com/distribution/
 
+Upstream Authors:
+  Gerald Combs <gerald@ethereal.com>
+  (as well as many contributors)
+
 Copyright:
 
 GPL, as evidenced by existence of GPL license file "COPYING".
-(the GNU GPL may be viewed on Debian systems in /usr/share/common-licences/GPL)
+(the GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL)
 
diff --git a/debian/ethereal-common.files b/debian/ethereal-common.files
new file mode 100644
index 0000000000..9116326f52
--- /dev/null
+++ b/debian/ethereal-common.files
@@ -0,0 +1,5 @@
+/usr/bin/editcap
+/usr/bin/mergecap
+/usr/bin/text2pcap
+/usr/lib/ethereal/*
+/usr/share/ethereal/*
diff --git a/debian/ethereal-common.manpages b/debian/ethereal-common.manpages
new file mode 100644
index 0000000000..d00e3af44d
--- /dev/null
+++ b/debian/ethereal-common.manpages
@@ -0,0 +1,3 @@
+editcap.1
+mergecap.1
+text2pcap.1
diff --git a/debian/ethereal-dev.docs b/debian/ethereal-dev.docs
new file mode 100644
index 0000000000..ce52791e18
--- /dev/null
+++ b/debian/ethereal-dev.docs
@@ -0,0 +1,5 @@
+doc/README.design
+doc/README.developer
+doc/README.idl2eth
+doc/README.plugins
+
diff --git a/debian/ethereal-dev.files b/debian/ethereal-dev.files
new file mode 100644
index 0000000000..649812003d
--- /dev/null
+++ b/debian/ethereal-dev.files
@@ -0,0 +1,5 @@
+/usr/bin/idl2eth
+/usr/lib/python2.2/*
+/usr/include/ethereal/*
+/usr/lib/libwiretap.a
+
diff --git a/debian/ethereal-dev.header-files b/debian/ethereal-dev.header-files
new file mode 100644
index 0000000000..3d39ffd33f
--- /dev/null
+++ b/debian/ethereal-dev.header-files
@@ -0,0 +1,29 @@
+plugins/plugin_api.h
+plugins/plugin_api_defs.h
+plugins/plugin_table.h
+epan/packet.h
+epan/proto.h
+epan/tvbuff.h
+epan/pint.h
+epan/to_str.h
+epan/column_info.h
+epan/epan.h
+epan/frame_data.h
+epan/dfilter/dfilter.h
+epan/dfilter/drange.h
+epan/conversation.h
+epan/column-utils.h
+epan/packet_info.h
+epan/value_string.h
+epan/ftypes/ftypes.h
+epan/nstime.h
+epan/ipv4.h
+epan/exceptions.h
+epan/except.h
+packet-giop.h
+prefs.h
+color.h
+wiretap/wtap.h
+packet-tcp.h
+packet-tpkt.h
+
diff --git a/debian/ethereal-dev.manpages b/debian/ethereal-dev.manpages
new file mode 100644
index 0000000000..5153c644f7
--- /dev/null
+++ b/debian/ethereal-dev.manpages
@@ -0,0 +1,2 @@
+idl2eth.1
+
diff --git a/debian/ethereal-dev.postinst b/debian/ethereal-dev.postinst
new file mode 100644
index 0000000000..ec629da3f9
--- /dev/null
+++ b/debian/ethereal-dev.postinst
@@ -0,0 +1,19 @@
+#! /bin/sh -e
+
+PYTHON=python2.2
+
+case "$1" in
+	configure|abort-upgrade|abort-remove|abort-deconfigure)
+		/usr/bin/$PYTHON -O /usr/lib/$PYTHON/compileall.py -q \
+			/usr/lib/$PYTHON/site-packages/
+	;;
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/ethereal-dev.prerm b/debian/ethereal-dev.prerm
new file mode 100644
index 0000000000..5a07967065
--- /dev/null
+++ b/debian/ethereal-dev.prerm
@@ -0,0 +1,15 @@
+#! /bin/bash -e
+#
+# Debian prerm script for Python x.y hierarchical modules
+# Written by Gregor Hoffleit <flight@debian.org>
+# Extended by Matthias Klose <doko@debian.org>
+#
+
+PACKAGE=`basename $0 | sed -e 's/\.[^.]*$//'`
+
+dpkg --listfiles $PACKAGE |
+	awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
+	xargs rm -f >&2
+
+#DEBHELPER#
+
diff --git a/debian/ethereal.files b/debian/ethereal.files
new file mode 100644
index 0000000000..68395a9d90
--- /dev/null
+++ b/debian/ethereal.files
@@ -0,0 +1,2 @@
+/usr/bin/ethereal
+
diff --git a/debian/ethereal.manpages b/debian/ethereal.manpages
new file mode 100644
index 0000000000..0a75bc898b
--- /dev/null
+++ b/debian/ethereal.manpages
@@ -0,0 +1 @@
+ethereal.1
diff --git a/debian/ethereal.menu b/debian/ethereal.menu
new file mode 100644
index 0000000000..a48756da28
--- /dev/null
+++ b/debian/ethereal.menu
@@ -0,0 +1,2 @@
+?package(ethereal):needs=X11 section=Apps/Net title="Ethereal" \
+	command="/usr/bin/ethereal"
diff --git a/debian/postinst b/debian/postinst
index 1be916fa31..5640fc3bc5 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,15 +2,5 @@
 
 if test -e /usr/etc/manuf ; then rm /usr/etc/manuf ; fi
 
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
-	if [ -d /usr/doc -a ! -e /usr/doc/ethereal -a -d /usr/share/doc/ethereal ]; then
-		ln -sf ../share/doc/ethereal /usr/doc/ethereal
-	fi
-fi
-# End automatically added section
-
-# Automatically added by dh_installmenu
-if test -x /usr/bin/update-menus ; then update-menus ; fi
-# End automatically added section
+#DEBHELPER#
 
diff --git a/debian/prerm b/debian/prerm
index 91c564eca9..4e0be2d72d 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,4 @@
 #! /bin/sh
 
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ethereal ]; then
-	rm -f /usr/doc/ethereal
-fi
-# End automatically added section
+#DEBHELPER#
+
diff --git a/debian/rules b/debian/rules
index 14321ca439..4a48ec8a6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,29 +6,37 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
-build-stamp:
+export DH_COMPAT=3
+
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
 
+	#libtoolize --force --copy
+	-mkdir aclocal-missing
 	(if [ -x ./autogen.sh ]; then \
-	   ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static ; \
+	   ./autogen.sh --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp; \
 	else \
-	   ./configure --prefix=/usr --sysconfdir=/etc --disable-static ; \
+	   ./configure --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp; \
 	fi)
-	# Add here commands to compile the package.
-	make
-	make ethereal.1
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	$(MAKE)
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-	rm -f rdps
+	rm -f rdps ethereal.1 tethereal.1 doc/ethereal.pod doc/tethereal.pod
+	rm -f conftest conftest.c
+
 	dh_clean
 
 # Build architecture-independent files here.
@@ -44,31 +52,28 @@ binary-arch: build
 
 	# Add here commands to install the files into debian/tmp
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	mkdir -p `pwd`/debian/tmp/usr/lib/python2.2/site-packages/
+	cp `pwd`/ethereal_be.py `pwd`/ethereal_gen.py \
+			`pwd`/debian/tmp/usr/lib/python2.2/site-packages/
+	mkdir -p `pwd`/debian/tmp/usr/include/ethereal/
+	for F in `cat debian/ethereal-dev.header-files`; do \
+		cp --parents $$F `pwd`/debian/tmp/usr/include/ethereal; \
+	done
+	cp `pwd`/wiretap/libwiretap.a `pwd`/debian/tmp/usr/lib/
 	-rm -rf `pwd`/debian/tmp/usr/man
+	dh_installman
 
+	dh_movefiles
 	dh_installdocs
-#	dh_installexamples
 	dh_installmenu
-#	dh_installinit
-#	dh_installcron
-	dh_installmanpages 
 	dh_installchangelogs NEWS
 	dh_strip
 	dh_compress
 	dh_fixperms
 
-# debhelper isn't yet updated to support policy 3.0.0 so I have to play
-# with directories to comply with fhs 
-#	test -d debian/tmp/usr/share || mkdir debian/tmp/usr/share
-#	test -d debian/tmp/usr/doc && \
-#		mv debian/tmp/usr/doc debian/tmp/usr/share/
-#	test -d debian/tmp/usr/man && \
-#		mv debian/tmp/usr/man debian/tmp/usr/share/
-#	dh_suidregister
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
-#	dh_makeshlibs
 	dh_md5sums
 	dh_builddeb
 
diff --git a/debian/tethereal.files b/debian/tethereal.files
new file mode 100644
index 0000000000..3c4ec2be32
--- /dev/null
+++ b/debian/tethereal.files
@@ -0,0 +1,2 @@
+/usr/bin/tethereal
+
diff --git a/debian/tethereal.manpages b/debian/tethereal.manpages
new file mode 100644
index 0000000000..e63a005152
--- /dev/null
+++ b/debian/tethereal.manpages
@@ -0,0 +1 @@
+tethereal.1