[pkg-java] r15697 - trunk/libflexdock-java/debian

[Sylvestre Ledru]

Author: sylvestre
Date: 2012-01-13 20:21:32 +0000 (Fri, 13 Jan 2012)
New Revision: 15697

Modified:
   trunk/libflexdock-java/debian/changelog
   trunk/libflexdock-java/debian/control
   trunk/libflexdock-java/debian/rules
Log:
  * New upstream release
  * Switch to default-jdk for build dependency
  * Build the documentation all the time


Modified: trunk/libflexdock-java/debian/changelog
===================================================================
--- trunk/libflexdock-java/debian/changelog	2012-01-13 19:41:19 UTC (rev 15696)
+++ trunk/libflexdock-java/debian/changelog	2012-01-13 20:21:32 UTC (rev 15697)
@@ -1,3 +1,11 @@
+libflexdock-java (1.1.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch to default-jdk for build dependency
+  * Build the documentation all the time
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 13 Jan 2012 20:49:20 +0100
+
 libflexdock-java (1.1-1) unstable; urgency=low
 
   * New upstream release 

Modified: trunk/libflexdock-java/debian/control
===================================================================
--- trunk/libflexdock-java/debian/control	2012-01-13 19:41:19 UTC (rev 15696)
+++ trunk/libflexdock-java/debian/control	2012-01-13 20:21:32 UTC (rev 15697)
@@ -5,7 +5,7 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, 
- libskinlf-java, openjdk-6-jdk,
+ libskinlf-java, default-jdk,
  libjgoodies-looks-java, libx11-dev, quilt
 Standards-Version: 3.9.2
 Homepage: http://java.net/projects/flexdock/

Modified: trunk/libflexdock-java/debian/rules
===================================================================
--- trunk/libflexdock-java/debian/rules	2012-01-13 19:41:19 UTC (rev 15696)
+++ trunk/libflexdock-java/debian/rules	2012-01-13 20:21:32 UTC (rev 15697)
@@ -6,23 +6,18 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java/
-DEB_JARS             := ant-nodeps looks skinlf commons-logging
-DEB_ANT_BUILD_TARGET := build.with.native jar
-BUILDDIR 	     := build
+DEB_JARS             := ant-nodeps looks skinlf
+DEB_ANT_BUILD_TARGET := build.with.native jar doc
+BUILDDIR 	     	 := build
 DEB_COMPRESS_EXCLUDE := .sxw
 
-VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's/-dfsg.*//')
-
-build/libflexdock-java-doc::
-	ant doc
-
 install/libflexdock-java::
-	install -m 644 -D $(BUILDDIR)/flexdock-$(VERSION).jar debian/libflexdock-java/usr/share/java/flexdock-$(VERSION).jar
-	ln -s flexdock-$(VERSION).jar debian/libflexdock-java/usr/share/java/flexdock.jar
+	install -m 644 -D $(BUILDDIR)/flexdock-$(DEB_UPSTREAM_VERSION).jar debian/libflexdock-java/usr/share/java/flexdock-$(DEB_UPSTREAM_VERSION).jar
+	ln -s flexdock-$(DEB_UPSTREAM_VERSION).jar debian/libflexdock-java/usr/share/java/flexdock.jar
 
 install/libflexdock-java-demo::
-	install -m 644 -D $(BUILDDIR)/flexdock-demo-$(VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo-$(VERSION).jar
-	ln -s flexdock-demo-$(VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo.jar
+	install -m 644 -D $(BUILDDIR)/flexdock-demo-$(DEB_UPSTREAM_VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo-$(DEB_UPSTREAM_VERSION).jar
+	ln -s flexdock-demo-$(DEB_UPSTREAM_VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo.jar
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename