[electric] 06/19: electric 8.07-2

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository electric.

commit 2d2f4567d5a0d7f5dd3ef626cd51943f6570c01e
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Wed Nov 5 18:44:47 2008 +0000

    electric 8.07-2
---
 debian/changelog         | 15 +++++++++++++++
 debian/control           |  4 ++--
 debian/watch             |  2 +-
 debian/wrappers/electric |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fb0120..daa726c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index a7cd3c4..fb471c0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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 @@ Homepage: http://www.staticfreesoft.com/productsFree.html
 
 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,
diff --git a/debian/watch b/debian/watch
index 829ab78..052a6f2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
diff --git a/debian/wrappers/electric b/debian/wrappers/electric
index 279f15d..9a302e8 100644
--- a/debian/wrappers/electric
+++ b/debian/wrappers/electric
@@ -9,4 +9,4 @@ fi
 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 "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git