[pkg-java] r14877 - in trunk/electric/debian: . source

[Torsten Werner]

Author: twerner
Date: 2011-09-12 19:59:54 +0000 (Mon, 12 Sep 2011)
New Revision: 14877

Added:
   trunk/electric/debian/source/
   trunk/electric/debian/source/format
Modified:
   trunk/electric/debian/changelog
   trunk/electric/debian/compat
   trunk/electric/debian/control
   trunk/electric/debian/rules
Log:
* Team upload
* Switch to default-jdk.
* Switch to source format 3.0.
* Switch to debhelper level 7.

Modified: trunk/electric/debian/changelog
===================================================================
--- trunk/electric/debian/changelog	2011-09-12 19:32:18 UTC (rev 14876)
+++ trunk/electric/debian/changelog	2011-09-12 19:59:54 UTC (rev 14877)
@@ -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.

Modified: trunk/electric/debian/compat
===================================================================
--- trunk/electric/debian/compat	2011-09-12 19:32:18 UTC (rev 14876)
+++ trunk/electric/debian/compat	2011-09-12 19:59:54 UTC (rev 14877)
@@ -1,2 +1 @@
-6
-
+7

Modified: trunk/electric/debian/control
===================================================================
--- trunk/electric/debian/control	2011-09-12 19:32:18 UTC (rev 14876)
+++ trunk/electric/debian/control	2011-09-12 19:59:54 UTC (rev 14877)
@@ -3,8 +3,8 @@
 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 @@
 
 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

Modified: trunk/electric/debian/rules
===================================================================
--- trunk/electric/debian/rules	2011-09-12 19:32:18 UTC (rev 14876)
+++ trunk/electric/debian/rules	2011-09-12 19:59:54 UTC (rev 14877)
@@ -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

Added: trunk/electric/debian/source/format
===================================================================
--- trunk/electric/debian/source/format	                        (rev 0)
+++ trunk/electric/debian/source/format	2011-09-12 19:59:54 UTC (rev 14877)
@@ -0,0 +1 @@
+3.0 (quilt)