[pkg-java] r14758 - trunk/freeplane/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-09-07 23:49:01 +0000 (Wed, 07 Sep 2011)
New Revision: 14758

Modified:
   trunk/freeplane/debian/changelog
   trunk/freeplane/debian/control
   trunk/freeplane/debian/rules
Log:
Switch to default-jdk


Modified: trunk/freeplane/debian/changelog
===================================================================
--- trunk/freeplane/debian/changelog	2011-09-07 20:44:22 UTC (rev 14757)
+++ trunk/freeplane/debian/changelog	2011-09-07 23:49:01 UTC (rev 14758)
@@ -1,3 +1,10 @@
+freeplane (1.1.3-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk. (Closes: #640860).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 07 Sep 2011 20:46:58 -0430
+
 freeplane (1.1.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/freeplane/debian/control
===================================================================
--- trunk/freeplane/debian/control	2011-09-07 20:44:22 UTC (rev 14757)
+++ trunk/freeplane/debian/control	2011-09-07 23:49:01 UTC (rev 14758)
@@ -3,14 +3,14 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends: cdbs, debhelper (>= 7), docbook-to-man, imagemagick, ant, openjdk-6-jdk, quilt
+Build-Depends: cdbs, debhelper (>= 7), docbook-to-man, imagemagick, ant, default-jdk, quilt
 Build-Depends-Indep: javahelp2, groovy, libcommons-lang-java, libjgoodies-forms-java, simplyhtml, libbatik-java, rhino, fop, libxerces2-java, libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java, libknopflerfish-osgi-framework-java
 Standards-Version: 3.9.2.0
 Homepage: http://freeplane.org/
 
 Package: freeplane
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre, javahelp2, groovy, libcommons-lang-java, libjgoodies-forms-java, simplyhtml, libbatik-java, rhino, fop, libxerces2-java, libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java, libknopflerfish-osgi-framework-java, libjortho-freeplane-java (= ${binary:Version})
+Depends: ${misc:Depends}, default-jre | sun-java6-jre, javahelp2, groovy, libcommons-lang-java, libjgoodies-forms-java, simplyhtml, libbatik-java, rhino, fop, libxerces2-java, libxml-commons-external-java, libjaxp1.3-java, libjlatexmath-java, libknopflerfish-osgi-framework-java, libjortho-freeplane-java (= ${binary:Version})
 Recommends: xdg-utils, java-wrappers
 Description: Java program to create and edit mind maps.
  Freeplane is a free, open source software application for creating mind maps

Modified: trunk/freeplane/debian/rules
===================================================================
--- trunk/freeplane/debian/rules	2011-09-07 20:44:22 UTC (rev 14757)
+++ trunk/freeplane/debian/rules	2011-09-07 23:49:01 UTC (rev 14758)
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 # replaced by quilt: include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 
 DEB_ANT_BUILD_TARGET := build
 #DEB_BUILDDIR         := .