[electric] 11/19: * Team upload * Switch to default-jdk. * Switch to source format 3.0. * Switch to debhelper level 7.

[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 958014f0ea42dbcd4d4f79781d025c29f6f9b243
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Sep 12 19:59:54 2011 +0000

    * Team upload
    * Switch to default-jdk.
    * Switch to source format 3.0.
    * Switch to debhelper level 7.
---
 debian/changelog     | 9 +++++++++
 debian/compat        | 3 +--
 debian/control       | 6 +++---
 debian/rules         | 5 ++---
 debian/source/format | 1 +
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2600cce..8bf6c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+electric (8.10-2) unstable; urgency=low
+
+  * Team upload
+  * Switch to default-jdk.
+  * Switch to source format 3.0.
+  * Switch to debhelper level 7.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 12 Sep 2011 21:59:35 +0200
+
 electric (8.10-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/compat b/debian/compat
index 5442e3d..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,2 +1 @@
-6
-
+7
diff --git a/debian/control b/debian/control
index 0e796d7..a5ef906 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: electronics
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: "Barak A. Pearlmutter" <bap at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: debhelper (>= 6), cdbs, ant, quilt
-Build-Depends-Indep: openjdk-6-jdk, bsh, libjava3d-java
+Build-Depends: debhelper (>= 7), cdbs, ant
+Build-Depends-Indep: default-jdk, bsh, libjava3d-java
 Standards-Version: 3.8.3
 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: ${misc:Depends}, openjdk-6-jre, bsh, java-wrappers
+Depends: ${misc:Depends}, default-jre, bsh, java-wrappers
 Recommends: libjava3d-java
 Description: electrical CAD system
  Electric is a sophisticated electrical CAD system that can handle many forms
diff --git a/debian/rules b/debian/rules
index 0481009..456f67c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME			:= /usr/lib/jvm/java-6-openjdk
+JAVA_HOME			:= /usr/lib/jvm/default-java
 DEB_JARS			:= bsh vecmath j3dcore j3dutils
 DEB_INSTALL_CHANGELOGS_ALL	:= ChangeLog.txt
 
 
 get-orig-source::
-	uscan --verbose --force-download
+	uscan --verbose --download-version $(DEB_UPSTREAM_VERSION) --force-download
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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