[pkg-java] r10666 - trunk/libjibx-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-27 18:28:40 +0000 (Sun, 27 Sep 2009)
New Revision: 10666

Removed:
   trunk/libjibx-java/debian/install
   trunk/libjibx-java/debian/links
Modified:
   trunk/libjibx-java/debian/rules
Log:
reworked debian/rules

Deleted: trunk/libjibx-java/debian/install
===================================================================
--- trunk/libjibx-java/debian/install	2009-09-27 18:11:12 UTC (rev 10665)
+++ trunk/libjibx-java/debian/install	2009-09-27 18:28:40 UTC (rev 10666)
@@ -1,3 +0,0 @@
-lib/jibx-bind-1.0.2.jar usr/share/java
-lib/jibx-run-1.0.2.jar usr/share/java
-lib/jibx-extras-1.0.2.jar usr/share/java

Deleted: trunk/libjibx-java/debian/links
===================================================================
--- trunk/libjibx-java/debian/links	2009-09-27 18:11:12 UTC (rev 10665)
+++ trunk/libjibx-java/debian/links	2009-09-27 18:28:40 UTC (rev 10666)
@@ -1,3 +0,0 @@
-usr/share/java/jibx-bind-1.0.2.jar usr/share/java/jibx-bind.jar
-usr/share/java/jibx-run-1.0.2.jar usr/share/java/jibx-run.jar
-usr/share/java/jibx-extras-1.0.2.jar usr/share/java/jibx-extras.jar

Modified: trunk/libjibx-java/debian/rules
===================================================================
--- trunk/libjibx-java/debian/rules	2009-09-27 18:11:12 UTC (rev 10665)
+++ trunk/libjibx-java/debian/rules	2009-09-27 18:28:40 UTC (rev 10666)
@@ -5,15 +5,21 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
 DEB_BUILDDIR         := build
 DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
 
-LIBRARY=jibx
-VERSION=1.0.2
+clean:: 
+	-rm -fr build/api build/classes lib/*
 
-clean:: 
-	-rm -fr build/classes/* build/docs/* lib/*
+install/libjibx-java::
+	dh_install -plibjibx-java lib/jibx-bind.jar usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibjibx-java lib/jibx-extras.jar usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibjibx-java lib/jibx-run.jar usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibjibx-java lib/jibx-schema.jar usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar
+	dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar
+	dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar
+	dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar