[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 52ba63593be7ef75193c74722b9cb7b2cc27bf79
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Jun 26 19:02:01 2009 +0300

    Generate proper version numbers for git (bb #1644).

diff --git a/libclamav/Makefile.am b/libclamav/Makefile.am
index d67dc5d..7be9f79 100644
--- a/libclamav/Makefile.am
+++ b/libclamav/Makefile.am
@@ -306,15 +306,15 @@ version.h: version.h.tmp
 version.h.tmp:
 	@test -f version.h || touch version.h;\
 	rm -f $@;\
-	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
-	if test $$REVISION = "exported"; then\
-		REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
-		if test -n "$$REVISION"; then\
-			REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
-		fi;\
+	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
+	if test $$? -ne 0; then\
+	   REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
+	   if test "$$REVISION" = "exported"; then\
+	    REVISION="";\
+	   fi;\
 	fi;\
 	if test -n "$$REVISION"; then\
-		echo "#define REPO_VERSION \"devel-r$$REVISION\"" >> $@;\
+		echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\
 	else\
 		touch version.h.tmp;\
 	fi
diff --git a/libclamav/Makefile.in b/libclamav/Makefile.in
index 3e3cadb..1f87348 100644
--- a/libclamav/Makefile.in
+++ b/libclamav/Makefile.in
@@ -1753,15 +1753,15 @@ version.h: version.h.tmp
 version.h.tmp:
 	@test -f version.h || touch version.h;\
 	rm -f $@;\
-	REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
-	if test $$REVISION = "exported"; then\
-		REVISION="$$(LANG=C cd "$(top_srcdir)"; git svn info configure 2>/dev/null| awk '/Revision:/ { print $$2 }' || echo)";\
-		if test -n "$$REVISION"; then\
-			REVISION="$$REVISION-$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
-		fi;\
+	REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\
+	if test $$? -ne 0; then\
+	   REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\
+	   if test "$$REVISION" = "exported"; then\
+	    REVISION="";\
+	   fi;\
 	fi;\
 	if test -n "$$REVISION"; then\
-		echo "#define REPO_VERSION \"devel-r$$REVISION\"" >> $@;\
+		echo "#define REPO_VERSION \"devel-$$REVISION\"" >> $@;\
 	else\
 		touch version.h.tmp;\
 	fi

-- 
Debian repository for ClamAV