[plexus-i18n] 07/31: Preserve upstream version number - only the license has changed

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-i18n.

commit e0729460bb2c51d4964641261e14b45bbe4986c0
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Fri Jul 20 23:39:07 2007 +0000

    Preserve upstream version number - only the license has changed
---
 debian/control | 2 +-
 debian/rules   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 378fd57..bd9f18e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Architecture: all
 Section: libs
 Depends: libplexus-container-default-java, libplexus-utils-java
 Suggests: libplexus-i18n-java-doc
-Description: a component to support internationalization  of applications using Plexus
+Description: a component to support internationalization of applications using Plexus
  Plexus I18n is a set of Plexus-components supporting internationalization of
  Plexus-based applications.
  .
diff --git a/debian/rules b/debian/rules
index 1210591..d45fd7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g")
+PLAIN_VERSION        := $(shell echo "$$VERSION" | sed 's/-+svn.*//')
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 \
@@ -15,7 +16,7 @@ DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-tra
 			ant-junit.jar
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
-DEB_ANT_ARGS         := -DartfiactId=$(PACKAGE) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS         := -DartfiactId=$(PACKAGE) -Dpackage=$(PACKAGE) -Dversion=$(PLAIN_VERSION)
 API_DOCS             := build/api
 #SVN                  := http://svn.codehaus.org/plexus/tags/plexus-i18n-$(VERSION)
 SVN_REV              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/.*+svn//' | sed 's/-.*//')
@@ -31,8 +32,8 @@ get-orig-source:
 	rm -rf orig_tmp
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar usr/share/java
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
+	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(PLAIN_VERSION).jar usr/share/java
+	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(PLAIN_VERSION).jar usr/share/java/$(PACKAGE).jar
 
 binary-post-install/lib$(PACKAGE)-java-doc::
 	mv build/javadoc build/api

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-i18n.git