[pkg-java] r4775 - in trunk/libjdic-java/debian: . patches
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Fri Nov 16 22:32:10 UTC 2007
Author: varun-guest
Date: 2007-11-16 22:32:10 +0000 (Fri, 16 Nov 2007)
New Revision: 4775
Added:
trunk/libjdic-java/debian/patches/jnlp.diff
trunk/libjdic-java/debian/patches/packager.diff
Modified:
trunk/libjdic-java/debian/changelog
trunk/libjdic-java/debian/control
trunk/libjdic-java/debian/patches/series
trunk/libjdic-java/debian/rules
Log:
+ Add sun-java5-bin to Build-Depends-Indep
+ Build-Depend on libnetx-java
* Add patches/packager.diff to disable building packager sources.
* debian/rules: Add netx and remove deploy and javaws from DEB_JARS.
Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog 2007-11-16 22:31:58 UTC (rev 4774)
+++ trunk/libjdic-java/debian/changelog 2007-11-16 22:32:10 UTC (rev 4775)
@@ -3,12 +3,15 @@
* Move the package to pkg-java svn.
* debian/control:
+ Set Maintainer to Debian Java Maintainers and add myself to Uploaders.
- + Separate out Build-Depends and Build-Depends-Indep.
+ Add Vcs-{Svn, Browser} and Homepage.
+ Set Priority to optional from extra.
+ Split into libjdic-bin (arch dependent) and libjdic-java (arch all)
packages.
+ + Add sun-java5-bin to Build-Depends-Indep
+ + Build-Depend on libnetx-java
* Move install to libjdic-bin.install
+ * Add patches/packager.diff to disable building packager sources.
+ * debian/rules: Add netx and remove deploy and javaws from DEB_JARS.
-- Varun Hiremath <varunhiremath at gmail.com> Tue, 13 Nov 2007 16:31:56 +0530
Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control 2007-11-16 22:31:58 UTC (rev 4774)
+++ trunk/libjdic-java/debian/control 2007-11-16 22:32:10 UTC (rev 4775)
@@ -3,9 +3,9 @@
Priority: optional
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
-Build-Depends-Indep: ant, pkg-config, sun-java5-jdk, libgnome2-dev,
- libgtk2.0-dev, libxt-dev, libxul-dev, libx11-dev
+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
Standards-Version: 3.7.2
Homepage: https://jdic.dev.java.net/
Vcs-Svn: https://bollin.googlecode.com/svn/libjdic-java/
Added: trunk/libjdic-java/debian/patches/jnlp.diff
===================================================================
--- trunk/libjdic-java/debian/patches/jnlp.diff (rev 0)
+++ trunk/libjdic-java/debian/patches/jnlp.diff 2007-11-16 22:32:10 UTC (rev 4775)
@@ -0,0 +1,13 @@
+Index: libjdic-java-0.0.20060613/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java
+===================================================================
+--- libjdic-java-0.0.20060613.orig/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2007-11-17 02:59:58.000000000 +0530
++++ libjdic-java-0.0.20060613/jdic/src/share/classes/org/jdesktop/jdic/init/JdicManager.java 2007-11-17 03:00:31.000000000 +0530
+@@ -30,7 +30,7 @@
+
+ import org.jdesktop.jdic.browser.internal.WebBrowserUtil;
+
+-import com.sun.jnlp.JNLPClassLoader;
++import netx.jnlp.runtime.JNLPClassLoader;
+
+ /**
+ * Initialization manager for JDIC to set the environment variables or
Added: trunk/libjdic-java/debian/patches/packager.diff
===================================================================
--- trunk/libjdic-java/debian/patches/packager.diff (rev 0)
+++ trunk/libjdic-java/debian/patches/packager.diff 2007-11-16 22:32:10 UTC (rev 4775)
@@ -0,0 +1,43 @@
+Index: libjdic-java-0.0.20060613/build.xml
+===================================================================
+--- libjdic-java-0.0.20060613.orig/build.xml 2007-11-17 03:58:20.000000000 +0530
++++ libjdic-java-0.0.20060613/build.xml 2007-11-17 04:01:41.000000000 +0530
+@@ -66,7 +66,7 @@
+ <ant dir="jdic" target="buildall"/>
+
+ <!-- Build a JDIC Packager distribution -->
+- <ant dir="packager" target="buildall"/>
++<!-- <ant dir="packager" target="buildall"/> -->
+
+ <!-- Copy JDIC API distribution files into the distribution directory -->
+ <copy todir="${dist.dir}">
+@@ -79,13 +79,13 @@
+ <chmod dir="${dist.dir}" perm="+x" includes="*mozembed-*-gtk*" />
+
+ <!-- Copy JDIC Packager distribution files -->
+- <copy todir="${dist.dir}" failonerror="false">
+- <fileset dir="packager/${dist.dir}" casesensitive="false" >
+- <include name="*.jar"/>
+- <include name="*.dll"/>
+- <include name="jnlp2*"/>
+- </fileset>
+- </copy>
++<!-- <copy todir="${dist.dir}" failonerror="false"> -->
++<!-- <fileset dir="packager/${dist.dir}" casesensitive="false" > -->
++<!-- <include name="*.jar"/> -->
++<!-- <include name="*.dll"/> -->
++<!-- <include name="jnlp2*"/> -->
++<!-- </fileset> -->
++<!-- </copy> -->
+
+ <!-- Unix Note: the executable permission of jnlp2rpm or jnlp2pkg
+ files are not retained using Ant Copy, add executable mode.
+@@ -109,7 +109,7 @@
+ <ant dir="jdic" target="clean"/>
+
+ <!-- Clean the JDIC Packager distribution -->
+- <ant dir="packager" target="clean"/>
++<!-- <ant dir="packager" target="clean"/> -->
+ </target>
+
+ </project>
Modified: trunk/libjdic-java/debian/patches/series
===================================================================
--- trunk/libjdic-java/debian/patches/series 2007-11-16 22:31:58 UTC (rev 4774)
+++ trunk/libjdic-java/debian/patches/series 2007-11-16 22:32:10 UTC (rev 4775)
@@ -1,2 +1,4 @@
+jnlp.diff
demos_README.diff
build.diff
+packager.diff
Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules 2007-11-16 22:31:58 UTC (rev 4774)
+++ trunk/libjdic-java/debian/rules 2007-11-16 22:32:10 UTC (rev 4775)
@@ -11,7 +11,7 @@
JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun
DEB_ANT_BUILD_TARGET := buildall
-DEB_JARS := $(JAVA_HOME)/jre/lib/deploy.jar $(JAVA_HOME)/jre/lib/javaws.jar
+DEB_JARS := netx
install/libjdic-java::
for i in `ls /usr/lib/libjdic-java/`; do \
More information about the pkg-java-commits
mailing list