Author: twerner
Date: 2008-11-09 18:56:54 +0000 (Sun, 09 Nov 2008)
New Revision: 7289

Modified:
   trunk/libswingx-java/debian/ant.properties
   trunk/libswingx-java/debian/changelog
   trunk/libswingx-java/debian/control
   trunk/libswingx-java/debian/rules
Log:
* Move package to main because batik is in main now.
* Build with source=target=1.5 and change Depends accordingly.

Modified: trunk/libswingx-java/debian/ant.properties
===================================================================
--- trunk/libswingx-java/debian/ant.properties  2008-11-09 17:21:00 UTC (rev 
7288)
+++ trunk/libswingx-java/debian/ant.properties  2008-11-09 18:56:54 UTC (rev 
7289)
@@ -1,2 +1,4 @@
 installdir=/usr/share/java
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
 

Modified: trunk/libswingx-java/debian/changelog
===================================================================
--- trunk/libswingx-java/debian/changelog       2008-11-09 17:21:00 UTC (rev 
7288)
+++ trunk/libswingx-java/debian/changelog       2008-11-09 18:56:54 UTC (rev 
7289)
@@ -1,8 +1,10 @@
-libswingx-java (1:0.9.4-1) unstable; urgency=low
+libswingx-java (1:0.9.4-1) experimental; urgency=low
 
   * New upstream release
+  * Move package to main because batik is in main now.
+  * Build with source=target=1.5 and change Depends accordingly.
 
- -- Torsten Werner <[EMAIL PROTECTED]>  Sat, 08 Nov 2008 23:35:31 +0100
+ -- Torsten Werner <[EMAIL PROTECTED]>  Sun, 09 Nov 2008 19:51:21 +0100
 
 libswingx-java (1:0.9.3-2) unstable; urgency=low
 

Modified: trunk/libswingx-java/debian/control
===================================================================
--- trunk/libswingx-java/debian/control 2008-11-09 17:21:00 UTC (rev 7288)
+++ trunk/libswingx-java/debian/control 2008-11-09 18:56:54 UTC (rev 7289)
@@ -1,5 +1,5 @@
 Source: libswingx-java
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
 Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL 
PROTECTED]>
@@ -12,7 +12,7 @@
 
 Package: libswingx-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre | java1-runtime | 
java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java5-runtime
 Suggests: java-virtual-machine
 Description: extensions to the Swing GUI toolkit
  This package contains extensions to the Swing GUI toolkit, including new and

Modified: trunk/libswingx-java/debian/rules
===================================================================
--- trunk/libswingx-java/debian/rules   2008-11-09 17:21:00 UTC (rev 7288)
+++ trunk/libswingx-java/debian/rules   2008-11-09 18:56:54 UTC (rev 7289)
@@ -6,8 +6,10 @@
 
 JAVA_HOME              := /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE      := debian/build.xml
-DEB_JARS               := batik
 
+# it was batik.jar up to version 1.6 and is is now batik-all.jar
+DEB_JARS               := batik batik-all
+
 install/libswingx-java::
        install -m 644 -D swingx.jar 
$(DEB_DESTDIR)/usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar
        dh_link /usr/share/java/swingx-$(DEB_UPSTREAM_VERSION).jar 
/usr/share/java/swingx.jar


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to