From f966980937abd4899a9c43329041bb00798ab18e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 7 Feb 2014 11:14:52 -0800 Subject: 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. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs --- mergecap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mergecap.c') diff --git a/mergecap.c b/mergecap.c index 578ab5e3d4..afc3bad29a 100644 --- a/mergecap.c +++ b/mergecap.c @@ -52,7 +52,7 @@ #include -#include "svnversion.h" +#include "version.h" #ifdef HAVE_FCNTL_H #include @@ -117,8 +117,8 @@ usage(gboolean is_error) } fprintf(output, "Mergecap %s" -#ifdef SVNVERSION - " (" SVNVERSION " from " SVNPATH ")" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" #endif "\n", VERSION); fprintf(output, "Merge two or more capture files into one.\n"); -- cgit v1.2.3