[libswingx-java] 08/26: * Move package to main because batik is in main now. * Build with source=target=1.5 and change Depends accordingly.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libswingx-java.

commit 5f4d341d49f5b3f121eed236aee6719173df2d43
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Nov 9 18:56:54 2008 +0000

    * Move package to main because batik is in main now.
    * Build with source=target=1.5 and change Depends accordingly.
---
 debian/ant.properties | 2 ++
 debian/changelog      | 6 ++++--
 debian/control        | 4 ++--
 debian/rules          | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index b29a08a..600bef5 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,2 +1,4 @@
 installdir=/usr/share/java
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
 
diff --git a/debian/changelog b/debian/changelog
index 325fd5e..a7549ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <twerner at debian.org>  Sat, 08 Nov 2008 23:35:31 +0100
+ -- Torsten Werner <twerner at debian.org>  Sun, 09 Nov 2008 19:51:21 +0100
 
 libswingx-java (1:0.9.3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ca48dfe..190784e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: libswingx-java
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libswingx-java
 
 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
diff --git a/debian/rules b/debian/rules
index 9ea0ae2..d969fbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,9 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libswingx-java.git