Author: sylvestre Date: 2010-09-02 07:23:54 +0000 (Thu, 02 Sep 2010) New Revision: 12951
Modified: 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: * New upstream release * Standards-Version updated to 3.9.1 Modified: trunk/libflexdock-java/debian/changelog =================================================================== --- trunk/libflexdock-java/debian/changelog 2010-08-30 07:36:28 UTC (rev 12950) +++ trunk/libflexdock-java/debian/changelog 2010-09-02 07:23:54 UTC (rev 12951) @@ -1,3 +1,10 @@ +libflexdock-java (0.5.2-dfsg1-1) unstable; urgency=low + + * New upstream release + * Standards-Version updated to 3.9.1 + + -- Sylvestre Ledru <[email protected]> Tue, 17 Aug 2010 22:27:30 +0200 + libflexdock-java (0.5.1-dfsg1-7) unstable; urgency=low * Change of my email address since I am now DD Modified: trunk/libflexdock-java/debian/control =================================================================== --- trunk/libflexdock-java/debian/control 2010-08-30 07:36:28 UTC (rev 12950) +++ trunk/libflexdock-java/debian/control 2010-09-02 07:23:54 UTC (rev 12951) @@ -7,7 +7,7 @@ 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.8.3 +Standards-Version: 3.9.1 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 Modified: trunk/libflexdock-java/debian/patches/AllDemos.java.patch =================================================================== --- trunk/libflexdock-java/debian/patches/AllDemos.java.patch 2010-08-30 07:36:28 UTC (rev 12950) +++ trunk/libflexdock-java/debian/patches/AllDemos.java.patch 2010-09-02 07:23:54 UTC (rev 12951) @@ -3,10 +3,10 @@ --- 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 2009-06-29 19:06:02.000000000 +0200 @@ -33,7 +33,6 @@ - "org.flexdock.demos.raw.border.BorderDemo", - "org.flexdock.demos.raw.CompoundDemo", - "org.flexdock.demos.raw.elegant.ElegantDemo", -- "org.flexdock.demos.raw.jmf.JMFDemo", - "org.flexdock.demos.raw.SimpleDemo", - "org.flexdock.demos.raw.SplitPaneDemo", - "org.flexdock.demos.raw.TabbedPaneDemo", + "org.flexdock.demos.raw.border.BorderDemo", + "org.flexdock.demos.raw.CompoundDemo", + "org.flexdock.demos.raw.elegant.ElegantDemo", +- "org.flexdock.demos.raw.jmf.JMFDemo", + "org.flexdock.demos.raw.SimpleDemo", + "org.flexdock.demos.raw.SplitPaneDemo", + "org.flexdock.demos.raw.TabbedPaneDemo", Modified: trunk/libflexdock-java/debian/patches/build.xml.patch =================================================================== --- trunk/libflexdock-java/debian/patches/build.xml.patch 2010-08-30 07:36:28 UTC (rev 12950) +++ trunk/libflexdock-java/debian/patches/build.xml.patch 2010-09-02 07:23:54 UTC (rev 12951) @@ -3,85 +3,85 @@ --- 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> - + <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"/> + </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> - - + <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> + + <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 --> + <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> + 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"/> + <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 + 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 2010-08-30 07:36:28 UTC (rev 12950) +++ trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch 2010-09-02 07:23:54 UTC (rev 12951) @@ -3,21 +3,21 @@ --- 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() { - 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 - // system. + + 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 + // system. @@ -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; + 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; _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
