diff -u wireshark-1.0.6/debian/changelog wireshark-1.0.6/debian/changelog --- wireshark-1.0.6/debian/changelog +++ wireshark-1.0.6/debian/changelog @@ -1,3 +1,12 @@ +wireshark (1.0.6-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #329915): + - replace gksu with menu in Recommends + - Add debian/README.source. + * Closes LP: #329192, new upstream release. + + -- Nick Ellery Sun, 15 Feb 2009 17:24:04 -0800 + wireshark (1.0.6-1) unstable; urgency=low * new upstream release 1.0.6 @@ -17,6 +26,19 @@ -- Joost Yervante Damad Sat, 07 Feb 2009 15:35:10 +0100 +wireshark (1.0.5-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #305789), remaining changes: + - replace gksu with menu in Recommends + - Add debian/README.source. + - Add debian/patches/20_sigpipe.dpatch, which restores the default sigpipe + action, meaning that the app won't hang under gksu. + - Add 20_sigpipe to debian/patches/00list. + - Corrected FTBFS on all architectures related to autotools and + config.guess/config.status by allowing a check to fail in some cases + + -- Nick Ellery Sun, 14 Dec 2008 13:20:07 -0800 + wireshark (1.0.5-1) unstable; urgency=low * New upstream release 1.0.5 @@ -48,6 +70,24 @@ -- Joost Yervante Damad Fri, 05 Dec 2008 10:35:47 +0100 +wireshark (1.0.3-1ubuntu2) intrepid; urgency=low + + * Add debian/patches/20_sigpipe.dpatch, which restores the default sigpipe + action, meaning that the app won't hang under gksu. (LP: #198884) + Huge thanks to Sergio Barjola. + + -- James Westby Thu, 09 Oct 2008 16:15:28 +0100 + +wireshark (1.0.3-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #277895). Remaining Ubuntu changes: + - Corrected FTBFS on all architectures related to autotools and + config.guess/config.status by allowing a check to fail in some cases. + - Replace gksu with menu in Recommends. + - Add debian/README.source. + + -- Luca Falavigna Sat, 04 Oct 2008 03:25:01 +0200 + wireshark (1.0.3-1) unstable; urgency=high * New upstream release 1.0.3 (Closes: #497878) @@ -85,6 +125,23 @@ -- Joost Yervante Damad Sun, 20 Jul 2008 18:34:25 +0200 +wireshark (1.0.2-1ubuntu1) intrepid; urgency=low + + [ Nathan Handler ] + * Replace gksu with menu in Recommends (LP: #209084) + * Add debian/README.source + + [ Michael Casadevall ] + * Corrected FTBFS on all architectures related to autotools and + config.guess/config.status by allowing a check to fail in some cases + + [ Scott Kitterman ] + * Remove 'Bump Standards-Version to 3.8.0' + - Recommended against in Ubuntu Policy + * Integrate changes from Nathan Handler and Michael Casadevall + + -- Scott Kitterman Wed, 17 Sep 2008 21:36:52 -0400 + wireshark (1.0.2-1) unstable; urgency=high * New upstream release 1.0.2 @@ -1519,7 +1576,7 @@ * compiled with SNMP support (through libsnmp) -- Frederic Peters Thu, 20 Jan 2000 18:30:40 +0100 - + ethereal (0.8.1-1) unstable; urgency=low * New upstream release. @@ -1563,13 +1620,13 @@ * New upstream release. -- Frederic Peters Sat, 14 Aug 1999 18:32:28 +0200 - + ethereal (0.7.1-1) unstable; urgency=low * New upstream release. -- Frederic Peters Sat, 7 Aug 1999 16:29:03 +0200 - + ethereal (0.6.3-2) unstable; urgency=low * Renamed NEWS to changelog since this is the upstream ChangeLog diff -u wireshark-1.0.6/debian/control wireshark-1.0.6/debian/control --- wireshark-1.0.6/debian/control +++ wireshark-1.0.6/debian/control @@ -1,7 +1,8 @@ Source: wireshark Section: net Priority: optional -Maintainer: Frederic Peters +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Frederic Peters Uploaders: Joost Yervante Damad Standards-Version: 3.8.0.1 Build-Depends: libgtk2.0-dev (>=2.4.0-0), libpcap0.8-dev, flex, libz-dev, dpatch, debhelper (>= 6), libtool, python, automake1.9, autoconf, autotools-dev, libadns1-dev, xsltproc, docbook-xsl (>= 1.64.1.0-0), libpcre3-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], bison, libgnutls-dev, python-support (>= 0.3), portaudio19-dev, libkrb5-dev, liblua5.1-0-dev @@ -26,7 +27,7 @@ Package: wireshark Architecture: any Depends: ${shlibs:Depends}, wireshark-common (= ${binary:Version}) -Recommends: gksu +Recommends: menu Replaces: ethereal (<< 1.0.0-3) Conflicts: ethereal (<< 1.0.0-3) Description: network traffic analyzer only in patch2: unchanged: --- wireshark-1.0.6.orig/debian/README.source +++ wireshark-1.0.6/debian/README.source @@ -0,0 +1,34 @@ +This package uses dpatch in order to apply patches to the upstream +source. +Patches are stored in debian/patches and their filenames usually end in +.dpatch . +For further details, see the man pages for dpatch and dpatch-edit-patch. + +All commands described below should be run from the top directory of the +package source tree, unless otherwise stated. + + * To generate the fully patched source, in a form ready for + editing, that would be built to create Debian packages, run: + + dpatch apply-all + + Note: This should happen automatically when you run + dpkg-source -x on a dpatch source package. + + * To modify the source and save those modifications so that + they will be applied when building the package, pick a + suitably informative patch file name, for example + 01_add_README.source_file.dpatch, and then run: + + dpatch-edit-patch 01_add_README.source_file.dpatch + + This will place you in a new shell in a temporary copy of the + source tree. Make your desired modifications to it, and then + exit the shell to create the patch file containing them (this + file will appear in debian/patches). + + * To remove source modifications that are currently being + applied when building the package, run: + + dpatch unapply-all +