[pkg-java] r14594 - in trunk/libskinlf-java/debian: . patches source

[Torsten Werner]

Author: twerner
Date: 2011-08-29 21:45:51 +0000 (Mon, 29 Aug 2011)
New Revision: 14594

Added:
   trunk/libskinlf-java/debian/patches/series
   trunk/libskinlf-java/debian/source/
   trunk/libskinlf-java/debian/source/format
Modified:
   trunk/libskinlf-java/debian/changelog
   trunk/libskinlf-java/debian/compat
   trunk/libskinlf-java/debian/control
   trunk/libskinlf-java/debian/patches/GtkParser.jj.patch
   trunk/libskinlf-java/debian/patches/image-utils-without-jimi.patch
   trunk/libskinlf-java/debian/rules
Log:
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.1.
* Remove Java runtime from Depends.
* Switch to source format 3.0.

Modified: trunk/libskinlf-java/debian/changelog
===================================================================
--- trunk/libskinlf-java/debian/changelog	2011-08-29 21:35:07 UTC (rev 14593)
+++ trunk/libskinlf-java/debian/changelog	2011-08-29 21:45:51 UTC (rev 14594)
@@ -1,3 +1,12 @@
+libskinlf-java (6.7-7) unstable; urgency=low
+
+  * Switch to debhelper level 7.
+  * Update Standards-Version: 3.9.1.
+  * Remove Java runtime from Depends.
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 29 Aug 2011 23:43:34 +0200
+
 libskinlf-java (6.7-6) unstable; urgency=low
 
   * Change of my email address since I am now DD 

Modified: trunk/libskinlf-java/debian/compat
===================================================================
--- trunk/libskinlf-java/debian/compat	2011-08-29 21:35:07 UTC (rev 14593)
+++ trunk/libskinlf-java/debian/compat	2011-08-29 21:45:51 UTC (rev 14594)
@@ -1 +1 @@
-5
+7

Modified: trunk/libskinlf-java/debian/control
===================================================================
--- trunk/libskinlf-java/debian/control	2011-08-29 21:35:07 UTC (rev 14593)
+++ trunk/libskinlf-java/debian/control	2011-08-29 21:45:51 UTC (rev 14594)
@@ -4,17 +4,16 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, 
+Build-Depends: debhelper (>= 7), cdbs, ant, ant-optional, 
  default-jdk, liblaf-plugin-java, libxalan2-java, imagemagick
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://skinlf.l2fprod.com
 Vcs-Svn: https://bollin.googlecode.com/svn/libskinlf-java/trunk
 Vcs-Browser: http://bollin.googlecode.com/svn/libskinlf-java/trunk
 
 Package: libskinlf-java
 Architecture: all
-Depends:  java-gcj-compat | java1-runtime | java2-runtime,
- liblaf-plugin-java, libxalan2-java, ${misc:Depends}
+Depends: liblaf-plugin-java, libxalan2-java, ${misc:Depends}
 Suggests: libskinlf-java-demo
 Description: Skin Look and Feel - Skinning Engine for the Swing toolkit
  Skin Look And Feel allows Java developers to write skinnable application

Modified: trunk/libskinlf-java/debian/patches/GtkParser.jj.patch
===================================================================
--- trunk/libskinlf-java/debian/patches/GtkParser.jj.patch	2011-08-29 21:35:07 UTC (rev 14593)
+++ trunk/libskinlf-java/debian/patches/GtkParser.jj.patch	2011-08-29 21:45:51 UTC (rev 14594)
@@ -1,5 +1,7 @@
---- skinlf-6.7.orig/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj.orig	1970-01-01 01:00:00.000000000 +0100
-+++ skinlf-6.7/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj	2007-12-08 15:59:11.000000000 +0100
+Index: libskinlf-java-6.7/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libskinlf-java-6.7/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj	2011-08-29 23:42:10.000000000 +0200
 @@ -0,0 +1,405 @@
 +PARSER_BEGIN(GtkParser)
 +

Modified: trunk/libskinlf-java/debian/patches/image-utils-without-jimi.patch
===================================================================
--- trunk/libskinlf-java/debian/patches/image-utils-without-jimi.patch	2011-08-29 21:35:07 UTC (rev 14593)
+++ trunk/libskinlf-java/debian/patches/image-utils-without-jimi.patch	2011-08-29 21:45:51 UTC (rev 14594)
@@ -1,6 +1,7 @@
-diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java
---- src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:09:36.000000000 +0100
-+++ src/com/l2fprod/tools/ImageUtils.java	2006-01-24 20:19:19.000000000 +0100
+Index: libskinlf-java-6.7/src/com/l2fprod/tools/ImageUtils.java
+===================================================================
+--- libskinlf-java-6.7.orig/src/com/l2fprod/tools/ImageUtils.java	2006-07-22 13:46:18.000000000 +0200
++++ libskinlf-java-6.7/src/com/l2fprod/tools/ImageUtils.java	2011-08-29 23:42:22.000000000 +0200
 @@ -6,15 +6,12 @@
  
  import javax.swing.ImageIcon;

Added: trunk/libskinlf-java/debian/patches/series
===================================================================
--- trunk/libskinlf-java/debian/patches/series	                        (rev 0)
+++ trunk/libskinlf-java/debian/patches/series	2011-08-29 21:45:51 UTC (rev 14594)
@@ -0,0 +1,2 @@
+GtkParser.jj.patch
+image-utils-without-jimi.patch

Modified: trunk/libskinlf-java/debian/rules
===================================================================
--- trunk/libskinlf-java/debian/rules	2011-08-29 21:35:07 UTC (rev 14593)
+++ trunk/libskinlf-java/debian/rules	2011-08-29 21:45:51 UTC (rev 14594)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/
 DEB_ANT_BUILDFILE    := debian/build.xml

Added: trunk/libskinlf-java/debian/source/format
===================================================================
--- trunk/libskinlf-java/debian/source/format	                        (rev 0)
+++ trunk/libskinlf-java/debian/source/format	2011-08-29 21:45:51 UTC (rev 14594)
@@ -0,0 +1 @@
+3.0 (quilt)