From a87b0d1b2ce28f1e8528a8481f7f630cc51b55e5 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Wed, 14 Nov 2012 00:02:54 +0100
Subject: [PATCH] Remove CVS revisions from --version output

---
 TODO                     | 2 --
 bin/xen-create-image     | 8 +-------
 bin/xen-create-nfs       | 8 +-------
 bin/xen-delete-image     | 9 +--------
 bin/xen-list-images      | 8 +-------
 bin/xen-update-image     | 8 +-------
 bin/xt-create-xen-config | 8 +-------
 bin/xt-customize-image   | 8 +-------
 bin/xt-install-image     | 8 +-------
 debian/changelog         | 1 +
 10 files changed, 9 insertions(+), 59 deletions(-)

diff --git a/TODO b/TODO
index 2f691ea..834a772 100644
--- a/TODO
+++ b/TODO
@@ -6,8 +6,6 @@ See KNOWN_BUGS for real bugs.
 Bugs to fix and features to add for 4.3
 ---------------------------------------
 
-Fix --version output: It still parses CVS keywords.
-
 Refactor TLS disabling. Seems to be happen twice, once in 20-setup-apt
 and once in 10-disable-tls.
 
diff --git a/bin/xen-create-image b/bin/xen-create-image
index 5df3afe..a2d69f1 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1761,13 +1761,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.192 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        logprint("xen-create-image release $RELEASE - CVS: $REVISION\n");
+        logprint("xen-create-image release $RELEASE\n");
         exit 0;
     }
 
diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs
index 0d8140d..4f72c6f 100755
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -324,13 +324,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.13 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        logprint("xen-create-nfs release $RELEASE - CVS: $REVISION\n");
+        logprint("xen-create-nfs release $RELEASE\n");
         exit;
     }
 }
diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index ad3320e..0ef4069 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -364,14 +364,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.41 $';
-
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xen-delete-image release $RELEASE - CVS: $REVISION\n";
+        print "xen-delete-image release $RELEASE\n";
         exit;
 
     }
diff --git a/bin/xen-list-images b/bin/xen-list-images
index a2b1c26..61e7dc9 100755
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -248,13 +248,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.30 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xen-list-images release $RELEASE - CVS: $REVISION\n";
+        print "xen-list-images release $RELEASE\n";
         exit;
     }
 }
diff --git a/bin/xen-update-image b/bin/xen-update-image
index 747f405..38152ad 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -463,13 +463,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.29 $';
-
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-        print "xen-update-image release $RELEASE - CVS: $REVISION\n";
+        print "xen-update-image release $RELEASE\n";
         exit;
 
     }
diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index 8ec6e60..9ef8bf2 100755
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -229,13 +229,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.47 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xt-create-xen-config release $RELEASE - CVS: $REVISION\n";
+        print "xt-create-xen-config release $RELEASE\n";
         exit;
     }
 }
diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index dcb3fd5..3eac374 100755
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -159,13 +159,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.33 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xt-customize-image release $RELEASE - CVS: $REVISION\n";
+        print "xt-customize-image release $RELEASE\n";
         exit;
     }
 }
diff --git a/bin/xt-install-image b/bin/xt-install-image
index b8ecddd..1495175 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -411,13 +411,7 @@ sub parseCommandLineArguments
 
     if ($VERSION)
     {
-        my $REVISION = '$Revision: 1.65 $';
-        if ( $REVISION =~ /1.([0-9.]+) / )
-        {
-            $REVISION = $1;
-        }
-
-        print "xt-install-image release $RELEASE - CVS: $REVISION\n";
+        print "xt-install-image release $RELEASE\n";
         exit;
     }
 }
diff --git a/debian/changelog b/debian/changelog
index 811a0b6..0a97b16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xen-tools (4.3.1+dev-1) UNRELEASED; urgency=low
     - Also recognize "M" and "G" instead of "MB" and "GB" as size unit for
       --memory. (Closes: #691320) Document the recognized units.
     - Default DomUs to use the noop scheduler (Closes: #693131)
+    - Remove CVS revisions from --version output
   * Add debian/gbp.conf to be able to to build xen-tools with
     git-buildpackage.
   * Install (manually generated) upstream ChangeLog only if it