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

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-12-09 11:08:53 +0000 (Fri, 09 Dec 2011)
New Revision: 15515

Modified:
   trunk/libflexdock-java/debian/changelog
   trunk/libflexdock-java/debian/patches/AllDemos.java.patch
   trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch
Log:
new upstream release + rebase of the patches

Modified: trunk/libflexdock-java/debian/changelog
===================================================================
--- trunk/libflexdock-java/debian/changelog	2011-12-09 07:55:10 UTC (rev 15514)
+++ trunk/libflexdock-java/debian/changelog	2011-12-09 11:08:53 UTC (rev 15515)
@@ -1,3 +1,9 @@
+libflexdock-java (1.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 09 Dec 2011 11:52:41 +0100
+
 libflexdock-java (0.5.4-dfsg1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libflexdock-java/debian/patches/AllDemos.java.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/AllDemos.java.patch	2011-12-09 07:55:10 UTC (rev 15514)
+++ trunk/libflexdock-java/debian/patches/AllDemos.java.patch	2011-12-09 11:08:53 UTC (rev 15515)
@@ -1,12 +1,12 @@
-Index: libflexdock-java-0.5.1-dfsg1/src/java/demo/org/flexdock/demos/AllDemos.java
+Index: flexdock-1.0/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	2009-06-29 19:06:02.000000000 +0200
+--- flexdock-1.0.orig/src/java/demo/org/flexdock/demos/AllDemos.java	2011-11-24 16:13:54.000000000 +0100
++++ flexdock-1.0/src/java/demo/org/flexdock/demos/AllDemos.java	2011-12-09 11:56:35.840465806 +0100
 @@ -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/loadOfTheNativeLibrary.patch
===================================================================
--- trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch	2011-12-09 07:55:10 UTC (rev 15514)
+++ trunk/libflexdock-java/debian/patches/loadOfTheNativeLibrary.patch	2011-12-09 11:08:53 UTC (rev 15515)
@@ -1,23 +1,21 @@
-Index: libflexdock-java-0.5.1-dfsg1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java
+Index: flexdock-1.0/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() {
- 	    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.
+--- 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;
+             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;