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...

svn path=/trunk/; revision=13754

1 files changed, 15 insertions, 13 deletions

diff --git a/debian/control b/debian/control
index 3af455b359..784f960ed9 100644
--- 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).
  .