The following commit has been merged in the master branch:
commit 6083e94ae79fe9f7b29fb58791823c9ad26bb89b
Author: Miguel Landaeta <[email protected]>
Date: Sat Oct 22 16:30:56 2011 -0430
Switch to default-jdk
diff --git a/debian/changelog b/debian/changelog
index 7c91d64..fdd5a9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+omegat (2.3.0.1+dfsg-2) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Switch to default-jdk. (Closes: #643540).
+
+ -- Miguel Landaeta <[email protected]> Sat, 22 Oct 2011 16:19:49 -0430
+
omegat (2.3.0.1+dfsg-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index 617739a..5151945 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Tiago Saboga <[email protected]>
-Build-Depends: debhelper (>= 7), openjdk-6-jdk, ant
+Build-Depends: debhelper (>= 7), default-jdk, ant
Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java,
libhtmlparser-java, libjna-java, libswing-layout-java, tofrodos
Homepage: http://www.omegat.org
diff --git a/debian/rules b/debian/rules
index 0f2493b..aebc4c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# include /usr/share/quilt/quilt.make
-JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+JAVA_HOME=/usr/lib/jvm/default-java
ANT_OPTIONS=-propertyfile debian/ant.properties
configure: configure-stamp
--
omegat packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
