[pkg-java] r15196 - in trunk/libflexdock-java/debian: . patches

Sylvestre Ledru sylvestre at alioth.debian.org
Thu Oct 13 13:29:22 UTC 2011 

Author: sylvestre
Date: 2011-10-13 13:29:22 +0000 (Thu, 13 Oct 2011)
New Revision: 15196

Modified:
   trunk/libflexdock-java/debian/changelog
   trunk/libflexdock-java/debian/control
   trunk/libflexdock-java/debian/patches/build.xml.patch
   trunk/libflexdock-java/debian/rules
   trunk/libflexdock-java/debian/watch
Log:
  * New upstream release
  * Update of the website tag
  * Update of the watch file
  * Standards-Version updated to version 3.9.2
  * Fix the FTBFS (Closes: #643522)


Modified: trunk/libflexdock-java/debian/changelog
===================================================================
--- trunk/libflexdock-java/debian/changelog	2011-10-13 03:07:26 UTC (rev 15195)
+++ trunk/libflexdock-java/debian/changelog	2011-10-13 13:29:22 UTC (rev 15196)
@@ -1,8 +1,20 @@
+libflexdock-java (0.5.4-dfsg1-1) unstable; urgency=low
+
+  * New upstream release
+  * Update of the website tag
+  * Update of the watch file
+  * Standards-Version updated to version 3.9.2
+  * Fix the FTBFS (Closes: #643522)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 13 Oct 2011 14:31:57 +0200
+
 libflexdock-java (0.5.2-dfsg1-3) unstable; urgency=low
 
   * Switch to dpkg-source 3.0 (quilt) format
+  * libskinlf-java & libjgoodies-looks-java moved as dependencies of 
+    libflexdock-java-demo
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 05 Mar 2011 17:07:18 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 05 Mar 2011 18:33:42 +0100
 
 libflexdock-java (0.5.2-dfsg1-2) unstable; urgency=low
 

Modified: trunk/libflexdock-java/debian/control
===================================================================
--- trunk/libflexdock-java/debian/control	2011-10-13 03:07:26 UTC (rev 15195)
+++ trunk/libflexdock-java/debian/control	2011-10-13 13:29:22 UTC (rev 15196)
@@ -5,18 +5,16 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, 
- openjdk-6-jdk, libcommons-logging-java, libskinlf-java, 
+ libcommons-logging-java, libskinlf-java, openjdk-6-jdk,
  libjgoodies-looks-java, libx11-dev, quilt
-Standards-Version: 3.9.1
-Homepage: http://flexdock.dev.java.net
+Standards-Version: 3.9.2
+Homepage: http://java.net/projects/flexdock/
 Vcs-Svn: https://bollin.googlecode.com/svn/libflexdock-java/trunk
 Vcs-Browser: http://bollin.googlecode.com/svn/libflexdock-java/trunk
 
 Package: libflexdock-java
 Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime,
- libflexdock-jni, libcommons-logging-java, libskinlf-java, 
- libjgoodies-looks-java, ${misc:Depends}
+Depends: libflexdock-jni, libcommons-logging-java, ${misc:Depends}
 Suggests: libflexdock-java-doc, libflexdock-java-demo
 Description: Swing Java docking framework
  FlexDock is a Java docking framework for use in cross-platform Swing 
@@ -48,7 +46,8 @@
 
 Package: libflexdock-java-demo
 Architecture: all
-Depends: libflexdock-java, ${misc:Depends}
+Depends: libflexdock-java, ${misc:Depends}, libskinlf-java,
+ libjgoodies-looks-java
 Description: Swing Java docking framework - demos and examples
  FlexDock is a Java docking framework for use in cross-platform 
  Swing applications. It offers features you'd expect in any desktop

Modified: trunk/libflexdock-java/debian/patches/build.xml.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/build.xml.patch	2011-10-13 03:07:26 UTC (rev 15195)
+++ trunk/libflexdock-java/debian/patches/build.xml.patch	2011-10-13 13:29:22 UTC (rev 15196)
@@ -15,11 +15,11 @@
           <src path="${java.src.drag}"/>
           <src path="${java.src.perspective}"/>
        </javac>
--      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4" includeAntRuntime="no"/>
-+      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" excludes="org/flexdock/demos/raw/jmf//**" debug="true" source="1.4" includeAntRuntime="no"/>
-       <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4" includeAntRuntime="no"/>
+-      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/>
++      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" excludes="org/flexdock/demos/raw/jmf//**" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/>
+       <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.5" target="1.5"  includeAntRuntime="no"/>
     </target>
- 
+
 @@ -176,10 +176,12 @@
        <path id="sdk.include.dirset">
           <dirset dir="${sdk.include}"/>
@@ -30,7 +30,7 @@
                     pathsep='" "-I'/>
 -      <property name="sdk.include.gcc.args" value='"-I${sdk.include.gcc.args.temp}"'/>
 +      -->
-+      <property name="sdk.include.gcc.args" value='"-I/usr/lib/jvm/java-6-openjdk/include/"'/>
++      <property name="sdk.include.gcc.args" value='"-I/usr/lib/jvm/default-java/include/"'/>
     </target>
  
  

Modified: trunk/libflexdock-java/debian/rules
===================================================================
--- trunk/libflexdock-java/debian/rules	2011-10-13 03:07:26 UTC (rev 15195)
+++ trunk/libflexdock-java/debian/rules	2011-10-13 13:29:22 UTC (rev 15196)
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
-# Copyright 2007 Sylvestre Ledru <sylvestre.ledru at inria.fr>
+# Copyright 2007-2011 Sylvestre Ledru <sylvestre at debian.org>
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME            := /usr/lib/jvm/default-java/
 DEB_JARS             := ant-nodeps looks skinlf commons-logging
 DEB_ANT_BUILD_TARGET := build.with.native jar
 BUILDDIR 	     := build

Modified: trunk/libflexdock-java/debian/watch
===================================================================
--- trunk/libflexdock-java/debian/watch	2011-10-13 03:07:26 UTC (rev 15195)
+++ trunk/libflexdock-java/debian/watch	2011-10-13 13:29:22 UTC (rev 15196)
@@ -1,4 +1,4 @@
 version=3
 opts="dversionmangle=s/-dfsg.*//" \
-  https://flexdock.dev.java.net/ \
-  /files/documents/.*/flexdock-([\d\.]*)-src.zip debian debian/orig-tar.sh
+  http://java.net/projects/flexdock/downloads \
+/projects/flexdock/downloads/download/flexdock-([\d\.]*)-src.zip debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list