URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5f4468c4e002e885fc4d79d5b60ec2d5619b1c78
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.8
Repository: wireshark
Commits:
5f4468c 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 g5086c0e with some manual intervention.
Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102
Reviewed-on: https://code.wireshark.org/review/261
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit 5086c0e21d734612e12173acbee6a98b1a5df2ed)
Reviewed-on: https://code.wireshark.org/review/263
Actions performed:
from 6d66c80 [Automatic manuf, services and enterprise-numbers update for 2014-02-16]
adds 5f4468c Replace "svn" with "git" all over the place.
Summary of changes:
.gitignore | 2 +-
CMakeLists.txt | 35 +++++++-------
Makefile.am | 6 +--
Makefile.common | 6 +--
Makefile.nmake | 28 ++++++------
capinfos.c | 6 +--
config.nmake | 8 ++--
doc/README.packaging | 2 +-
docbook/check_svn_version.sh | 17 ++++---
dumpcap.c | 8 ++--
editcap.c | 8 ++--
make-version.pl | 104 ++++++++++++++++++++++--------------------
mergecap.c | 6 +--
print.c | 2 +-
rawshark.c | 4 +-
text2pcap.c | 6 +--
tshark.c | 8 ++--
ui/gtk/about_dlg.c | 2 +-
ui/gtk/file_import_dlg.c | 2 +-
ui/gtk/main.c | 6 +--
ui/gtk/main_titlebar.c | 2 +-
ui/gtk/main_welcome.c | 2 +-
ui/qt/main.cpp | 6 +--
version_info.c | 8 ++--
version_info.h | 4 +-
25 files changed, 151 insertions(+), 137 deletions(-)