from Frederic Peters: bring debian package generation .deb up to date

I don't have the facility to test this, hopefully Frederic knows what he's doing :-)

However, this was out of date since a long time ago, so can't get worse anyway...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13754 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index f5492f1e60b53ab1d81ce33e66f001057691fda1..dad9c61ab745732b6ba80382deff72635cb634fd 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2406,6 +2406,7 @@ Nicolas Dichtel           <nicolas.dichtel [AT] 6wind.com>
 Ricardo Muggli         <ricardo.muggli [AT] mnsu.edu>
 Vladimir Kondratiev    <vladimir.kondratiev [AT] gmail.com>
 Jaap Keuter            <jaap.keuter [AT] xs4all.nl>
+Frederic Peters                <fpeters [AT] debian.org>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.

diff --git a/debian/README.debian b/debian/README.debian
index 30ded89a6d50617a453f155315dc238aaa496cbf..cd1f4ef9131a594f5e7f7344182c493b8878160e 100644 (file)
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -4,7 +4,7 @@ Ethereal for Debian
 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
 

diff --git a/debian/changelog b/debian/changelog
index 6fd0bdbb3468df6a21fbbdb337d4ab46cfe3d483..dd057681a9499d2e4ace52c3d64683607a963ee0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,771 @@
-ethereal (0.8.3-0unoff) unstable; urgency=low
+ethereal (0.10.10-1) unstable; urgency=high
 
-  * New upstream release. (unofficial package)
+  * New upstream release; urgency high since it fixes security issues.
+    * Fixes buffer overflow in Etheric dissector. (CAN-2005-0704)
+    * Fixes crash in GPRS-LLC dissector. (CAN-2005-0705)
+    * Fixes buffer overflow in 3G-A11 dissector. (CAN-2005-0699)
+      (was already fixed in Debian package)
+  * debian/ethereal-dev.header-files: some files moved to epan/
 
- -- Your Name <your.name@your.domain>  Sat,  5 Feb 2000 23:51:26 +0100
+ -- Frederic Peters <fpeters@debian.org>  Mon, 14 Mar 2005 10:16:03 +0100
 
-ethereal (0.8.2-0unoff) unstable; urgency=low
+ethereal (0.10.9-2) unstable; urgency=high
 
