Have a single obvious location for specifing the package version

svn path=/projects/java-config-2/trunk/; revision=9197

4 files changed, 6 insertions, 13 deletions

diff --git a/src/depend-java-query b/src/depend-java-query
index 6361522..a184be5 100755
--- a/src/depend-java-query
+++ b/src/depend-java-query
@@ -5,7 +5,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-from java_config_2 import __version__
 from java_config_2.OutputFormatter import OutputFormatter
 from java_config_2.EnvironmentManager import EnvironmentManager
 from java_config_2.Errors import *
@@ -17,7 +16,7 @@ import sys
 from optparse import OptionParser, make_option, OptionValueError
 
 def version(option, opt, value, parser):
-     printer._print("%H%BJava Dep Query Utility %GVersion " + str(__version__))
+     printer._print("%H%BJava Dep Query Utility %GVersion @PACKAGE_VERSION@")
      raise SystemExit()
 
 def nocolor(option, opt, value, parser):
@@ -69,7 +68,7 @@ if __name__ == '__main__':
     verman = VersionManager(manager)
 
     usage =  "depend-java-query [options]\n\n"
-    usage += "Java Dep Query Utility Version " + str(__version__) + "\n"
+    usage += "Java Dep Query Utility Version @PACKAGE_VERSION@\n"
     usage += "Copyright 2004-2006 Gentoo Foundation\n"
     usage += "Distributed under the terms of the GNU General Public License v2\n"
     usage += "Please contact the Gentoo Java Herd <java@gentoo.org> with problems."
diff --git a/src/gjl b/src/gjl
index 8a9fd88..3988e1a 100755
--- a/src/gjl
+++ b/src/gjl
@@ -4,7 +4,6 @@
 # Copyright 2004-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from java_config_2 import __version__
 from java_config_2.OutputFormatter import *
 from java_config_2.EnvironmentManager import *
 from java_config_2.VersionManager import *
@@ -85,7 +84,7 @@ def normpath(mypath):
 
 if __name__ == '__main__':
     usage =  "%prog [options]\n\n"
-    usage += "Java Utility Version " + str(__version__) + "\n"
+    usage += "Java Utility Version @PACKAGE_VERSION@\n"
     usage += "Copyright 2004-2005 Gentoo Foundation\n"
     usage += "Distributed under the terms of the GNU General Public License v2\n"
     usage += "Please contact the Gentoo Java Herd <java@gentoo.org> with problems."
diff --git a/src/java-config-2 b/src/java-config-2
index d26b045..8ad2539 100755
--- a/src/java-config-2
+++ b/src/java-config-2
@@ -5,7 +5,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-from java_config_2 import __version__
 from java_config_2.OutputFormatter import OutputFormatter
 from java_config_2.EnvironmentManager import EnvironmentManager
 from java_config_2.Errors import *
@@ -22,7 +21,7 @@ except ImportError:
 from optparse import OptionParser, OptionGroup
 
 def version(option, opt, value, parser):
-    printer._print("%H%BJava Configuration Utility %GVersion " + str(__version__))
+    printer._print("%H%BJava Configuration Utility %GVersion @PACKAGE_VERSION@")
     raise SystemExit()
 
 def nocolor(option, opt, value, parser):
@@ -321,7 +320,7 @@ if __name__ == '__main__':
     manager = EnvironmentManager(os.getenv('ROOT', ''), os.getenv('EPREFIX', '@GENTOO_PORTAGE_EPREFIX@'))
 
     usage =  "java-config [options]\n\n"
-    usage += "Java Configuration Utility Version " + str(__version__) + "\n"
+    usage += "Java Configuration Utility Version @PACKAGE_VERSION@\n"
     usage += "Copyright 2004-2013 Gentoo Foundation\n"
     usage += "Distributed under the terms of the GNU General Public License v2\n"
     usage += "Please contact the Gentoo Java Herd <java@gentoo.org> with problems."
diff --git a/src/java_config_2/__init__.py b/src/java_config_2/__init__.py
index b2e50bf..b30192a 100644
--- a/src/java_config_2/__init__.py
+++ b/src/java_config_2/__init__.py
@@ -1,5 +1 @@
-'''
-java-config support files
-'''
-
-__version__ = '2.1.12'
+__version__ = '@PACKAGE_VERSION@'