[pkg-java] r4353 - trunk/rhino/debian

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2007-10-12 09:25:59 +0000 (Fri, 12 Oct 2007)
New Revision: 4353

Modified:
   trunk/rhino/debian/rules
Log:
Fix version handling.


Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2007-10-12 09:25:31 UTC (rev 4352)
+++ trunk/rhino/debian/rules	2007-10-12 09:25:59 UTC (rev 4353)
@@ -10,11 +10,16 @@
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar javadoc 
 
-PNAME=js
-BUILDDIR=build/rhino1_6R7
-JARFILE=${BUILDDIR}/${PNAME}.jar
-VERSION=1.6R7
+VERSION 	:= $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d'-' -f1)
+UVERSION	:= $(shell echo $(VERSION) | sed "s/\.R/R/")
+BUILDDIRVERSION	:= $(subst .,_,$(UVERSION))
 
+JARNAME=js
+BUILDDIR=build/rhino$(BUILDDIRVERSION)
+JARFILE=$(BUILDDIR)/$(JARNAME).jar
+
+JAVALIBDIR	= debian/rhino/usr/share/java
+
 clean::
 	rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/*
 	rm -rf build
@@ -29,8 +34,9 @@
 	mkdir -p toolsrc/org/mozilla/javascript/tools/debugger/downloaded
 	cp debian/src_from_treetable_article_see_bug409629/{AbstractCellEditor.java,JTreeTable.java,TreeTableModel.java,TreeTableModelAdapter.java} toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
 
-binary/rhino::
-	install -m 644 ${JARFILE} debian/rhino/usr/share/java/${PNAME}-${VERSION}.jar
+install/rhino::
+	mkdir -p $(JAVALIBDIR)
+	install -m 644 $(JARFILE) $(JAVALIBDIR)/$(JARNAME)-$(UVERSION).jar
 
-binary/rhino-doc::
-	mv ${BUILDDIR}/javadoc debian/rhino-doc/usr/share/doc/rhino-doc/apidocs
+install/rhino-doc::
+	mv $(BUILDDIR)/javadoc debian/rhino-doc/usr/share/doc/rhino-doc/apidocs