URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5086c0e21d734612e12173acbee6a98b1a5df2ed
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark
Commits:
5086c0e by Gerald Combs (gerald@xxxxxxxxxxxxx):
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Cherry-picked from gf966980 with a lot of manual intervention.
Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102
Reviewed-on: https://code.wireshark.org/review/261
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 84e3498 [Automatic manuf, services and enterprise-numbers update for 2014-02-16]
adds 5086c0e Replace "svn" with "git" all over the place.
Summary of changes:
.gitignore | 2 +-
CMakeLists.txt | 39 +++++++-------
Makefile.am | 6 +--
Makefile.common | 6 +--
Makefile.nmake | 28 +++++-----
capinfos.c | 6 +--
config.nmake | 8 +--
doc/README.packaging | 2 +-
docbook/check_svn_version.sh | 15 ++++--
dumpcap.c | 10 ++--
editcap.c | 8 +--
epan/CMakeLists.txt | 2 +-
make-version.pl | 118 ++++++++++++++++++++++--------------------
mergecap.c | 6 +--
print.c | 2 +-
rawshark.c | 6 +--
reordercap.c | 4 +-
text2pcap.c | 10 ++--
tshark.c | 10 ++--
ui/gtk/about_dlg.c | 2 +-
ui/gtk/file_import_dlg.c | 2 +-
ui/gtk/main.c | 8 +--
ui/gtk/main_titlebar.c | 2 +-
ui/gtk/main_welcome.c | 2 +-
ui/gtk/summary_dlg.c | 2 +-
ui/qt/main.cpp | 8 +--
version_info.c | 12 ++---
version_info.h | 4 +-
28 files changed, 172 insertions(+), 158 deletions(-)