[pkg-java] r6850 - in trunk/liquidlnf/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-08-11 02:19:11 +0000 (Mon, 11 Aug 2008)
New Revision: 6850

Modified:
   trunk/liquidlnf/debian/changelog
   trunk/liquidlnf/debian/control
   trunk/liquidlnf/debian/patches/build.diff
   trunk/liquidlnf/debian/rules
Log:
* Switch to OpenJDK.
* Move package to main.
* Increase Standards-Version: 3.8.0 (no changes needed).

Modified: trunk/liquidlnf/debian/changelog
===================================================================
--- trunk/liquidlnf/debian/changelog	2008-08-11 02:04:10 UTC (rev 6849)
+++ trunk/liquidlnf/debian/changelog	2008-08-11 02:19:11 UTC (rev 6850)
@@ -1,3 +1,11 @@
+liquidlnf (2.9.1-6) unstable; urgency=low
+
+  * Switch to OpenJDK.
+  * Move package to main.
+  * Increase Standards-Version: 3.8.0 (no changes needed).
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 11 Aug 2008 04:18:12 +0200
+
 liquidlnf (2.9.1-5) unstable; urgency=low
 
   * Update Standards-Version: 3.7.3 (no changes).

Modified: trunk/liquidlnf/debian/control
===================================================================
--- trunk/liquidlnf/debian/control	2008-08-11 02:04:10 UTC (rev 6849)
+++ trunk/liquidlnf/debian/control	2008-08-11 02:19:11 UTC (rev 6850)
@@ -1,11 +1,11 @@
 Source: liquidlnf
-Section: contrib/utils
+Section: utils
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, liblaf-plugin-java, sun-java5-jdk
-Standards-Version: 3.7.3
+Build-Depends-Indep: ant, liblaf-plugin-java, openjdk-6-jdk
+Standards-Version: 3.8.0
 Homepage: https://liquidlnf.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/liquidlnf
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/liquidlnf

Modified: trunk/liquidlnf/debian/patches/build.diff
===================================================================
--- trunk/liquidlnf/debian/patches/build.diff	2008-08-11 02:04:10 UTC (rev 6849)
+++ trunk/liquidlnf/debian/patches/build.diff	2008-08-11 02:19:11 UTC (rev 6850)
@@ -1,7 +1,7 @@
 Index: liquidlnf-2.9.1/build.xml
 ===================================================================
 --- liquidlnf-2.9.1.orig/build.xml	2006-11-29 06:45:37.000000000 +0100
-+++ liquidlnf-2.9.1/build.xml	2007-05-25 22:35:06.000000000 +0200
++++ liquidlnf-2.9.1/build.xml	2008-08-11 04:09:57.000000000 +0200
 @@ -71,14 +71,14 @@
      </target>
  
@@ -27,3 +27,15 @@
          <jar basedir="${project.classes}" compress="true" jarfile="${project.dist}/${jar.name}">
              <exclude name="**/*.java"/>
              <exclude name="**/*.form"/>
+Index: liquidlnf-2.9.1/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java
+===================================================================
+--- liquidlnf-2.9.1.orig/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java	2008-08-11 04:10:29.000000000 +0200
++++ liquidlnf-2.9.1/src/com/birosoft/liquid/LiquidInternalFrameTitlePane.java	2008-08-11 04:10:41.000000000 +0200
+@@ -10,7 +10,6 @@
+ package com.birosoft.liquid;
+ 
+ import com.birosoft.liquid.util.LiquidUtilities;
+-import com.sun.java.swing.SwingUtilities2;
+ import java.awt.Color;
+ import java.awt.Component;
+ import java.awt.Container;

Modified: trunk/liquidlnf/debian/rules
===================================================================
--- trunk/liquidlnf/debian/rules	2008-08-11 02:04:10 UTC (rev 6849)
+++ trunk/liquidlnf/debian/rules	2008-08-11 02:19:11 UTC (rev 6850)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-1.5.0-sun
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILD_TARGET := jar
 DEB_JARS             := laf-plugin