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

[Torsten Werner]

Author: twerner
Date: 2010-05-08 16:20:56 +0000 (Sat, 08 May 2010)
New Revision: 12363

Removed:
   trunk/libjdic-java/debian/README.source
Modified:
   trunk/libjdic-java/debian/changelog
   trunk/libjdic-java/debian/control
   trunk/libjdic-java/debian/orig-tar.sh
   trunk/libjdic-java/debian/rules
Log:
UNRELEASED
* Remove d/README.source because it is no longer needed.
* Clean up the package a bit.
* Remove Depends: java1-runtime.

Deleted: trunk/libjdic-java/debian/README.source
===================================================================
--- trunk/libjdic-java/debian/README.source	2010-05-08 15:58:25 UTC (rev 12362)
+++ trunk/libjdic-java/debian/README.source	2010-05-08 16:20:56 UTC (rev 12363)
@@ -1,10 +0,0 @@
-Patch System
-============
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
--- Varun Hiremath <varun at debian.org>  Mon, 19 Oct 2009 02:01:39 -0400

Modified: trunk/libjdic-java/debian/changelog
===================================================================
--- trunk/libjdic-java/debian/changelog	2010-05-08 15:58:25 UTC (rev 12362)
+++ trunk/libjdic-java/debian/changelog	2010-05-08 16:20:56 UTC (rev 12363)
@@ -1,3 +1,12 @@
+libjdic-java (0.9.5-8) unstable; urgency=low
+
+  UNRELEASED
+  * Remove d/README.source because it is no longer needed.
+  * Clean up the package a bit.
+  * Remove Depends: java1-runtime.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 18:18:46 +0200
+
 libjdic-java (0.9.5-7) unstable; urgency=low
 
   * Update patches/Tray.diff, add support for Renesas SH(sh4), thanks

Modified: trunk/libjdic-java/debian/control
===================================================================
--- trunk/libjdic-java/debian/control	2010-05-08 15:58:25 UTC (rev 12362)
+++ trunk/libjdic-java/debian/control	2010-05-08 16:20:56 UTC (rev 12363)
@@ -5,7 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), ant, pkg-config,
  libgnome2-dev, libgtk2.0-dev, libxt-dev, xulrunner-dev, libx11-dev,
- openjdk-6-jre-headless, openjdk-6-jdk, libnetx-java
+ openjdk-6-jdk, libnetx-java
 Standards-Version: 3.8.4
 Homepage: https://jdic.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjdic-java/
@@ -14,7 +14,7 @@
 Package: libjdic-java
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, 
- openjdk-6-jre | java1-runtime | java2-runtime, libjdic-bin (>= ${source:Version})
+ openjdk-6-jre | java2-runtime, libjdic-bin (>= ${source:Version})
 Description: JDesktop Integration Components
  The JDesktop Integration Components (JDIC) project aims to make Java
  technology-based applications ("Java applications") first-class

Modified: trunk/libjdic-java/debian/orig-tar.sh
===================================================================
--- trunk/libjdic-java/debian/orig-tar.sh	2010-05-08 15:58:25 UTC (rev 12362)
+++ trunk/libjdic-java/debian/orig-tar.sh	2010-05-08 16:20:56 UTC (rev 12363)
@@ -21,4 +21,3 @@
   echo "moved $TAR to $origDir"
 fi
 
-exit 0

Modified: trunk/libjdic-java/debian/rules
===================================================================
--- trunk/libjdic-java/debian/rules	2010-05-08 15:58:25 UTC (rev 12362)
+++ trunk/libjdic-java/debian/rules	2010-05-08 16:20:56 UTC (rev 12363)
@@ -11,13 +11,12 @@
 
 common-binary-indep:: debian/stamp-binary-indep
 debian/stamp-binary-indep:
-	JAVA_HOME=/usr/lib/jvm/java-6-openjdk CLASSPATH=/usr/share/java/netx.jar \
+	CLASSPATH=/usr/share/java/netx.jar \
 		ant -f jdic/build.xml buildunixjar javadoc builddemo
 	touch $@
 
 common-binary-arch:: debian/stamp-binary-arch
 debian/stamp-binary-arch:
-	export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 	ant -f jdic/build.xml buildunixjni buildunixembed
 	touch $@