[pkg-java] r4853 - trunk/libjdic-java/debian

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-11-27 04:27:22 +0000 (Tue, 27 Nov 2007)
New Revision: 4853

Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/control
   trunk/libjdic-java/debian/docs
   trunk/libjdic-java/debian/libjdic-bin.install
   trunk/libjdic-java/debian/rules
Log:
* debian/rules:
  + Don't use ant.mk
  + Separate out build-indep and build-arch for libjdic-java and
  libjdic-bin packages.
* Fix paths in docs, libjdic-bin.install files.
* debian/control:
  + Move sun-java5-jdk, libnetx-java to Build-Depends-Indep
  + Switch back to Architecture: any for libjdic-bin
  + Move libjdic-bin to Depends from Recommends

Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2007-11-26 19:42:12 UTC (rev 4852)
+++ trunk/libjdic-java/debian/changelog	2007-11-27 04:27:22 UTC (rev 4853)
@@ -1,3 +1,17 @@
+libjdic-java (0.0.20060613-6) unstable; urgency=low
+
+  * debian/rules:
+    + Don't use ant.mk
+    + Separate out build-indep and build-arch for libjdic-java and
+    libjdic-bin packages.
+  * Fix paths in docs, libjdic-bin.install files.
+  * debian/control:
+    + Move sun-java5-jdk, libnetx-java to Build-Depends-Indep
+    + Switch back to Architecture: any for libjdic-bin
+    + Move libjdic-bin to Depends from Recommends
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Tue, 27 Nov 2007 02:10:39 +0530
+
 libjdic-java (0.0.20060613-5) unstable; urgency=low
 
   * Change Architecture: amd64 i386 for libjdic-bin.

Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control	2007-11-26 19:42:12 UTC (rev 4852)
+++ trunk/libjdic-java/debian/control	2007-11-27 04:27:22 UTC (rev 4853)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt, ant, pkg-config,
- sun-java5-jdk, libgnome2-dev, libgtk2.0-dev, libxt-dev, libxul-dev,
- libx11-dev, libnetx-java
+ libgnome2-dev, libgtk2.0-dev, libxt-dev, libxul-dev, libx11-dev
+Build-Depends-Indep: sun-java5-jdk, libnetx-java
 Standards-Version: 3.7.2
 Homepage: https://jdic.dev.java.net/
 Vcs-Svn: https://bollin.googlecode.com/svn/libjdic-java/
@@ -14,8 +14,7 @@
 Package: libjdic-java
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, 
- sun-java5-jre | java1-runtime | java2-runtime
-Recommends: libjdic-bin
+ sun-java5-jre | java1-runtime | java2-runtime, libjdic-bin (= ${binary:Version})
 Description: JDesktop Integration Components
  The JDesktop Integration Components (JDIC) project aims to make Java
  technology-based applications ("Java applications") first-class
@@ -31,7 +30,7 @@
  type associations, creating JNLP installer packages, etc.
 
 Package: libjdic-bin
-Architecture: amd64 i386
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libjdic-java (= ${source:Version})
 Description: JDesktop Integration Components
  The JDesktop Integration Components (JDIC) project aims to make Java

Modified: trunk/libjdic-java/debian/docs
===================================================================
--- trunk/libjdic-java/debian/docs	2007-11-26 19:42:12 UTC (rev 4852)
+++ trunk/libjdic-java/debian/docs	2007-11-27 04:27:22 UTC (rev 4853)
@@ -1,2 +1,2 @@
 README.html
-dist/*/javadoc/*
+jdic/dist/*/javadoc/*

Modified: trunk/libjdic-java/debian/libjdic-bin.install
===================================================================
--- trunk/libjdic-java/debian/libjdic-bin.install	2007-11-26 19:42:12 UTC (rev 4852)
+++ trunk/libjdic-java/debian/libjdic-bin.install	2007-11-27 04:27:22 UTC (rev 4853)
@@ -1,2 +1,2 @@
-dist/*/*.so  /usr/lib/libjdic-java/
-dist/*/mozembed-linux-gtk2 /usr/lib/libjdic-java/
+jdic/dist/*/*.so  /usr/lib/libjdic-java/
+jdic/dist/*/mozembed-linux-gtk2 /usr/lib/libjdic-java/

Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2007-11-26 19:42:12 UTC (rev 4852)
+++ trunk/libjdic-java/debian/rules	2007-11-27 04:27:22 UTC (rev 4853)
@@ -2,8 +2,8 @@
 
 export MOZILLA_DIST=/usr/lib/mozilla
 export GECKO_SDK=/usr/lib/xulrunner/sdk
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
 
-include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
@@ -11,15 +11,25 @@
 DEB_SHLIBDEPS_INCLUDE     := debian/libjdic-bin/usr/lib/libjdic-java
 DEB_DH_SHLIBDEPS_ARGS_ALL := --dpkg-shlibdeps-params=--ignore-missing-info
 
-JAVA_HOME 		  := /usr/lib/jvm/java-1.5.0-sun
-DEB_ANT_BUILD_TARGET 	  := buildall
-DEB_JARS		  := netx
+common-binary-indep:: debian/stamp-binary-indep
+debian/stamp-binary-indep:
+	CLASSPATH=/usr/share/java/netx.jar ant -f jdic/build.xml buildunixjar javadoc builddemo
+	touch $@
 
-install/libjdic-java::
+common-binary-arch:: debian/stamp-binary-arch
+debian/stamp-binary-arch:
+	ant -f jdic/build.xml buildunixjni buildunixembed
+	touch $@
+
+install/libjdic-java:: debian/stamp-binary-indep
 	for i in `ls /usr/lib/libjdic-java/`; do \
 		dh_link /usr/lib/libjdic-java/$$i /usr/share/java/$$i; done
-	install -D -m 644 dist/*/jdic.jar debian/libjdic-java/usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar
+	install -D -m 644 jdic/dist/*/jdic.jar debian/libjdic-java/usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jdic-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jdic.jar
 
+clean::
+	ant -f jdic/build.xml clean
+	$(RM) debian/stamp-*
+
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)