From 0c8ce5d611026656da57959a33a57367fbe08341 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 18 Sep 2010 21:20:34 -0500
Subject: Only match tags that start with v[0-9]*

Also ignore notrans.xml because it only contains our version
information.
---
 AndroidManifest.xml | 2 +-
 build.xml           | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bcc54c1..9c8fdb7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7.0"
-	android:versionCode="316"
+	android:versionCode="317"
 	android:installLocation="auto">
 
 	<application
diff --git a/build.xml b/build.xml
index 2b7c7f6..f34e303 100644
--- a/build.xml
+++ b/build.xml
@@ -345,7 +345,7 @@
         <apply executable="${dx}" failonerror="true" parallel="true">
             <arg value="--dex" />
             <arg value="--output=${intermediate.dex.file}" />
-	    <arg path="${out.classes.absolute.dir}" />
+            <arg path="${out.classes.absolute.dir}" />
             <fileset dir="${external.libs.absolute.dir}" includes="*.jar"/>
         </apply>
     </target>
@@ -546,9 +546,14 @@
         <xpath input="AndroidManifest.xml" expression="/manifest/@android:versionName"
                     output="manifest.version.name" />
 
+        <!-- checkout notrans.xml so we can ignore it in our index -->
+        <exec executable="git">
+            <arg line="checkout res/values/notrans.xml"/>
+        </exec>
+
         <!-- find out the description of the current Git commit -->
         <exec executable="git" outputproperty="git.revision">
-            <arg line="describe --dirty"/>
+            <arg line="describe --match 'v[0-9]*' --dirty"/>
         </exec>
 
         <replaceregexp file="${resource.absolute.dir}/values/notrans.xml" encoding="utf8" match='(\x3Cstring name="msg_version">)[^\x3C]*(\x3C/string>)'
-- 
cgit v1.2.3