[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/03/08 11:01 AM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r47786 | gerald | 2013-02-20 16:55:25 -0800 (Wed, 20 Feb 2013) | 2 lines
   Changed paths:
      M /trunk/packaging/nsis/uninstall.nsi
 
   Pop into the correct variable.
   ------------------------------------------------------------------------
   r47788 | gerald | 2013-02-20 17:03:47 -0800 (Wed, 20 Feb 2013) | 2 lines
   Changed paths:
      M /trunk/packaging/nsis/wireshark.nsi
 
   Remove vcredist_??.exe when we're done with it.
   ------------------------------------------------------------------------
   r48196 | gerald | 2013-03-08 10:23:58 -0800 (Fri, 08 Mar 2013) | 5 lines
   Changed paths:
      M /trunk/packaging/nsis/uninstall.nsi
      M /trunk/packaging/nsis/wireshark.nsi
      M /trunk/packaging/nsis/x64.nsh
 
   Add /SD defaults to every MessageBox call (even if they're commented
   out). Fixes bug 8451.
 
   Don't yell at the user so much.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r47758 | gerald | 2013-02-19 17:19:42 -0800 (Tue, 19 Feb 2013) | 5 lines
   Changed paths:
      M /trunk/capinfos.c
      M /trunk/dumpcap.c
      M /trunk/editcap.c
      M /trunk/mergecap.c
      M /trunk/packaging/nsis/wireshark.nsi
      M /trunk/randpkt.c
      M /trunk/rawshark.c
      M /trunk/text2pcap.c
      M /trunk/tshark.c
      M /trunk/ui/gtk/main.c
      M /trunk/ui/qt/main.cpp
      M /trunk/wsutil/file_util.c
      M /trunk/wsutil/file_util.h
      M /trunk/wsutil/libwsutil.def
 
   When any of our executables start on Windows create or open a "Wireshark
   is running" mutex. Have the NSIS installer check for this mutex and ask
   the user to close Wireshark if it's found. While not perfect this makes
   the WinSparkle update process much less annoying.
   ------------------------------------------------------------------------
   r47773 | gerald | 2013-02-20 11:58:55 -0800 (Wed, 20 Feb 2013) | 6 lines
   Changed paths:
      M /trunk/packaging/nsis/wireshark.nsi
      M /trunk/wsutil/file_util.c
 
   As http://www.jrsoftware.org/iskb.php?mutexsessions points out, a session
   mutex may not be visible to other sessions and we may not be able to
   create a global mutex. Try to create both, and make each one accessible
   to all users. Update the NSIS installer to check for both global and
   session mutexes.
   ------------------------------------------------------------------------
   r47785 | gerald | 2013-02-20 15:59:49 -0800 (Wed, 20 Feb 2013) | 6 lines
   Changed paths:
      M /trunk/packaging/nsis/common.nsh
      M /trunk/packaging/nsis/uninstall.nsi
      M /trunk/packaging/nsis/wireshark.nsi
 
   Move the Wireshark-is-running check to a common macro and call it in
   both the installer and uninstaller. Roll the .exe removal code into a
   loop and add missing executables.
 
   Add modelines and adjust accordingly.
   ------------------------------------------------------------------------
   r48196 | gerald | 2013-03-08 10:23:58 -0800 (Fri, 08 Mar 2013) | 5 lines
   Changed paths:
      M /trunk/packaging/nsis/uninstall.nsi
      M /trunk/packaging/nsis/wireshark.nsi
      M /trunk/packaging/nsis/x64.nsh
 
   Add /SD defaults to every MessageBox call (even if they're commented
   out). Fixes bug 8451.
 
   Don't yell at the user so much.
   ------------------------------------------------------------------------
 
 Note: This changes the API on Windows.
 
 Update the release notes.

Directory: /trunk-1.8/docbook/
  Changes    Path                 Action
  +10 -0     release-notes.xml    Modified

Directory: /trunk-1.8/ui/gtk/
  Changes    Path          Action
  +1 -0      main.c        Modified

Directory: /trunk-1.8/packaging/nsis/
  Changes    Path             Action
  +41 -1     common.nsh       Modified
  +44 -17    uninstall.nsi    Modified
  +20 -4     wireshark.nsi    Modified
  +1 -1      x64.nsh          Modified

Directory: /trunk-1.8/
  Changes    Path           Action
  +1 -0      capinfos.c     Modified
  +1 -2      dumpcap.c      Modified
  +2 -0      editcap.c      Modified
  +1 -0      mergecap.c     Modified
  +1 -0      randpkt.c      Modified


(6 files not shown)