[pkg-java] r3896 - trunk/plexus-i18n/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-07-20 23:39:07 +0000 (Fri, 20 Jul 2007)
New Revision: 3896

Modified:
   trunk/plexus-i18n/debian/control
   trunk/plexus-i18n/debian/rules
Log:
Preserve upstream version number - only the license has changed

Modified: trunk/plexus-i18n/debian/control
===================================================================
--- trunk/plexus-i18n/debian/control	2007-07-20 23:30:20 UTC (rev 3895)
+++ trunk/plexus-i18n/debian/control	2007-07-20 23:39:07 UTC (rev 3896)
@@ -12,7 +12,7 @@
 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.
  .

Modified: trunk/plexus-i18n/debian/rules
===================================================================
--- trunk/plexus-i18n/debian/rules	2007-07-20 23:30:20 UTC (rev 3895)
+++ trunk/plexus-i18n/debian/rules	2007-07-20 23:39:07 UTC (rev 3896)
@@ -6,6 +6,7 @@
 
 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 @@
 			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 @@
 	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