[pkg-java] r7240 - in trunk/electric/debian: . wrappers

[onkarshinde-guest at alioth.debian.org]

Author: onkarshinde-guest
Date: 2008-11-05 18:44:47 +0000 (Wed, 05 Nov 2008)
New Revision: 7240

Modified:
   trunk/electric/debian/changelog
   trunk/electric/debian/control
   trunk/electric/debian/watch
   trunk/electric/debian/wrappers/electric
Log:
electric 8.07-2

Modified: trunk/electric/debian/changelog
===================================================================
--- trunk/electric/debian/changelog	2008-11-05 13:17:19 UTC (rev 7239)
+++ trunk/electric/debian/changelog	2008-11-05 18:44:47 UTC (rev 7240)
@@ -1,3 +1,18 @@
+electric (8.07-2) unstable; urgency=low
+
+  * debian/control
+    - Remove Sun JDK from build dependencies.
+    - Add hard dependency on OpenJDK JRE as the program does not run with GCJ.
+    - Remove default-jre from runtime dependencies. (Closes: #503780)
+  * debian/wrappers/electric
+    - Use java binary from OpenJDK so the program has no problems launching
+      when more than one JRE are present. This is similar to how it is done
+      for jftp.
+  * debian/watch
+    - Fix the uscan error.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Thu, 06 Nov 2008 00:12:17 +0530
+
 electric (8.07-1) unstable; urgency=low
 
   * Merge with Ubuntu

Modified: trunk/electric/debian/control
===================================================================
--- trunk/electric/debian/control	2008-11-05 13:17:19 UTC (rev 7239)
+++ trunk/electric/debian/control	2008-11-05 18:44:47 UTC (rev 7240)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: "Barak A. Pearlmutter" <bap at debian.org>
 Build-Depends: debhelper (>= 6), cdbs, ant
-Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, bsh 
+Build-Depends-Indep: openjdk-6-jdk, bsh 
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/electric
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/electric
@@ -12,7 +12,7 @@
 
 Package: electric
 Architecture: all
-Depends: default-jre | java2-runtime, bsh
+Depends: openjdk-6-jre, bsh
 Description: electrical CAD system
  Electric is a sophisticated electrical CAD system that can handle many forms
  of circuit design, including custom IC layout (ASICs), schematic drawing,

Modified: trunk/electric/debian/watch
===================================================================
--- trunk/electric/debian/watch	2008-11-05 13:17:19 UTC (rev 7239)
+++ trunk/electric/debian/watch	2008-11-05 18:44:47 UTC (rev 7240)
@@ -4,4 +4,4 @@
 # Site		Directory		Pattern			Version	Script
 version=3
 
-ftp.gnu.org /pub/gnu/electric/	electric-(.*)\.jar
+http://ftp.gnu.org/pub/gnu/electric/electric-(.*)\.jar

Modified: trunk/electric/debian/wrappers/electric
===================================================================
--- trunk/electric/debian/wrappers/electric	2008-11-05 13:17:19 UTC (rev 7239)
+++ trunk/electric/debian/wrappers/electric	2008-11-05 18:44:47 UTC (rev 7240)
@@ -9,4 +9,4 @@
 CLASSPATH="${CLASSPATH:-.}:/usr/share/java/bsh.jar:/usr/share/electric/electric.jar"
 export CLASSPATH
 
-exec /usr/bin/java com.sun.electric.Launcher "$@"
+exec /usr/lib/jvm/java-6-openjdk/jre/bin/java com.sun.electric.Launcher "$@"