Wireshark-commits: [Wireshark-commits] master 44eda0c: CPack: WiX updates.

Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 1 Jan 2016 01:00:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=44eda0c64e7365196aed5f2166b33baaac16a45f
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

44eda0c by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CPack: WiX updates.
    
    WiX prefers rich text license files. Add an RTF version of the GPLv2. It
    was created by converting the "standalone HTML" version of the license at
    
      http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
    
    to RTF using Pandoc 1.11.
    
    Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add
    a WiX section.
    
    Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa
    Reviewed-on: https://code.wireshark.org/review/12980
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  146c4b7   uat: Fix warnings [-Wcast-qual]
    adds  44eda0c   CPack: WiX updates.


Summary of changes:
 CPackConfig.txt           |   47 ++++++++++++++++-----
 packaging/wix/gpl-2.0.rtf |  101 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 11 deletions(-)
 create mode 100644 packaging/wix/gpl-2.0.rtf