[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=22247

User: gerald
Date: 2007/07/05 04:23 PM

Log:
 Copy over more revisions from the trunk.  This should be the last of them.
 
 ------------------------------------------------------------------------
 r22149 | gal | 2007-06-21 09:50:16 -0700 (Thu, 21 Jun 2007) | 3 lines
 Changed paths:
    M /trunk/asn1/x411/packet-x411-template.c
    M /trunk/asn1/x411/x411.cnf
    M /trunk/epan/dissectors/packet-x411.c
 
 New preference to specify the tcp port to use for P1 and fix to include /OU= in dissected X.400 addresses.
 ------------------------------------------------------------------------
 r22209 | gal | 2007-06-27 11:03:23 -0700 (Wed, 27 Jun 2007) | 5 lines
 Changed paths:
    M /trunk/asn1/x411/x411.cnf
    M /trunk/epan/dissectors/packet-x411.c
 
 This patch will set correct extension_id for ExtensionAttributeType
 (error introduced in r22043), and fix printing of CAP values in
 oraddress (error introduced in r22054).
 ------------------------------------------------------------------------
 r22220 | jake | 2007-06-28 12:03:47 -0700 (Thu, 28 Jun 2007) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-bacapp.c
 
 Fix for bug 1669:
 Don't ditch the returned offset.
 ------------------------------------------------------------------------
 r22237 | gerald | 2007-07-03 17:53:03 -0700 (Tue, 03 Jul 2007) | 2 lines
 Changed paths:
    M /trunk/packaging/nsis/Makefile.am
    M /trunk/packaging/nsis/Makefile.nmake
    D /trunk/packaging/nsis/WinPcap_4_0.exe
    A /trunk/packaging/nsis/WinPcap_4_0_1.exe
    M /trunk/packaging/nsis/wireshark.nsi
    M /trunk/packaging/u3/win32/makefile.nmake
    M /trunk/packaging/u3/win32/u3util.c
 
 Switch to WinPcap 4.0.1.
 ------------------------------------------------------------------------
 r22238 | jake | 2007-07-04 00:22:57 -0700 (Wed, 04 Jul 2007) | 2 lines
 Changed paths:
    M /trunk/debian/changelog
    M /trunk/debian/control
    M /trunk/debian/copyright
    M /trunk/debian/patches/00list
    M /trunk/debian/patches/01_idl2deb.dpatch
    M /trunk/debian/patches/02_asn2deb.dpatch
    M /trunk/debian/patches/03_preferences.dpatch
    M /trunk/debian/patches/04_drop-capabilities.dpatch
    M /trunk/debian/patches/05_plugin-libdir.dpatch
    M /trunk/debian/patches/06_giop-buffer.dpatch
    M /trunk/debian/patches/07_gcc4.dpatch
    D /trunk/debian/patches/08_ethereal-desktop-menu.dpatch
    M /trunk/debian/patches/08_wireshark-desktop-menu.dpatch
    D /trunk/debian/patches/09_idl2eth.dpatch
    M /trunk/debian/patches/09_idl2wrs.dpatch
    D /trunk/debian/patches/10_ethereal_gen.dpatch
    D /trunk/debian/patches/11_diameter_vendors.dpatch
    A /trunk/debian/pycompat
    A /trunk/debian/pyversions
    M /trunk/debian/rules
    M /trunk/debian/tshark.files
    M /trunk/debian/tshark.manpages
    M /trunk/debian/wireshark-common.files
    M /trunk/debian/wireshark-common.manpages
    M /trunk/debian/wireshark-dev.docs
    M /trunk/debian/wireshark-dev.files
    M /trunk/debian/wireshark-dev.header-files
    M /trunk/debian/wireshark-dev.manpages
    M /trunk/debian/wireshark-dev.postinst
    M /trunk/debian/wireshark-dev.prerm
    M /trunk/debian/wireshark-root.desktop
    M /trunk/debian/wireshark.files
    M /trunk/debian/wireshark.manpages
    M /trunk/debian/wireshark.menu
 
 From Frederic Peters:
 Update of de Debian Packaging files from 0.99.2 to 0.99.6pre1.
 ------------------------------------------------------------------------

Directory: /trunk-0.99.6/debian/
  Changes    Path                          Action
  +132 -0    changelog                     Modified
  +68 -13    control                       Modified
  +2 -2      copyright                     Modified
  +1 -0      pycompat                      Added
  +1 -0      pyversions                    Added
  +3 -1      rules                         Modified
  +0 -7      tshark.files                  Modified
  +1 -4      tshark.manpages               Modified
  +1 -24     wireshark-common.files        Modified
  +1 -14     wireshark-common.manpages     Modified
  +1 -16     wireshark-dev.docs            Modified


(34 files not shown)