-  * New upstream release. (unofficial package)
-  * debian directory added in CVS tree
+  * Backported packet-3g-a11.c from upstream subversion trunk.
+    (fixes buffer overflows in 3G-A11 dissector)
+    (CAN-2005-0699 (under review)) (closes: #298771)
 
- -- Your Name <your.name@your.domain>  Wed, 26 Jan 2000 07:40:15 +0100
+ -- Frederic Peters <fpeters@debian.org>  Thu, 10 Mar 2005 10:25:08 +0100
+
+ethereal (0.10.9-1) unstable; urgency=high
+
+  * New upstream release; urgency high since it fixes security issues.
+    * Fixes infinite loop in COPS dissector. (CAN-2005-0006)
+    * Fixes assertion in DLSw dissector. (CAN-2005-0007)
+    * Fixes memory corruption in DNP dissector. (CAN-2005-0008)
+    * Fixes assertion in Gnutella dissector. (CAN-2005-0009)
+    * Fixes memory corruption in MMSE dissector. (CAN-2005-0010)
+    * Fixes buffer overflow in X11 dissector. (CAN-2005-0084)
+  * asn2deb and idl2deb manpages relicensed by W. Borgert from GFDL to GPL
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 20 Jan 2005 23:03:19 +0100
+
+ethereal (0.10.8-4) unstable; urgency=low
+
+  * Updated libtool version in wiretap/ directory. (closes: #289962)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 12 Jan 2005 10:14:41 +0100
+
+ethereal (0.10.8-3) unstable; urgency=low
+
+  * Fixed dissect_cmip_InvokeIDType declaration (FTBFS with gcc-4.0)
+    (closes: #288990)
+  * epan/dissectors/packet-giop.c: fixed segfault with some GIOP packets
+    (closes: #288746)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri,  7 Jan 2005 14:43:03 +0100
+
+ethereal (0.10.8-2) unstable; urgency=low
+
+  * Restored lost patch to idl2eth; sorry. (closes: #288740)
+  * ethereal_gen.py: fixed some includes.
+  * epan/prefs.c: Use sensible-brower as default browser.
+  * debian/control: build-depends on libpcap0.8-dev.
+  * debian/control: lower-case first letter of descriptions.
+
+ -- Frederic Peters <fpeters@debian.org>  Wed,  5 Jan 2005 14:34:57 +0100
+
+ethereal (0.10.8-1) unstable; urgency=high
+
+  * New upstream release.
+    * Now parses Auth option in DHCPv6 (closes: #283534)
+    * Urgency high since it fixes security issues with DICOM, RTP, HTTP
+      and SMB <http://www.ethereal.com/appnotes/enpa-sa-00016.html>
+      (CAN-2004-1139, CAN-2004-1140, CAN-2004-1141 and CAN-2004-1142)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 15 Dec 2004 22:13:41 +0100
+
+ethereal (0.10.7-3) unstable; urgency=low
+
+  * epan/prefs.c: changed default font to "monospace 10" (closes: #232408)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 19 Nov 2004 18:31:22 +0100
+
+ethereal (0.10.7-2) unstable; urgency=low
+
+  * plugins/opsi/packet-opsi.c: backported resource exhaustion fix
+    (closes: #280556)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 18 Nov 2004 21:50:28 +0100
+
+ethereal (0.10.7-1) unstable; urgency=low
+
+  * New upstream release. (closes: #277923)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  1 Nov 2004 14:11:35 +0100
+
+ethereal (0.10.6-4) unstable; urgency=low
+
+  * Build in clean chroot; stupid me.  (closes: #276560)
+  * debian/rules: remove config.log on clean.
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 15 Oct 2004 00:12:58 +0200
+
+ethereal (0.10.6-3) unstable; urgency=medium
+
+  * Upgrades libtool (closes: #276515)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 14 Oct 2004 18:40:03 +0200
+
+ethereal (0.10.6-2) unstable; urgency=medium
+
+  * debian/ethereal-dev.header-files: added missing header files
+    (closes: #270581)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed,  8 Sep 2004 10:34:12 +0200
+
+ethereal (0.10.6-1) unstable; urgency=high
+
+  * New upstream realease.
+    * Gtk-Critical messages are fixed (closes: #260341, #263118)
+  * debian/rules: run libtoolize to fix sonames; fix a FTBFS bug
+    (closes: #265379)
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 15 Aug 2004 11:58:03 +0200
+
+ethereal (0.10.5-4) unstable; urgency=low
+
+  * link libethereal.so to libadns and libm (closes: #262015)
+    (since this is a private shared library I don't think it was required)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 29 Jul 2004 15:41:02 +0200
+
+ethereal (0.10.5-3) unstable; urgency=low
+
+  * debian/ethereal-dev.header-files: install packet-rpc.h, crc16.h and crc32.h
+    (closes: #259375)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 14 Jul 2004 12:50:34 +0200
+
+ethereal (0.10.5-2) unstable; urgency=low
+
+  * Compile and install plugins (closes: #259199)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 13 Jul 2004 13:40:41 +0000
+
+ethereal (0.10.5-1) unstable; urgency=low
+
+  * New upstream release with security fixes.
+    + <http://www.ethereal.com/appnotes/enpa-sa-00015.html>
+    + Fixed the crash in protocol hierarchy (closes: #244743)
+    + Ethereal can be configured not to bug you about unsaved captures
+      (closes: #235721)
+  * Updated omniorb URL (closes: #257512)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 13 Jul 2004 10:16:55 +0200
+
+ethereal (0.10.4-3) unstable; urgency=low
+
+  * debian/rules: install libethereal in /usr/lib/ethereal, not /usr/lib/
+  * debian/ethereal-dev.header-files: added packet-ber.h
+  * idl2deb: ETH_VER_IMPORT and non-versioned autotools (closes: #255570)
+  * debian/control: updated depends to libpcap0.7-dev, no more libpcap-dev
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 22 Jun 2004 09:02:39 +0200
+
+ethereal (0.10.4-2) unstable; urgency=low
+
+  * Rebuilt against GTK+ 2.4; now in unstable.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 25 May 2004 22:28:37 +0200
+
+ethereal (0.10.4-1) unstable; urgency=high
+
+  * New upstream release with security fixes.
+    <http://www.ethereal.com/appnotes/enpa-sa-00014.html>
+  * (sorry about the delay; I was away and forgot about this release)
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 16 May 2004 00:02:53 +0200
+
+ethereal (0.10.3-3) unstable; urgency=low
+
+  * debian/control: removed dependency on gksu; moved to recommends
+  * debian/EtherealAsRoot.desktop: added TryExec=gksu so that the menu is
+    only shown when gksu is installed
+  * debian/ethereal.menu: removed entry for "ethereal as root" since
+    """running ethereal itself requires some wits, and user possesing
+    such skills would be able to launch it from xterm."""
+  * "Our Priorities are Our Users (...)", but ignore them if they ask
+    about gksu support; it's against the holy Debian Policy Manual and
+    a """300kB dependency *is* a big dependency""".
+  * This closes the bug and everybody is happy (closes: #240682)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 10 Apr 2004 21:16:30 +0200
+
+ethereal (0.10.3-2) unstable; urgency=high
+
+  * Acknowledge NMU. (sorry)  (urgency high, security fixes)
+  * debian/control: added Build-Conflicts on libsnmp-dev
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 28 Mar 2004 23:14:51 +0200
+
+ethereal (0.10.3-1.0.1) unstable; urgency=low
+
+  * Recompile-only NMU.
+  * i386 package was uploaded with dependencies on GNOME libs from
+    experimental; rebuild using only dependencies from unstable.
+
+ -- Steve Langasek <vorlon@debian.org>  Sat, 27 Mar 2004 21:27:01 -0600
+
+ethereal (0.10.3-1) unstable; urgency=high
+
+  * New upstream release with security fixes. (hence urgency high)
+    http://www.ethereal.com/appnotes/enpa-sa-00013.html
+  * debian/rules: remove upstream debian/menu on build
+  * debian/control: added dependency on gksu
+  * debian/menu: added an entry to start ethereal with gksu
+    (closes: #71994)
+  * added another .desktop entry to start ethereal with gksu from Gnome menu
+  * Upstream changes; libethereal and libwiretap handled differently; they may
+    end up in new packages (but go in ethereal-common for now)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 27 Mar 2004 14:09:49 +0100
+
+ethereal (0.10.2-2) unstable; urgency=low
+
+  * New files in ethereal-dev (closes: #236702)
+
+ -- Frederic Peters <fpeters@debian.org>  Sun,  7 Mar 2004 21:43:17 +0100
+
+ethereal (0.10.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: added libpcre3-dev to Build-Depends
+
+ -- Frederic Peters <fpeters@debian.org>  Fri,  5 Mar 2004 15:56:50 +0100
+
+ethereal (0.10.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Include W. Bogert asn2deb (closes: #233603)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 19 Feb 2004 18:02:08 +0100
+
+ethereal (0.10.0-6) unstable; urgency=low
+
+  * debian/ethereal-common.manpages: added ethereal-filter.4
+    (closes: #230256)
+  * debian/control: updated build-depends on docbook-xsl since docbook.xsl
+    moved.
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 29 Jan 2004 18:11:43 +0100
+
+ethereal (0.10.0-5) unstable; urgency=low
+
+  * debian/rules: quotes around CFLAGS. (closes: #228492)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 19 Jan 2004 12:14:02 +0100
+
+ethereal (0.10.0-4) unstable; urgency=low
+
+  * Backported hexdump summary fix from CVS (closes: #226248)
+    http://www.ethereal.com/lists/ethereal-cvs/200312/msg00257.html
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  5 Jan 2004 15:27:06 +0100
+
+ethereal (0.10.0-3) unstable; urgency=low
+
+  * ethereal_gen.py: patched to handle ushort/ulong union discriminators.
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 18 Dec 2003 23:27:51 +0100
+
+ethereal (0.10.0-2) unstable; urgency=low
+
+  * debian/ethereal-dev.header-files: added missing header files.
+    (closes: #224246)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 17 Dec 2003 13:24:21 +0100
+
+ethereal (0.10.0-1) unstable; urgency=low
+
+  * New upstream release. (closes: #223857)
+    * correct fonts with GTK2. (closes: #197571)
+    * Includes missing help/ directory from CVS.
+  * Acknowledge NMU, thanks Ray.
+    * Security issues. (closes: #219590)
+    * idl2deb permissions. (closes: #211506)
+  * New idl2deb version, thanks. (closes: #213962)
+  * debian/ethereal-dev.header-files: include some missing header files
+    (closes the remaining of #211506)
+  * debian/control: versioned build-depends on debhelper.
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 13 Dec 2003 17:11:09 +0100
+
+ethereal (0.9.16-0.1) unstable; urgency=high
+
+  * NMU.
+  * New upstream release (addresses #219590 for sid).
+    Fixes potential security issues with several dissectors:
+    * GTP (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0925)
+    * ISAKMP and MEGACO
+      (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0926)
+    * SOCKS (http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0927)
+    The upstream security advisory is enpa-sa-00011, available at
+    http://www.ethereal.com/appnotes/enpa-sa-00011.html
+  * [debian/rules]
+    * Don't remove doc/ethereal.pod and doc/tethereal.pod so the package
+      builds with pbuilder.
+    * Install idl2deb with execute permissions.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon, 10 Nov 2003 12:11:55 +0100
+
+ethereal (0.9.15-1) unstable; urgency=low
+
+  * New upstream release. (closes: #210272)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 10 Sep 2003 16:13:17 +0200
+
+ethereal (0.9.14-5) unstable; urgency=low
+
+  * debian/control: versioned build-depends on docbook-xsl (closes: #208734)
+  * debian/rules: compiles with -mieee on alpha
+
+ -- Frederic Peters <fpeters@debian.org>  Sun,  7 Sep 2003 09:57:25 +0200
+
+ethereal (0.9.14-4) unstable; urgency=low
+
+  * debian/rules: install .desktop and images for menu.
+    (closes: #207271)
+  * debian/control: updated policy to 3.6.1.0 (no changes needed)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 30 Aug 2003 23:27:00 +0200
+
+ethereal (0.9.14-3) unstable; urgency=low
+
+  * Add manpage for idl2deb
+  * Include missing header files. (closes: #197181)
+    - from same bug: remove dependency of ethereal-dev against ethereal-common
+    - from same bug: added dependency to libglib2.0-dev
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 19 Aug 2003 11:55:27 +0200
+
+ethereal (0.9.14-2) unstable; urgency=low
+
+  * Built for Python 2.3 since omniidl4 has been updated quickly.
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 14 Aug 2003 10:19:18 +0200
+
+ethereal (0.9.14-1) unstable; urgency=low
+
+  * The "I'm so happy to be alive I'll fix plenty of bugs" release
+  * New upstream release. (closes: #204345)
+  * Include W. Bogert idl2deb script
+  * debian/control: depends on current versions of omniidl or omniidl4 since
+    they only exist for Python 2.2 and I don't want ethereal-dev to break when
+    they will switch to Python 2.3.  I'll then release a new version.
+  * Several UI issues resolved upstream (closes: #199763)
+  * ethereal can now decode Jabber protocol (closes: #133099)
+  * debian/control: build-depends on libadns1-dev so that it now use the GNU
+    ADNS library for name resolution (closes: #197505)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 13 Aug 2003 00:06:27 +0200
+
+ethereal (0.9.13-1) unstable; urgency=low
+
+  * New upstream release.  Fixing several security issues.
+    (closes: #197107)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 12 Jun 2003 10:00:57 +0200
+
+ethereal (0.9.12-3) unstable; urgency=low
+
+  * Rebuilt with new libpcap. (closes: #196831)
+  * Built with GTK+ 2.2 (instead of GTK+ 1.2). (closes: #193450)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 11 Jun 2003 17:45:07 +0200
+
+ethereal (0.9.12-2) unstable; urgency=low
+
+  * Forgot to update version-depends and it didn't use ${source-version}.
+    Fixed. (closes: #192213)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed,  7 May 2003 01:16:45 +0200
+
+ethereal (0.9.12-1) unstable; urgency=high
+
+  * New upstream release.  Fixing several security issues.
+    (closes: #192107)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue,  6 May 2003 22:03:10 +0200
+
+ethereal (0.9.9-2) unstable; urgency=low
+
+  * Updated config.guess and config.sub to work on mips and mipsel
+    architectures (manually then through the patch provided by
+    Martin Godisch). (closes: #178701)
+  * Update to packet-socks.c
+  * debian/control: ethereal-dev now depends upon omniidl | omniidl4
+    (closes: #182620)
+  * idl2eth no longer needs PYTHONPATH to be set explicitely.
+    (closes: #182621)
+  * debian/ethereal-dev.header-files: included config.h and reassemble.h since
+    they seem necessary. (closes: #183625)
+  * Thanks to W. Borgert for bug reporting.
+
+ -- Frederic Peters <fpeters@debian.org>  Fri,  7 Mar 2003 22:52:27 +0000
+
+ethereal (0.9.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Tightened ethereal-common dependencies.
+    (closes: #172861, #176236, #178027)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 24 Jan 2003 14:38:53 +0100
+
+ethereal (0.9.8-3) unstable; urgency=low
+
+  * debian/control: added versioned dependency between (t)ethereal and
+    ethereal-common to get the plug-ins. (closes: #172861)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 13 Dec 2002 10:39:27 +0100
+
+ethereal (0.9.8-2) unstable; urgency=low
+
+  * Updated config.sub and config.guess with the ones from autotools-dev
+    (closes: #172407)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 10 Dec 2002 09:52:45 +0100
+
+ethereal (0.9.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * This added (some) support for counting IPv6 packets during capture.
+    (closes: #164472)
+  * 0.9.7 fixed the LMP dissector. (closes: #163513)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  9 Dec 2002 10:00:51 +0100
+
+ethereal (0.9.7-2) unstable; urgency=low
+
+  * debian/control: added libgtk2.0-dev to build depends.
+  * debian/control: removed libsnmp-dev from build depends (ethereal is
+    compiled without SNMP support since it would link against libssl)
+    (the build-dep caused failure to build on architectures where perl 5.8
+    wasn't ready (dependency on libsnmp-perl))
+  * debian/control: added python, automake and autoconf to build depends.
+  * debian/rules: creating aclocal-missing directory on build.
+      (those bugs closes: #163443) (patch by LaMont Jones)
+  * debian/rules: install Python files to 2.2 directory, not 2.1
+  * debian/ethereal-dev.postinst: fixed Python version (closes: #163153)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  7 Oct 2002 15:06:06 +0200
+
+ethereal (0.9.7-1) unstable; urgency=low
+
+  * New upstream release. (closes: #162972)
+  * debian/copyright: include upstream author name. (closes: #151015)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue,  1 Oct 2002 16:20:45 +0200
+
+ethereal (0.9.6-2) unstable; urgency=low
+
+  * debian/control: changed Python dep to >= 2.2 and << 2.3 since 2.2 is now
+    the default version in sid.
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 14 Sep 2002 23:29:23 +0200
+
+ethereal (0.9.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixes security issue in the ISIS protocol dissector (susceptible to
+    buffer overflow).
+     (see http://www.ethereal.com/appnotes/enpa-sa-00006.html)
+  * Add missing header files (packet-tcp.h and packet-tpkt.h) to ethereal-dev
+    (closes: #158808)
+  * Add default PYTHONPATH to idl2eth (closes: #158909)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  2 Sep 2002 10:13:06 +0200
+
+ethereal (0.9.5-3) unstable; urgency=low
+
+  * Rebuilt with new libpcap0.7. (closes: #156206)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 10 Aug 2002 19:25:29 +0200
+
+ethereal (0.9.5-2) unstable; urgency=low
+
+  * Do not run libtoolize since it creates a bogus libtool file.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon,  8 Jul 2002 16:07:00 +0200
+
+ethereal (0.9.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixes several security issues.
+    (http://www.ethereal.com/appnotes/enpa-sa-00005.html)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 29 Jun 2002 19:13:30 +0200
+
+ethereal (0.9.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Fixes four security issues. (closes: #147595)
+    (http://www.ethereal.com/appnotes/enpa-sa-00004.html)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 20 May 2002 01:10:21 +0200
+
+ethereal (0.9.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Fixes ASN.1 zero-length g_malloc that could lead to security problems.
+    (see http://www.ethereal.com/appnotes/enpa-sa-00003.html)
+
+ -- Frederic Peters <fpeters@debian.org>  Sun, 31 Mar 2002 21:45:11 +0200
+
+ethereal (0.9.2-3) unstable; urgency=low
+
+  * debian/rules: fixed typo that could have caused snmp not to be built.
+    (closes: #140147) This would happen if 1) built from the CVS tree and 2)
+    built on a system without libsnmp-dev ("impossible" since we build-depend
+    on it). Anyway it is fixed for correctness.
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 27 Mar 2002 14:00:31 +0100
+
+ethereal (0.9.2-2) unstable; urgency=low
+
+  * Added libwiretap.a to ethereal-dev (closes: #137971)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 12 Mar 2002 11:59:04 +0100
+
+ethereal (0.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Tue,  5 Mar 2002 10:30:24 +0100
+
+ethereal (0.9.1-8) unstable; urgency=low
+
+  * debian/control: changed ethereal-dev section to devel.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 25 Feb 2002 14:50:49 +0100
+
+ethereal (0.9.1-7) unstable; urgency=low
+
+  * debian/control: changed ethereal-dev Depends line to use omniidl-python
+    and no omniorb.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 25 Feb 2002 13:47:42 +0100
+
+ethereal (0.9.1-6) unstable; urgency=low
+
+  * debian/control: fix Depends line for ethereal-dev (added libpcap-dev)
+  * idl2eth: added PYTHONPATH so that it runs.
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 18 Feb 2002 11:48:01 +0100
+
+ethereal (0.9.1-5) unstable; urgency=low
+
+  * debian/rules: added --disable-ssl so that ethereal is not built with
+    ssl support and may be uploaded to main. (closes: #134273)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 18 Feb 2002 09:33:30 +0100
+
+ethereal (0.9.1-4) unstable; urgency=low
+
+  * debian/rules: added forgotten header files to ethereal-dev.
+    (really closes: #105916)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 15 Feb 2002 10:12:15 +0100
+
+ethereal (0.9.1-3) unstable; urgency=low
+
+  * debian/rules: after the quick and dirty repackaging of 0.9.1-1 this one
+    should be much better: 4 packages: ethereal-common, ethereal, tethereal
+    and etherel-dev (last three depending on ethereal-common).
+    This should address Christian Kurz remarks.
+       (closes: #133798, #133796, #133806)
+    This should also please W. Borgert. (closes: #105916)
+
+ -- Frederic Peters <fpeters@debian.org>  Wed, 13 Feb 2002 20:36:12 +0100
+
+ethereal (0.9.1-2) unstable; urgency=low
+
+  * debian/control: fixed typo in tethereal description (closes: #133019)
+
+ -- Frederic Peters <fpeters@debian.org>  Fri,  8 Feb 2002 23:55:49 +0100
+
+ethereal (0.9.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed protocol hierarchy display (closes: #131676)
+  * It is possible to see TOS fields instead of DS fields in IP header.
+    (option in preferences dialog) (closes: #121046)
+  * debian/rules: totally revamped build process: create an additional
+    tethereal package that doesn't depend on GTK+ (closes: #103488)
+    It is not yet perfect but I'm working on it...
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 28 Jan 2002 18:25:25 +0100
+
+ethereal (0.9.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream fixed SNMP bugs (closes: #114361, #119580)
+  * Upstream fixed Sender->Receiver bug (closes: #112327)
+  * debian/copyright: fixed 'license' spelling.
+  * debian/rules: fixed 'clean' target to remove temporary files.
+  * debian/rules: moved $sysconfdir to /usr/share/ethereal since $sysconfdir
+    is not used here to store config files. (closes: #127638)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu,  3 Jan 2002 19:43:18 +0100
+
+ethereal (0.8.20-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 19 Oct 2001 10:49:35 +0200
+
+ethereal (0.8.19-2) unstable; urgency=low
+
+  * debian/rules: added call to libtoolize so that it compiles on hppa.
+    (closes: #108662)
+
+ -- Frederic Peters <fpeters@debian.org>  Mon, 17 Sep 2001 14:23:34 +0200
+
+ethereal (0.8.19-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: improved description of package. (closes: #104744)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 14 Jul 2001 11:57:12 +0200
+
+ethereal (0.8.17-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Fri, 13 Apr 2001 13:33:35 +0200
+
+ethereal (0.8.16-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Thu,  8 Mar 2001 09:07:34 +0100
+
+ethereal (0.8.15-2) unstable; urgency=low
+
+  * Rebuilt against libsnmp4.2 (closes: #83720)
+  * It is possible to not go in promiscuous mode (-p) (actually it was for
+    some time...) (closes: #34376)
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 27 Jan 2001 13:39:05 +0100
+
+ethereal (0.8.15-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  Sat, 13 Jan 2001 19:36:26 +0100
+
+ethereal (0.8.14-2) unstable; urgency=low
+
+  * Fix for the socks dissector. (closes: #81164)
+    (patch by Jeff Foster <jfoste@woodward.com>)
+
+ -- Frederic Peters <fpeters@debian.org>  Thu, 11 Jan 2001 00:27:02 +0100
+
+ethereal (0.8.14-1) unstable; urgency=low
+
+  * New upstream release.
+  * Officially fixes the buffer overflow exploit mentioned below (as well
+    as other possible ones)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 21 Nov 2000 22:48:16 +0100
+
+ethereal (0.8.13-3) unstable; urgency=low
+
+  * Fixed possible buffer overflow exploit in packet-afs.c (I could not
+    reproduce it so I don't know if my fix really works, please test it)
+    (exploit is on http://www.hacksware.com)
+
+ -- Frederic Peters <fpeters@debian.org>  Tue, 21 Nov 2000 22:47:59 +0100
+
+ethereal (0.8.13-2) unstable; urgency=low
+
+  * Rebuilt against XFree86 4.0 libs (now that I'm allowed to...)
+  * Rebuilt against zlibg1 1.1.13-1 that has a correct shlibs file
+    (closes: #76533, #76552)
+  
+ -- Frederic Peters <fpeters@debian.org>  Fri, 10 Nov 2000 17:39:40 +0100
+
+ethereal (0.8.13-1) unstable; urgency=low
+
+  * New upstream release.
+  
+ -- Frederic Peters <fpeters@debian.org>  Sun, 29 Oct 2000 23:58:38 +0100
+
+ethereal (0.8.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Patch for SRVLOC frames has been applied upstrem.
+  
+ -- Frederic Peters <fpeters@debian.org>  Mon, 18 Sep 2000 10:22:27 +0200
+
+ethereal (0.8.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Applied patch to fix hang on some SRVLOC frames (closes: #68024)
+  
+ -- Frederic Peters <fpeters@debian.org>  Thu, 10 Aug 2000 21:06:52 +0200
+
+ethereal (0.8.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added debhelper to Build-depends (closes: #66391)
+  
+ -- Frederic Peters <fpeters@debian.org>  Tue, 11 Jul 2000 22:36:45 +0200
+
+ethereal (0.8.9-2) unstable; urgency=low
+
+  * Updated Build-depends to match libsnmp (closes: #66018) (it's the same
+    entry as for 0.8.7-2; I need some sleep)
+  
+ -- Frederic Peters <fpeters@debian.org>  Thu, 22 Jun 2000 23:59:29 +0200
+
+ethereal (0.8.9-1) unstable; urgency=low
+
+  * New upstream release.
+  
+ -- Frederic Peters <fpeters@debian.org>  Tue, 20 Jun 2000 14:17:00 +0200
+
+ethereal (0.8.8-1) unstable; urgency=low
+
+  * New upstream release.
+  
+ -- Frederic Peters <fpeters@debian.org>  Wed, 10 May 2000 17:20:36 +0200
+
+ethereal (0.8.7-2) unstable; urgency=low
+
+  * Updated Build-depends to match libsnmp (closes: #63753)
+  
+ -- Frederic Peters <fpeters@debian.org>  Mon,  8 May 2000 19:02:29 +0200
+
+ethereal (0.8.7-1) unstable; urgency=low
+
+  * New upstream release.
+  
+ -- Frederic Peters <fpeters@debian.org>  Mon, 17 Apr 2000 18:41:21 +0200
+
+ethereal (0.8.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Linked against libsnmp4.1 (closes: #62324)
+  
+ -- Frederic Peters <fpeters@debian.org>  Fri, 14 Apr 2000 19:45:53 +0200
+
+ethereal (0.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Applied fix for correct decapsulation of PPP frames (closes: #59663)
+    (patch provided by Thomas Quinot <thomas@cuivre.fr.eu.org>)
+  
+ -- Frederic Peters <fpeters@debian.org>  Sun,  5 Mar 2000 20:04:11 +0100
+
+ethereal (0.8.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Checked PPTP problems (fix was introduced in 0.8.2) (closes: #55347)
+  
+ -- Frederic Peters <fpeters@debian.org>  Sat,  5 Feb 2000 23:51:26 +0100
+
+ethereal (0.8.2-2) unstable; urgency=low
+
+  * debian/control: fixed Build-Depends line (closes: #56707)
+  
+ -- Frederic Peters <fpeters@debian.org>  Mon, 31 Jan 2000 19:29:21 +0100
+
+ethereal (0.8.2-1) unstable; urgency=low
+
+  * New upstream release.
+  
+ -- Frederic Peters <fpeters@debian.org>  Sat, 29 Jan 2000 01:53:50 +0100
 
 ethereal (0.8.1-2) unstable; urgency=low
 
@@ -164,7 +920,3 @@ ethereal (0.3.15-1) unstable; urgency=low
 
  -- Frederic Peters <fpeters@debian.org>  Sun, 13 Sep 1998 23:05:47 +0200
 
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "fpeters@debian.org"
-End:

diff --git a/debian/control b/debian/control
index 3af455b3597bba52725f078c767a2e29db327d51..784f960ed9d72a498832560bcd296bed4236dca8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,18 @@ Source: ethereal
 Section: net
 Priority: optional
 Maintainer: Frederic Peters <fpeters@debian.org>
-Standards-Version: 3.5.6
-Build-Depends: libgtk1.2-dev, libgtk2.0-dev, libpcap-dev, flex, libz-dev, debhelper, libtool, python, automake, autoconf
+Standards-Version: 3.6.1.0
+Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, debhelper (>= 3.0), libtool, python, automake, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev
+Build-Conflicts: libsnmp4.2-dev, libsnmp5-dev
 
 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)
+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
+ Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
  .
@@ -21,10 +22,11 @@ Description: Network traffic analyser (common files)
 
 Package: ethereal
 Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common
-Description: Network traffic analyzer
+Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
+Recommends: gksu
+Description: network traffic analyzer
  Ethereal is a network traffic analyzer, or "sniffer", for Unix and
- Unix-like operating systems. A sniffer is a tool used to capture
+ Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
  .
@@ -32,10 +34,10 @@ Description: Network traffic analyzer
 
 Package: tethereal
 Architecture: any
-Depends: ${shlibs:Depends}, ethereal-common
-Description: Network traffic analyzer (console)
+Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version})
+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
+ Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
  .
@@ -45,10 +47,10 @@ Description: Network traffic analyzer (console)
 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)
+Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, python, snacc, autotools-dev, debhelper, cdbs, automake1.7, autoconf
+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
+ Unix-like operating systems. A sniffer is a tool used to capture 
  packets off the wire. Ethereal decodes numerous protocols (too many
  to list).
  .

diff --git a/debian/ethereal-common.files b/debian/ethereal-common.files
index 9116326f5205e4eef6336cdb2302e9eddec883b1..1fa314e51a9de2ec70851c541a1a67d34363a59d 100644 (file)
--- a/debian/ethereal-common.files
+++ b/debian/ethereal-common.files
@@ -1,5 +1,14 @@
 /usr/bin/editcap
 /usr/bin/mergecap
 /usr/bin/text2pcap
+/usr/lib/ethereal/libethereal.so.0
+/usr/lib/ethereal/libethereal.so.0.0.1
+/usr/lib/ethereal/libwiretap.so.0
+/usr/lib/ethereal/libwiretap.so.0.0.1
+/usr/lib/ethereal/plugins/*
+/usr/share/ethereal/*
+/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
index d00e3af44d71e48eb897b121a968e763aefd3588..039fd6041611707441c0d2fd99683d6a60a97d73 100644 (file)
--- a/debian/ethereal-common.manpages
+++ b/debian/ethereal-common.manpages
@@ -1,3 +1,8 @@
 editcap.1
 mergecap.1
 text2pcap.1
+ethereal-filter.4
+
+editcap.1
+mergecap.1
+text2pcap.1

diff --git a/debian/ethereal-dev.docs b/debian/ethereal-dev.docs
index ce52791e1801a678b12a1a85285b28d2eae8877a..e3900d278d96a140f70cb542df2f8667f451be91 100644 (file)
--- a/debian/ethereal-dev.docs
+++ b/debian/ethereal-dev.docs
@@ -3,3 +3,8 @@ doc/README.developer
 doc/README.idl2eth
 doc/README.plugins
 
+doc/README.design
+doc/README.developer
+doc/README.idl2eth
+doc/README.plugins
+

diff --git a/debian/ethereal-dev.files b/debian/ethereal-dev.files
index 649812003d87e2991bff82c5fa1a989ce5994dcb..2759a3ddb8c0e757ccd8555d8658f71d693ce3be 100644 (file)
--- a/debian/ethereal-dev.files
+++ b/debian/ethereal-dev.files
@@ -1,3 +1,13 @@
+/usr/bin/idl2eth
+/usr/bin/idl2deb
+/usr/bin/asn2deb
+/usr/lib/ethereal/libethereal.so
+/usr/lib/ethereal/libethereal.la
+/usr/lib/ethereal/libwiretap.so
+/usr/lib/ethereal/libwiretap.la
+/usr/lib/python2.3/*
+/usr/include/ethereal/*
+
 /usr/bin/idl2eth
 /usr/lib/python2.2/*
 /usr/include/ethereal/*

diff --git a/debian/ethereal-dev.header-files b/debian/ethereal-dev.header-files
index 3d39ffd33ffb86930ca836c8379e1113c241bae1..13c3f03a547ebc61cf132a4acba3eac91815dffe 100644 (file)
--- a/debian/ethereal-dev.header-files
+++ b/debian/ethereal-dev.header-files
@@ -1,3 +1,45 @@
+color.h
+config.h
+epan/asn1.h
+epan/address.h
+epan/column_info.h
+epan/column-utils.h
+epan/conversation.h
+epan/crc16.h
+epan/crc32.h
+epan/dfilter/dfilter.h
+epan/dfilter/drange.h
+epan/dissectors/packet-ber.h
+epan/dissectors/packet-giop.h
+epan/dissectors/packet-per.h
+epan/dissectors/packet-rpc.h
+epan/dissectors/packet-tcp.h
+epan/dissectors/packet-tpkt.h
+epan/epan.h
+epan/except.h
+epan/exceptions.h
+epan/filesystem.h
+epan/frame_data.h
+epan/ftypes/ftypes.h
+epan/ipv4.h
+epan/nstime.h
+epan/packet.h
+epan/packet_info.h
+epan/pint.h
+epan/prefs.h
+epan/proto.h
+epan/reassemble.h
+epan/report_err.h
+epan/slab.h
+epan/tap.h
+epan/to_str.h
+epan/tvbuff.h
+epan/value_string.h
+epan/xdlc.h
+plugins/plugin_api_defs.h
+plugins/plugin_api.h
+plugins/plugin_table.h
+wiretap/wtap.h
 plugins/plugin_api.h
 plugins/plugin_api_defs.h
 plugins/plugin_table.h

diff --git a/debian/ethereal-dev.manpages b/debian/ethereal-dev.manpages
index 5153c644f75f63bc6c538d7ac145d96757428c40..78c8ef6ef07cb20156991cc84648abea31781e53 100644 (file)
--- a/debian/ethereal-dev.manpages
+++ b/debian/ethereal-dev.manpages
@@ -1,2 +1,5 @@
 idl2eth.1
+idl2deb.1
+asn2deb.1
+idl2eth.1
 

diff --git a/debian/ethereal-dev.postinst b/debian/ethereal-dev.postinst
index ec629da3f9f5dca2b3bf02241bdf37bff1b52d67..4dca3e4d79be196e2b8571ffec61bbb222eed7e8 100644 (file)
--- a/debian/ethereal-dev.postinst
+++ b/debian/ethereal-dev.postinst
@@ -1,5 +1,24 @@
 #! /bin/sh -e
 
+PYTHON=python2.3
+
+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
+
+#! /bin/sh -e
+
 PYTHON=python2.2
 
 case "$1" in

diff --git a/debian/ethereal-dev.prerm b/debian/ethereal-dev.prerm
index 5a079670655cbdd6b5f7ff4abd646264149c21cb..08a7c89842beb48c492b5a5b4e2796e7f3128e92 100644 (file)
--- a/debian/ethereal-dev.prerm
+++ b/debian/ethereal-dev.prerm
@@ -13,3 +13,18 @@ dpkg --listfiles $PACKAGE |
 
 #DEBHELPER#
 
+#! /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
index 68395a9d9065da5fd61dc7a2c552d957ad25602e..2b52e08abaaf98821b0171c0ede41a491c4f2b7f 100644 (file)
--- a/debian/ethereal.files
+++ b/debian/ethereal.files
@@ -1,2 +1,5 @@
 /usr/bin/ethereal
+/usr/share/applications/
+/usr/share/pixmaps/
+/usr/bin/ethereal
 

diff --git a/debian/ethereal.manpages b/debian/ethereal.manpages
index 0a75bc898b5f1326f46a7c34b63055492c1b39d1..2466e9b672ac4ec52c725899aefd0ec3c9c78404 100644 (file)
--- a/debian/ethereal.manpages
+++ b/debian/ethereal.manpages
@@ -1 +1,2 @@
 ethereal.1
+ethereal.1

diff --git a/debian/ethereal.menu b/debian/ethereal.menu
index a48756da28a033f0e97a54e0c198f195cd3eebd8..5de3c5e89d1008d44d8ea96c82e92cea19c7e8c4 100644 (file)
--- a/debian/ethereal.menu
+++ b/debian/ethereal.menu
@@ -1,2 +1,6 @@
+?package(ethereal):needs="X11" section="Apps/Net" title="Ethereal" \
+       command="/usr/bin/ethereal" \
+       icon="/usr/share/pixmaps/eicon3d32.xpm"
+
 ?package(ethereal):needs=X11 section=Apps/Net title="Ethereal" \
        command="/usr/bin/ethereal"

diff --git a/debian/rules b/debian/rules
index 4a48ec8a6fb229e7e7a866d5adccf9b56ae2f197..c86b5c5f7ec5c7543c735b1e61d83e2605d99158 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,21 +8,39 @@
 
 export DH_COMPAT=3
 
+DB2MAN=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
+
+
+DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# Enable IEEE-conformant floating point math on alphas (not the default)
+ifeq (alpha-linux,$(DEB_HOST_GNU_TYPE))
+  CFLAGS += -mieee
+endif
+
+idl2deb.1: idl2deb.dbk
+       xsltproc --nonet --novalid $(DB2MAN) $<
+
+asn2deb.1: asn2deb.dbk
+       xsltproc --nonet --novalid $(DB2MAN) $<
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 
-       #libtoolize --force --copy
+       cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
+       libtoolize --force --copy
        -mkdir aclocal-missing
-       (if [ -x ./autogen.sh ]; then \
-          ./autogen.sh --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp; \
-       else \
-          ./configure --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp; \
+       (if [ ! -x ./configure ]; then \
+          ./autogen.sh --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp --enable-gtk2 --libdir=/usr/lib/ethereal --CFLAGS="$(CFLAGS)"; \
        fi)
 
+       ./configure --prefix=/usr --sysconfdir=/usr/share/ethereal --disable-static --disable-ssl --without-ucdsnmp --enable-gtk2 --libdir=/usr/lib/ethereal CFLAGS="$(CFLAGS)"
+
        touch configure-stamp
 
-build: build-stamp
+build: build-stamp idl2deb.1 asn2deb.1
 build-stamp: configure-stamp
        $(MAKE)
 
@@ -33,9 +51,11 @@ clean:
        dh_testroot
        rm -f build-stamp configure-stamp
 
+       cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
        -$(MAKE) distclean
-       rm -f rdps ethereal.1 tethereal.1 doc/ethereal.pod doc/tethereal.pod
+       rm -f rdps ethereal.1 tethereal.1 idl2deb.1 ethereal-filter.4 asn2deb.1
        rm -f conftest conftest.c
+       rm -f config.guess config.sub config.log
 
        dh_clean
 
@@ -52,19 +72,29 @@ 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/
+       mkdir -p `pwd`/debian/tmp/usr/share/applications/
+       cp ethereal.desktop `pwd`/debian/tmp/usr/share/applications/
+       cp debian/ethereal-root.desktop `pwd`/debian/tmp/usr/share/applications/
+       mkdir -p `pwd`/debian/tmp/usr/share/pixmaps/
+       cp image/hi48-app-ethereal.png `pwd`/debian/tmp/usr/share/pixmaps/
+       cp image/eicon3d32.xpm `pwd`/debian/tmp/usr/share/pixmaps/
+       mkdir -p `pwd`/debian/tmp/usr/lib/python2.3/site-packages/
+       install -m 755 `pwd`/idl2deb `pwd`/debian/tmp/usr/bin/
+       install -m 755 `pwd`/asn2deb `pwd`/debian/tmp/usr/bin/
        cp `pwd`/ethereal_be.py `pwd`/ethereal_gen.py \
-                       `pwd`/debian/tmp/usr/lib/python2.2/site-packages/
+                       `pwd`/debian/tmp/usr/lib/python2.3/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/
+       # .a is no longer built; why was is used ?
+       #cp `pwd`/wiretap/libwiretap.a `pwd`/debian/tmp/usr/lib/
        -rm -rf `pwd`/debian/tmp/usr/man
        dh_installman
 
        dh_movefiles
        dh_installdocs
+       -rm debian/menu   # from upstream debian/ package
        dh_installmenu
        dh_installchangelogs NEWS
        dh_strip

diff --git a/debian/tethereal.files b/debian/tethereal.files
index 3c4ec2be321e0f0e1d99e52a8856929e5a58e006..ad52d405a4c51af9970d4c382b806ae89de91247 100644 (file)
--- a/debian/tethereal.files
+++ b/debian/tethereal.files
@@ -1,2 +1,4 @@
 /usr/bin/tethereal
 
+/usr/bin/tethereal
+

diff --git a/debian/tethereal.manpages b/debian/tethereal.manpages
index e63a00515277d11834451ded38f8740cd15f1935..40be37f7ca53648a538b133ace301bf6e64a0814 100644 (file)
--- a/debian/tethereal.manpages
+++ b/debian/tethereal.manpages
@@ -1 +1,2 @@
 tethereal.1
+tethereal.1