r2325 - trunk/libtoolbar-java/debian

[Arnaud Vandyck]

Author: avdyk
Date: 2006-08-03 14:24:19 +0000 (Thu, 03 Aug 2006)
New Revision: 2325

Added:
   trunk/libtoolbar-java/debian/ant.properties
Modified:
   trunk/libtoolbar-java/debian/changelog
   trunk/libtoolbar-java/debian/control
   trunk/libtoolbar-java/debian/rules
Log:
libtoolbar-java (1.3-1) unstable; urgency=low

  * New upstream release
  * Standards-Version updated to 3.7.2; put cdbs and debhelper in
    Build-Dependency
  * Build with java-gcj-compat-dev
  * debian/rules: removed ant-launcher from classpath

 -- Arnaud Vandyck <avdyk at debian.org>  Thu,  3 Aug 2006 16:08:16 +0200

Added: trunk/libtoolbar-java/debian/ant.properties
===================================================================
--- trunk/libtoolbar-java/debian/ant.properties	2006-08-03 11:40:39 UTC (rev 2324)
+++ trunk/libtoolbar-java/debian/ant.properties	2006-08-03 14:24:19 UTC (rev 2325)
@@ -0,0 +1,2 @@
+basedir=.
+src=.

Modified: trunk/libtoolbar-java/debian/changelog
===================================================================
--- trunk/libtoolbar-java/debian/changelog	2006-08-03 11:40:39 UTC (rev 2324)
+++ trunk/libtoolbar-java/debian/changelog	2006-08-03 14:24:19 UTC (rev 2325)
@@ -1,3 +1,13 @@
+libtoolbar-java (1.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Standards-Version updated to 3.7.2; put cdbs and debhelper in
+    Build-Dependency
+  * Build with java-gcj-compat-dev
+  * debian/rules: removed ant-launcher from classpath
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Thu,  3 Aug 2006 16:08:16 +0200
+
 libtoolbar-java (1.1.0-2) unstable; urgency=low
 
   * kaffe compiler transition

Modified: trunk/libtoolbar-java/debian/control
===================================================================
--- trunk/libtoolbar-java/debian/control	2006-08-03 11:40:39 UTC (rev 2324)
+++ trunk/libtoolbar-java/debian/control	2006-08-03 14:24:19 UTC (rev 2325)
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, ant, cdbs
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ant
+Standards-Version: 3.7.2
 
 Package: libtoolbar-java
 Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Suggests: java-virtual-machine
 Description: extension of java swing component JToolBar
  Toolbar's mission is to extend and improve upon the standard swing

Modified: trunk/libtoolbar-java/debian/rules
===================================================================
--- trunk/libtoolbar-java/debian/rules	2006-08-03 11:40:39 UTC (rev 2324)
+++ trunk/libtoolbar-java/debian/rules	2006-08-03 14:24:19 UTC (rev 2325)
@@ -5,20 +5,20 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_BUILDFILE := debian/build.xml
+#DEB_JARS := 
+#DEB_ANT_BUILDFILE := debian/build.xml
 
 DEB_ANT_BUILD_TARGET   := jar
 #DEB_ANT_TEST_TARGET    :=
 #DEB_ANT_CLEAN_TARGET   := clean
 
 LIBRARY_PACKAGE := toolbar
-API_VERSION     := 1.1.0
+API_VERSION     := 1.3
 
 install/lib$(LIBRARY_PACKAGE)-java::
-	install -m 644 dist/$(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
+	install -m 644 build/$(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
 	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE).jar