[pkg-java] r8662 - in trunk/libflexdock-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Mon Jun 29 17:20:51 UTC 2009
Author: twerner
Date: 2009-06-29 17:20:50 +0000 (Mon, 29 Jun 2009)
New Revision: 8662
Modified:
trunk/libflexdock-java/debian/
trunk/libflexdock-java/debian/changelog
trunk/libflexdock-java/debian/control
trunk/libflexdock-java/debian/patches/AllDemos.java.patch
trunk/libflexdock-java/debian/patches/build.xml.patch
trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
Log:
* Change Maintainer: Debian Java Maintainers.
* Add missing Depends: ${misc:Depends}.
* Change Section: java.
* Update Standards-Version: 3.8.2.
Property changes on: trunk/libflexdock-java/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/libflexdock-java/debian/changelog
===================================================================
--- trunk/libflexdock-java/debian/changelog 2009-06-28 20:23:35 UTC (rev 8661)
+++ trunk/libflexdock-java/debian/changelog 2009-06-29 17:20:50 UTC (rev 8662)
@@ -1,9 +1,16 @@
-libflexdock-java (0.5.1-dfsg1-6) hardy; urgency=low
+libflexdock-java (0.5.1-dfsg1-6) unstable; urgency=low
+ [ Sylvestre Ledru ]
* Use openjdk instead of gcj
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 13 Jan 2009 15:05:29 +0100
+ [ Torsten Werner ]
+ * Change Maintainer: Debian Java Maintainers.
+ * Add missing Depends: ${misc:Depends}.
+ * Change Section: java.
+ * Update Standards-Version: 3.8.2.
+ -- Torsten Werner <twerner at debian.org> Mon, 29 Jun 2009 19:18:17 +0200
+
libflexdock-java (0.5.1-dfsg1-5) unstable; urgency=low
* libRubberBand.so.1 was also incorporated into the jar file
Modified: trunk/libflexdock-java/debian/control
===================================================================
--- trunk/libflexdock-java/debian/control 2009-06-28 20:23:35 UTC (rev 8661)
+++ trunk/libflexdock-java/debian/control 2009-06-29 17:20:50 UTC (rev 8662)
@@ -1,12 +1,13 @@
Source: libflexdock-java
-Section: libs
+Section: java
Priority: optional
-Maintainer: Sylvestre Ledru <sylvestre.ledru at inria.fr>
-Uploaders: Torsten Werner <twerner at debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>,
+ Torsten Werner <twerner at debian.org>
Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional,
openjdk-6-jdk, libcommons-logging-java, libskinlf-java,
libjgoodies-looks-java, libx11-dev, quilt
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Homepage: http://flexdock.dev.java.net
Vcs-Svn: https://bollin.googlecode.com/svn/libflexdock-java/trunk
Vcs-Browser: http://bollin.googlecode.com/svn/libflexdock-java/trunk
@@ -14,9 +15,9 @@
Package: libflexdock-java
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime,
+Depends: default-jre | java1-runtime | java2-runtime,
libflexdock-jni, libcommons-logging-java, libskinlf-java,
- libjgoodies-looks-java
+ libjgoodies-looks-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
@@ -32,6 +33,7 @@
Package: libflexdock-java-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
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
@@ -47,7 +49,7 @@
Package: libflexdock-java-demo
Architecture: all
-Depends: libflexdock-java
+Depends: libflexdock-java, ${misc:Depends}
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
@@ -63,7 +65,7 @@
Package: libflexdock-jni
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Swing Java docking framework - JNI library
FlexDock is a Java docking framework for use in cross-platform Swing
applications. It offers features you'd expect in any desktop docking
Modified: trunk/libflexdock-java/debian/patches/AllDemos.java.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/AllDemos.java.patch 2009-06-28 20:23:35 UTC (rev 8661)
+++ trunk/libflexdock-java/debian/patches/AllDemos.java.patch 2009-06-29 17:20:50 UTC (rev 8662)
@@ -1,7 +1,7 @@
Index: libflexdock-java-0.5.1-dfsg1/src/java/demo/org/flexdock/demos/AllDemos.java
===================================================================
--- libflexdock-java-0.5.1-dfsg1.orig/src/java/demo/org/flexdock/demos/AllDemos.java 2007-01-11 15:52:00.000000000 +0100
-+++ libflexdock-java-0.5.1-dfsg1/src/java/demo/org/flexdock/demos/AllDemos.java 2007-12-22 16:20:09.000000000 +0100
++++ libflexdock-java-0.5.1-dfsg1/src/java/demo/org/flexdock/demos/AllDemos.java 2009-06-29 19:06:02.000000000 +0200
@@ -33,7 +33,6 @@
"org.flexdock.demos.raw.border.BorderDemo",
"org.flexdock.demos.raw.CompoundDemo",
Modified: trunk/libflexdock-java/debian/patches/build.xml.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/build.xml.patch 2009-06-28 20:23:35 UTC (rev 8661)
+++ trunk/libflexdock-java/debian/patches/build.xml.patch 2009-06-29 17:20:50 UTC (rev 8662)
@@ -1,85 +1,87 @@
---- flexdock-0.5.1-dfsg1.orig/build.xml 2008-08-12 14:53:19.000000000 +0200
-+++ flexdock-0.5.1-dfsg1/build.xml 2008-08-12 17:07:02.000000000 +0200
+Index: libflexdock-java-0.5.1-dfsg1/build.xml
+===================================================================
+--- libflexdock-java-0.5.1-dfsg1.orig/build.xml 2007-03-09 21:16:08.000000000 +0100
++++ libflexdock-java-0.5.1-dfsg1/build.xml 2009-06-29 19:13:03.000000000 +0200
@@ -118,7 +118,7 @@
- <condition property="os.unixWithXlib">
- <and>
- <os family="unix"/>
-- <available file="/usr/X11R6/include/X11/Xlib.h"/>
-+ <available file="/usr/include/X11/Xlib.h"/>
- </and>
- </condition>
- </target>
+ <condition property="os.unixWithXlib">
+ <and>
+ <os family="unix"/>
+- <available file="/usr/X11R6/include/X11/Xlib.h"/>
++ <available file="/usr/include/X11/Xlib.h"/>
+ </and>
+ </condition>
+ </target>
@@ -145,7 +145,7 @@
- <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"/>
-+ <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" excludes="org/flexdock/demos/raw/jmf//**" debug="true" source="1.4"/>
- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
- </target>
-
-@@ -176,10 +176,10 @@
- <path id="sdk.include.dirset">
- <dirset dir="${sdk.include}"/>
- </path>
-- <pathconvert property="sdk.include.gcc.args.temp"
-+<!-- <pathconvert property="sdk.include.gcc.args.temp"
- refid="sdk.include.dirset"
-- pathsep='" "-I'/>
-- <property name="sdk.include.gcc.args" value='"-I${sdk.include.gcc.args.temp}"'/>
-+ pathsep='" "-I'/>-->
-+ <property name="sdk.include.gcc.args" value='"-I/usr/lib/jvm/java-6-openjdk/include/"' />
- </target>
-
-
-@@ -291,11 +291,12 @@
-
- <exec executable="gcc" failonerror="true">
- <arg value="-lX11"/>
-- <arg value="-L/usr/X11R6/lib"/>
-- <arg value="-I/usr/X11R6/include"/>
-+ <arg value="-L/usr/lib"/>
-+ <arg value="-I/usr/include/X11"/>
- <arg value="-o"/>
- <arg value="${so.dir}/libRubberBand${library.key}.so"/>
- <arg value="-shared"/>
-+ <arg value="-fPIC"/>
- <arg value="${c.dir}/RubberBand.c"/>
- <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
- </exec>
-@@ -313,7 +314,7 @@
- <isset property="generic.jar"/>
- </condition>
- <property name="jar.suffix" value=""/>
-- <property name="jar.excludes" value=""/>
-+ <property name="jar.excludes" value="**/*.so"/>
-
-
- <!-- after this method is called, other targets can use these props -->
-@@ -334,7 +335,7 @@
- I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
- <manifest>
- <!-- matches core jar name -->
-- <attribute name="Class-Path" value="${dist.jar.name} lib/commons-logging-1.1.jar lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
-+ <attribute name="Class-Path" value="${dist.jar.name} commons-logging.jar looks.jar skinlf.jar"/>
- <attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
- </manifest>
- </jar>
-@@ -557,7 +558,6 @@
- <filter token="VERSION" value="${version}"/>
- <filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
- <filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
-- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
- <filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
- <filter token="LOOKS" value="looks-2.1.1.jar"/>
- <filter token="SKIN_LF" value="skinlf.jar"/>
-@@ -570,9 +570,6 @@
- jarname="${build.dir}/${dist.demo.jar.name}"
- sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
- <mysignjar
-- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
-- sjarname="${bin.dir.webstart}/jmf.jar"/>
-- <mysignjar
- jarname="${build.dir}/lib/commons-logging-1.1.jar"
- sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
- <mysignjar
+ <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"/>
++ <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" excludes="org/flexdock/demos/raw/jmf//**" debug="true" source="1.4"/>
+ <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
+ </target>
+
+@@ -176,10 +176,12 @@
+ <path id="sdk.include.dirset">
+ <dirset dir="${sdk.include}"/>
+ </path>
++ <!--
+ <pathconvert property="sdk.include.gcc.args.temp"
+ refid="sdk.include.dirset"
+ 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/"'/>
+ </target>
+
+
+@@ -291,11 +293,12 @@
+
+ <exec executable="gcc" failonerror="true">
+ <arg value="-lX11"/>
+- <arg value="-L/usr/X11R6/lib"/>
+- <arg value="-I/usr/X11R6/include"/>
++ <arg value="-L/usr/lib"/>
++ <arg value="-I/usr/include/X11"/>
+ <arg value="-o"/>
+ <arg value="${so.dir}/libRubberBand${library.key}.so"/>
+ <arg value="-shared"/>
++ <arg value="-fPIC"/>
+ <arg value="${c.dir}/RubberBand.c"/>
+ <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
+ </exec>
+@@ -313,7 +316,7 @@
+ <isset property="generic.jar"/>
+ </condition>
+ <property name="jar.suffix" value=""/>
+- <property name="jar.excludes" value=""/>
++ <property name="jar.excludes" value="**/*.so"/>
+
+
+ <!-- after this method is called, other targets can use these props -->
+@@ -334,7 +337,7 @@
+ I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
+ <manifest>
+ <!-- matches core jar name -->
+- <attribute name="Class-Path" value="${dist.jar.name} lib/commons-logging-1.1.jar lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
++ <attribute name="Class-Path" value="${dist.jar.name} commons-logging.jar looks.jar skinlf.jar"/>
+ <attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
+ </manifest>
+ </jar>
+@@ -557,7 +560,6 @@
+ <filter token="VERSION" value="${version}"/>
+ <filter token="DEMO_JAR_NAME" value="${dist.demo.jar.name}"/>
+ <filter token="FRAMEWORK_JAR_NAME" value="${dist.jar.name}"/>
+- <filter token="JMF_JAR_NAME" value="jmf.jar"/>
+ <filter token="APACHE_LOGGING" value="commons-logging-1.1.jar"/>
+ <filter token="LOOKS" value="looks-2.1.1.jar"/>
+ <filter token="SKIN_LF" value="skinlf.jar"/>
+@@ -570,9 +572,6 @@
+ jarname="${build.dir}/${dist.demo.jar.name}"
+ sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
+ <mysignjar
+- jarname="${build.dir}/lib/jmf/lib/jmf.jar"
+- sjarname="${bin.dir.webstart}/jmf.jar"/>
+- <mysignjar
+ jarname="${build.dir}/lib/commons-logging-1.1.jar"
+ sjarname="${bin.dir.webstart}/commons-logging-1.1.jar"/>
+ <mysignjar
Modified: trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch 2009-06-28 20:23:35 UTC (rev 8661)
+++ trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch 2009-06-29 17:20:50 UTC (rev 8662)
@@ -1,5 +1,7 @@
---- flexdock-0.5.1-dfsg1.orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2008-08-12 14:53:19.000000000 +0200
-+++ flexdock-0.5.1-dfsg1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2008-08-12 16:30:51.000000000 +0200
+Index: libflexdock-java-0.5.1-dfsg1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java
+===================================================================
+--- libflexdock-java-0.5.1-dfsg1.orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2005-08-26 22:51:10.000000000 +0200
++++ libflexdock-java-0.5.1-dfsg1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2009-06-29 19:13:14.000000000 +0200
@@ -36,7 +36,8 @@
private static void prime() {
More information about the pkg-java-commits
mailing list