[pkg-java] r5670 - trunk/cdk/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-02-10 22:14:58 +0000 (Sun, 10 Feb 2008)
New Revision: 5670

Modified:
   trunk/cdk/debian/changelog
   trunk/cdk/debian/rules
Log:
* Use java-gcj-compat-dev instead of kaffe.
* Use $(DEB_UPSTREAM_VERSION) and reduce usage of variables in debian/rules.


Modified: trunk/cdk/debian/changelog
===================================================================
--- trunk/cdk/debian/changelog	2008-02-10 22:07:52 UTC (rev 5669)
+++ trunk/cdk/debian/changelog	2008-02-10 22:14:58 UTC (rev 5670)
@@ -3,10 +3,12 @@
   * New upstream version.
   * Added watch file.
   * Moved debhelper and cdbs from Build-Depends-Indep to Build-Depends.
+  * Use java-gcj-compat-dev instead of kaffe.
   * Made Debian Java Maintainers the maintaine of the package and moved Daniel
     Leidert to Uploaders and also added myself.
   * In debian/control use ${source:Version} instead of ${Source-Version}.
   * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+  * Use $(DEB_UPSTREAM_VERSION) and reduce usage of variables in debian/rules.
   * Updated Standards-Version to 3.7.3.
   * Updated debhelper compat level to 5.
 

Modified: trunk/cdk/debian/rules
===================================================================
--- trunk/cdk/debian/rules	2008-02-10 22:07:52 UTC (rev 5669)
+++ trunk/cdk/debian/rules	2008-02-10 22:14:58 UTC (rev 5670)
@@ -2,9 +2,9 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 DEB_JARS := \
 	ant-nodeps \
@@ -21,9 +21,6 @@
 # Additional command-line arguments for Ant
 ANT_ARGS := -verbose -Dbuild.sysclasspath=first 
 
-LIBRARY_PACKAGE := cdk
-API_VERSION     := 0.99.1
-
 COMPONENTS := \
 	applications \
 	builder3d \
@@ -46,16 +43,16 @@
 	structgen \
 	swing 
 
-build/$(LIBRARY_PACKAGE)::
+build/cdk::
 	# Make manpages.
 	@cd debian/cdk-manpages && for mxml in "*.xml"; do \
 		xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $$mxml; \
 	done
 
-install/lib$(LIBRARY_PACKAGE)-java::
+install/libcdk-java::
 	for COMPONENT in $(COMPONENTS); do \
-		install -m 644 dist/jar/$(LIBRARY_PACKAGE)-$$COMPONENT.jar \
-			debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$$COMPONENT-$(API_VERSION).jar; \
-		ln -s $(LIBRARY_PACKAGE)-$$COMPONENT-$(API_VERSION).jar \
-			debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$$COMPONENT.jar; \
+		install -m 644 dist/jar/cdk-$$COMPONENT.jar \
+			debian/libcdk-java/usr/share/java/cdk-$$COMPONENT-$(DEB_UPSTREAM_VERSION).jar; \
+		ln -s cdk-$$COMPONENT-$(DEB_UPSTREAM_VERSION).jar \
+			debian/libcdk-java/usr/share/java/cdk-$$COMPONENT.jar; \
 	done