[pkg-java] r15696 - in trunk/libflexdock-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Fri Jan 13 19:41:19 UTC 2012
Author: sylvestre
Date: 2012-01-13 19:41:19 +0000 (Fri, 13 Jan 2012)
New Revision: 15696
Removed:
trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
Modified:
trunk/libflexdock-java/debian/changelog
trunk/libflexdock-java/debian/control
trunk/libflexdock-java/debian/patches/build.xml.patch
trunk/libflexdock-java/debian/patches/series
trunk/libflexdock-java/debian/rules
Log:
libflexdock-java (1.1-1) unstable; urgency=low
* New upstream release
Modified: trunk/libflexdock-java/debian/changelog
===================================================================
--- trunk/libflexdock-java/debian/changelog 2012-01-13 14:47:17 UTC (rev 15695)
+++ trunk/libflexdock-java/debian/changelog 2012-01-13 19:41:19 UTC (rev 15696)
@@ -1,3 +1,9 @@
+libflexdock-java (1.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 21 Dec 2011 15:23:54 +0100
+
libflexdock-java (1.0-1) unstable; urgency=low
* New upstream release
Modified: trunk/libflexdock-java/debian/control
===================================================================
--- trunk/libflexdock-java/debian/control 2012-01-13 14:47:17 UTC (rev 15695)
+++ trunk/libflexdock-java/debian/control 2012-01-13 19:41:19 UTC (rev 15696)
@@ -5,7 +5,7 @@
Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
Torsten Werner <twerner at debian.org>
Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional,
- libcommons-logging-java, libskinlf-java, openjdk-6-jdk,
+ libskinlf-java, openjdk-6-jdk,
libjgoodies-looks-java, libx11-dev, quilt
Standards-Version: 3.9.2
Homepage: http://java.net/projects/flexdock/
@@ -14,7 +14,7 @@
Package: libflexdock-java
Architecture: all
-Depends: libflexdock-jni, libcommons-logging-java, ${misc:Depends}
+Depends: ${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
@@ -60,19 +60,3 @@
* Layout Persistence
.
This package contains the examples and demonstration files.
-
-Package: libflexdock-jni
-Architecture: any
-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
- framework such as:
- * Tabbed and Split Layouts
- * Drag-n-Drop capability (with native drag rubber band painting on
- some platforms)
- * Floating windows
- * Collapsible Containers to Save Real Estate
- * Layout Persistence
- .
- This package contains the native jni library for flexdock.
Modified: trunk/libflexdock-java/debian/patches/build.xml.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/build.xml.patch 2012-01-13 14:47:17 UTC (rev 15695)
+++ trunk/libflexdock-java/debian/patches/build.xml.patch 2012-01-13 19:41:19 UTC (rev 15696)
@@ -2,16 +2,7 @@
===================================================================
--- 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>
-@@ -145,7 +145,7 @@
+@@ -142,7 +142,7 @@
<src path="${java.src.drag}"/>
<src path="${java.src.perspective}"/>
</javac>
@@ -19,69 +10,31 @@
+ <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}"/>
- </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/default-java/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 @@
+@@ -209,7 +209,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="Class-Path" value="${dist.jar.name} lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/>
++ <attribute name="Class-Path" value="${dist.jar.name} looks.jar skinlf.jar"/>
<attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
</manifest>
</jar>
-@@ -557,7 +560,6 @@
+@@ -432,7 +432,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 @@
+ </filterset>
+@@ -443,9 +442,6 @@
+ <mysignjar
jarname="${build.dir}/${dist.demo.jar.name}"
sjarname="${bin.dir.webstart}/${dist.demo.jar.name}"/>
- <mysignjar
+- <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
+ jarname="${build.dir}/lib/looks-2.1.1.jar"
+ sjarname="${bin.dir.webstart}/looks-2.1.1.jar"/>
Deleted: trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch 2012-01-13 14:47:17 UTC (rev 15695)
+++ trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch 2012-01-13 19:41:19 UTC (rev 15696)
@@ -1,21 +0,0 @@
-Index: flexdock-1.0/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java
-===================================================================
---- flexdock-1.0.orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2011-11-24 16:17:08.000000000 +0100
-+++ flexdock-1.0/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2011-12-09 11:59:44.680464698 +0100
-@@ -36,6 +36,7 @@
-
- private static void prime() {
- List keys = OsInfo.getInstance().getPrefixLibraryKeys();
-+ System.setProperty("java.library.path", System.getProperty("java.library.path") + ":/usr/lib/jni/");
-
- // we're going to cycle through various levels of os+arch accuracy
- // until we're able to load a native library that matches the current
-@@ -46,7 +47,7 @@
- String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END;
-
- try {
-- ResourceManager.loadLibrary(lib, resource);
-+ System.loadLibrary(lib);
- // if the library was successfully loaded, then we don't
- // need to do anything else.
- return;
Modified: trunk/libflexdock-java/debian/patches/series
===================================================================
--- trunk/libflexdock-java/debian/patches/series 2012-01-13 14:47:17 UTC (rev 15695)
+++ trunk/libflexdock-java/debian/patches/series 2012-01-13 19:41:19 UTC (rev 15696)
@@ -1,3 +1,2 @@
AllDemos.java.patch
build.xml.patch
-loadOfTheNativeLibrary.patch
Modified: trunk/libflexdock-java/debian/rules
===================================================================
--- trunk/libflexdock-java/debian/rules 2012-01-13 14:47:17 UTC (rev 15695)
+++ trunk/libflexdock-java/debian/rules 2012-01-13 19:41:19 UTC (rev 15696)
@@ -24,10 +24,5 @@
install -m 644 -D $(BUILDDIR)/flexdock-demo-$(VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo-$(VERSION).jar
ln -s flexdock-demo-$(VERSION).jar debian/libflexdock-java-demo/usr/share/java/flexdock-demo.jar
-install/libflexdock-jni::
- install -m 644 -D $(BUILDDIR)/bin/org/flexdock/docking/drag/outline/xlib/libRubberBand*.so debian/libflexdock-jni/usr/lib/jni/libRubberBand-linux.so
- ln -s libRubberBand-linux.so debian/libflexdock-jni/usr/lib/jni/libRubberBand.so.1
- ln -s libRubberBand.so.1 debian/libflexdock-jni/usr/lib/jni/libRubberBand.so
-
get-orig-source:
-uscan --upstream-version 0 --rename
More information about the pkg-java-commits
mailing list