[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2008/06/17 12:09 PM

Log:
 Manually apply revisions from the trunk (gasp!):
 ------------------------------------------------------------------------
 r25207 | stig | 2008-05-01 04:02:14 -0700 (Thu, 01 May 2008) | 6 lines
 Changed paths:
    M /trunk/gtk/main_proto_draw.c
 
 From Frederic Peters (bug 1735):
 Force foreground when background is forced.
 
 From me:
 Do the same for expert info's.
 
 ------------------------------------------------------------------------
 r25211 | stig | 2008-05-01 11:03:46 -0700 (Thu, 01 May 2008) | 2 lines
 Changed paths:
    M /trunk/gtk/expert_dlg.c
    M /trunk/gtk/main_proto_draw.c
    M /trunk/gtk/main_proto_draw.h
 
 Force foreground when background is forced in expert info dialogs.
 
 ------------------------------------------------------------------------
 r25212 | stig | 2008-05-01 11:26:01 -0700 (Thu, 01 May 2008) | 2 lines
 Changed paths:
    M /trunk/gtk/rtp_analysis.c
    M /trunk/gtk/voip_calls_dlg.c
 
 Force foreground when background is forced in RTP analysis and VOIP calls.
 
 ------------------------------------------------------------------------
 r25214 | jake | 2008-05-02 01:23:21 -0700 (Fri, 02 May 2008) | 4 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-e212.c
    M /trunk/epan/dissectors/packet-h264.c
    M /trunk/epan/t35.c
    M /trunk/gtk/capture_if_details_dlg_win32.c
 
 From Shinsuke SUZUKI:
 Since this leads to a compilation failure (Warning C4819: unexpected character
 in the current code page) on non-european Windows, I'd like you to avoid using
 non-ASCII characters in Wireshark code (even in comment).
 ------------------------------------------------------------------------
 r25373 | stig | 2008-05-23 07:51:17 -0700 (Fri, 23 May 2008) | 2 lines
 Changed paths:
    M /trunk/gtk/range_utils.c
 
 Print correct number of packets for captured "From first to last marked packet".
 
 ------------------------------------------------------------------------
 r25406 | jake | 2008-05-31 09:44:02 -0700 (Sat, 31 May 2008) | 4 lines
 Changed paths:
    D /trunk/debian/README.debian
    M /trunk/debian/changelog
    M /trunk/debian/compat
    M /trunk/debian/control
    D /trunk/debian/docs
    A /trunk/debian/headers-check.c
    D /trunk/debian/menu
    M /trunk/debian/patches/00list
    D /trunk/debian/patches/01_idl2deb.dpatch
    D /trunk/debian/patches/02_asn2deb.dpatch
    M /trunk/debian/patches/03_preferences.dpatch
    D /trunk/debian/patches/04_drop-capabilities.dpatch
    D /trunk/debian/patches/05_plugin-libdir.dpatch
    D /trunk/debian/patches/06_giop-buffer.dpatch
    D /trunk/debian/patches/07_gcc4.dpatch
    D /trunk/debian/patches/08_wireshark-desktop-menu.dpatch
    D /trunk/debian/patches/09_idl2wrs.dpatch
    D /trunk/debian/patches/10_wireshark_gen.dpatch
    D /trunk/debian/prerm
    M /trunk/debian/rules
    M /trunk/debian/tshark.manpages
    M /trunk/debian/wireshark-common.files
    M /trunk/debian/wireshark-common.manpages
    A /trunk/debian/wireshark-common.shlibs
    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
    D /trunk/debian/wireshark-dev.postinst
    M /trunk/debian/wireshark-dev.prerm
    M /trunk/debian/wireshark-root.desktop
    A /trunk/debian/wireshark.desktop
    M /trunk/debian/wireshark.files
    M /trunk/debian/wireshark.manpages
    M /trunk/debian/wireshark.menu
 
 Update Debian packaging files for Wireshark 1.0.
 These files build the package with all features and
 minimum changes from the released sources.
 
 ------------------------------------------------------------------------
 r25408 | jake | 2008-06-02 00:26:34 -0700 (Mon, 02 Jun 2008) | 2 lines
 Changed paths:
    M /trunk/debian/wireshark-root.desktop
    M /trunk/debian/wireshark.desktop
 
 Clean up desktop files based on changes made by Stig.
 
 ------------------------------------------------------------------------
 r25439 | jake | 2008-06-09 22:41:29 -0700 (Mon, 09 Jun 2008) | 4 lines
 
 From Joe Eykholt:
 The Fibre-channel FCP dissector shows the wrong byte as the response info
 response code byte.  The byte with offset 2 in the FCP frame is shown
 instead of byte 3 inside the response info.
 ------------------------------------------------------------------------
 r25462 | gerald | 2008-06-16 14:55:37 -0700 (Mon, 16 Jun 2008) | 4 lines
 
 Fix an off-by-one bug reported by David Ceccanti, as suggested by Guy at
 http://www.wireshark.org/lists/wireshark-users/200806/msg00077.html.
 Add a comment about the usage of gsm_sms_char_7bit_unpack().
 
 ------------------------------------------------------------------------
 r25466 | gerald | 2008-06-17 12:05:48 -0700 (Tue, 17 Jun 2008) | 3 lines
 
 Fully implement Guy's suggested fix. Rename ADDRBUF_MAX_MESSAGE_SIZE to
 MAX_ADDR_SIZE, to be more in line with a suggestion by Abhik Sarkar.
 
 ------------------------------------------------------------------------
 
 
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r25221 | jake | 2008-05-03 01:31:50 -0700 (Sat, 03 May 2008) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-bvlc.c
 
 From Steve Karg:
 Corrected packet-bvlc.c dissector which was not decoding BACnet BVLC NAK result
 code text correctly.
 ------------------------------------------------------------------------
 r25223 | wmeier | 2008-05-03 15:33:51 -0700 (Sat, 03 May 2008) | 2 lines
 Changed paths:
    M /trunk/print.c
 
 Fix for bug #2518: 'tshark -Tfields -e data' Omits Last Character of Data
 
 ------------------------------------------------------------------------
 r25351 | stig | 2008-05-22 03:34:32 -0700 (Thu, 22 May 2008) | 3 lines
 Changed paths:
    M /trunk/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj
 
 Set SYMROOT to make osx-package work correctly on my computers.
 Hopefully this will not break the buildbot.
 
 ------------------------------------------------------------------------
 r25409 | stig | 2008-06-02 00:32:55 -0700 (Mon, 02 Jun 2008) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-bacapp.c
 
 From Rudolf Weidmann (bug 2583):
 Fixed enumeration type for new-mode in change-of-life-safety.
 
 ------------------------------------------------------------------------
 r25410 | stig | 2008-06-02 10:17:24 -0700 (Mon, 02 Jun 2008) | 2 lines
 Changed paths:
    M /trunk/capture.c
 
 Don't include \r in linktype on win32, it looks weird in the combo box.
 
 ------------------------------------------------------------------------
 r25415 | jake | 2008-06-03 13:41:12 -0700 (Tue, 03 Jun 2008) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ifcp.c
 
 From Frank Schorr:
 RFC 4172 section 5.3.1 shows a chart of the iFCP encapsulated Header Format.
 It says that bytes 4-7 MUST be zeros.  In reality most vendors are putting some
 information in these 4 bytes, particularly Nishon. This caused almost all iFCP
 packets to not be decoded for this vendor.
 
 ------------------------------------------------------------------------
 r25416 | jake | 2008-06-03 14:24:25 -0700 (Tue, 03 Jun 2008) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ifcp.c
 
 From Frank Schorr:
 The get_ifcp_pdu_len() call used for the tcp_dissect_pdus() call does not mask
 off the frame length properly.  The result is that the "Flags" field
 incorrectly becomes the high order part of the Frame Length.
 
 ------------------------------------------------------------------------
 r25442 | jake | 2008-06-11 11:20:02 -0700 (Wed, 11 Jun 2008) | 3 lines
 
 Fix for bug 2396:
 Wireshark expects 802.1ah Instance tags to have ethernet type 0x88f0, but latest 
 802.1ah draft 4.1 defines the 802.1ah Instance tag ethernet type to 0x88e7.
 ------------------------------------------------------------------------
 r25448 | guy | 2008-06-12 22:54:22 -0700 (Thu, 12 Jun 2008) | 2 lines
 
 Fix list of files in the debian directory.
 
 ------------------------------------------------------------------------
 r25451 | stig | 2008-06-14 09:45:06 -0700 (Sat, 14 Jun 2008) | 3 lines
 
 Save the column width in the recent list on every change so we can
 pick the correct width when changing the time precision.
 
 ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.0/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/
  Changes    Path               Action
  +3 -0      project.pbxproj    Modified

Directory: /trunk-1.0/debian/
  Changes    Path                          Action
  +3 -1298   changelog                     Modified
  +1 -1      compat                        Modified
  +5 -56     control                       Modified
  +4 -0      headers-check.c               Added
  +0 -4      prerm                         Removed
  +44 -49    rules                         Modified
  +1 -1      tshark.manpages               Modified
  +3 -1      wireshark-common.files        Modified
  +3 -1      wireshark-common.manpages     Modified
  +2 -0      wireshark-common.shlibs       Added


(45 files not shown)