[cdk] 12/62: * Use java-gcj-compat-dev instead of kaffe. * Use $(DEB_UPSTREAM_VERSION) and reduce usage of variables in debian/rules.

[Emmanuel Bourg]

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

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

commit ca4a9fdb507c0a36d2641c4a24562887621ecdc8
Author: Michael Koch <konqueror at gmx.de>
Date:   Sun Feb 10 22:14:58 2008 +0000

    * Use java-gcj-compat-dev instead of kaffe.
    * Use $(DEB_UPSTREAM_VERSION) and reduce usage of variables in debian/rules.
---
 debian/changelog |  2 ++
 debian/rules     | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d25c77..d2f8d18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ cdk (1:1.0.1-1) UNRELEASED; urgency=low
   * 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.
 
diff --git a/debian/rules b/debian/rules
index c208746..e71e629 100644
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ DEB_ANT_BUILD_TARGET := dist-all
 # 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 @@ COMPONENTS := \
 	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

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