[SCM] Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI branch, master, updated. debian/3.2.7-4-14-g2512b8c

Andrew Ross ubuntu at rossfamily.co.uk
Sun Jul 22 23:13:20 UTC 2012


The following commit has been merged in the master branch:
commit 4d2ac5f1ca7d4f55b70c31eb4055f9f8cead5177
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Sun Jul 22 22:43:05 2012 +0100

    Refresh patches

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1006684..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,6 +0,0 @@
-10-dynlink-and-cflags.dpatch
-20-set-library-path-for-tests.dpatch
-25-no-special-build-dir-for-d64.dpatch
-30-link-javadoc-to-classpath.dpatch
-40-change-md5sum.dpatch
-50-remove-gjdoc-inexistent-options.dpatch
diff --git a/debian/patches/02-builddir.patch b/debian/patches/02-builddir.patch
index df18222..927cd2f 100644
--- a/debian/patches/02-builddir.patch
+++ b/debian/patches/02-builddir.patch
@@ -3,7 +3,7 @@ Description: no special build dir for d64
 
 --- a/build.xml
 +++ b/build.xml
-@@ -100,7 +100,7 @@
+@@ -136,7 +136,7 @@
          <equals arg1="${vm.arch}" arg2="-d64"/>
        </and>
      </condition>
diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch
index cbacd1b..f6afd08 100644
--- a/debian/patches/03-dynlink-and-cflags.patch
+++ b/debian/patches/03-dynlink-and-cflags.patch
@@ -3,7 +3,7 @@ Description: dynlink and cflags
 
 --- a/build.xml
 +++ b/build.xml
-@@ -398,6 +398,19 @@
+@@ -487,6 +487,19 @@
        <arg value="JNA_JNI_VERSION=${jni.version}"/>
        <arg value="CHECKSUM=${jni.md5}"/>
      </exec>
@@ -23,7 +23,7 @@ Description: dynlink and cflags
      <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
      <copy todir="${classes}/com/sun/jna/${os.prefix}">
        <fileset dir="${build.native}"
-@@ -409,15 +422,6 @@
+@@ -498,15 +511,6 @@
        <fileset dir="${build.native}"
                 includes="jnidispatch.dll,libjnidispatch.*"/>
      </copy>
@@ -38,4 +38,4 @@ Description: dynlink and cflags
 -    </jar>
    </target>
  
-   <target name="compile-tests" depends="compile,native,jar" 
+   <target name="compile-tests" depends="compile,native,jar"
diff --git a/debian/patches/04-load-native-code-from-fs.patch b/debian/patches/04-load-native-code-from-fs.patch
index 60b3208..b34429c 100644
--- a/debian/patches/04-load-native-code-from-fs.patch
+++ b/debian/patches/04-load-native-code-from-fs.patch
@@ -3,13 +3,13 @@ Subject: try to load native library from /usr/lib/jni if system
 Author: Jan Dittberner <jandd at debian.org>
 --- a/src/com/sun/jna/Native.java
 +++ b/src/com/sun/jna/Native.java
-@@ -662,6 +662,9 @@
-     private static void loadNativeLibrary() {
-         String libName = "jnidispatch";
+@@ -642,6 +642,9 @@
+ 
+         String libName = System.getProperty("jna.boot.library.name", "jnidispatch");
          String bootPath = System.getProperty("jna.boot.library.path");
 +        if (bootPath == null) {
 +            bootPath = "/usr/lib/jni";
 +        }
          if (bootPath != null) {
-             String[] dirs = bootPath.split(File.pathSeparator);
-             for (int i = 0; i < dirs.length; ++i) {
+             // String.split not available in 1.4
+             StringTokenizer dirs = new StringTokenizer(bootPath, File.pathSeparator);
diff --git a/debian/patches/05-support-gnu-kfreebsd.patch b/debian/patches/05-support-gnu-kfreebsd.patch
index 3bad352..0297733 100644
--- a/debian/patches/05-support-gnu-kfreebsd.patch
+++ b/debian/patches/05-support-gnu-kfreebsd.patch
@@ -3,17 +3,17 @@ Subject: patch build.xml and native/Makefile to support Debian GNU/kFreeBSD
 
 --- a/native/Makefile
 +++ b/native/Makefile
-@@ -22,6 +22,7 @@
- 
- OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \
+@@ -37,6 +37,7 @@
+ OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \
+ 	                -e 's/MINGW32.*/win32/g' \
                          -e 's/SunOS.*/solaris/g' \
-+			-e 's/GNU\/kFreeBSD/linux/g' \
-                         -e 's/FreeBSD.*/freebsd/g' \
-                         -e 's/OpenBSD.*/openbsd/g' \
-                         -e 's/Darwin.*/darwin/g' \
++                        -e 's/GNU\/kFreeBSD/linux/g' \
+                         -e 's/NetBSD/netbsd/g' \
+                         -e 's/FreeBSD/freebsd/g' \
+                         -e 's/OpenBSD/openbsd/g' \
 --- a/build.xml
 +++ b/build.xml
-@@ -130,6 +130,9 @@
+@@ -169,6 +169,9 @@
      <condition property="os.prefix" value="freebsd-${os.arch}">
        <os name="FreeBSD"/>
      </condition>
diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
index a52c08f..91439e1 100644
--- a/debian/patches/06-remove-gjdoc-inexistent-options.patch
+++ b/debian/patches/06-remove-gjdoc-inexistent-options.patch
@@ -3,12 +3,12 @@ Subject: disable javadoc options that are not supported by gjdoc
 
 --- a/build.xml
 +++ b/build.xml
-@@ -582,7 +582,7 @@
+@@ -704,7 +704,7 @@
        <group title="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/>
        <group title="Platform Specific" packages="com.sun.jna.platform.*"/>
-     	
+ 
 -      <arg value="-notimestamp"/>
-+      <!--arg value="-notimestamp"/-->
++      <!--<arg value="-notimestamp"/>-->
      </javadoc>
    </target>
  
diff --git a/debian/patches/07-include-platform-jar.patch b/debian/patches/07-include-platform-jar.patch
index edb5549..f84bce4 100644
--- a/debian/patches/07-include-platform-jar.patch
+++ b/debian/patches/07-include-platform-jar.patch
@@ -38,3 +38,15 @@ upstream version should already include this.
 +  </target>
 +</project>
 +
+--- a/build.xml
++++ b/build.xml
+@@ -291,9 +291,6 @@
+       <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
+       <zipfileset dir="${contrib}/platform" includes="**/*.java"/>
+     </zip>
+-    <jar jarfile="${platform-javadoc-jar}">
+-        <fileset dir="${javadoc}" />
+-    </jar>
+   </target>
+ 
+   <target name="contrib-jars" depends="platform-jar" description="Build contrib jars">
diff --git a/debian/patches/08-multiarch-support.patch b/debian/patches/08-multiarch-support.patch
index 6a06401..333c690 100644
--- a/debian/patches/08-multiarch-support.patch
+++ b/debian/patches/08-multiarch-support.patch
@@ -1,19 +1,57 @@
-Support multi-arch directories in library lookups.
+Support all Debian multi-arch directories in library lookups.
 
+--- a/build.xml
++++ b/build.xml
+@@ -210,6 +210,8 @@
+     <echo>java.home=${java.home}</echo>
+     <echo>java.library.path=${java.library.path}</echo>
+     <echo>os.prefix=${os.prefix}</echo>
++    <echo>os.name=${os.name}</echo>
++    <echo>os.arch=${os.arch}</echo>
+ 
+   </target>
+ 
 --- a/src/com/sun/jna/Platform.java
 +++ b/src/com/sun/jna/Platform.java
-@@ -99,4 +99,57 @@
+@@ -20,6 +20,8 @@
+     public static final int OPENBSD = 5;
+     public static final int WINDOWSCE = 6;
+     public static final int AIX = 7;
++    public static final int GNU = 8;
++    public static final int KFREEBSD = 9;
+ 
+     /** Whether read-only (final) fields within Structures are supported. */
+     public static final boolean RO_FIELDS;
+@@ -60,6 +62,12 @@
+         else if (osName.startsWith("OpenBSD")) {
+             osType = OPENBSD;
+         }
++        else if (osName.equalsIgnoreCase("gnu")) {
++            osType = GNU;
++        }
++        else if (osName.equalsIgnoreCase("gnu/kfreebsd")) {
++            osType = KFREEBSD;
++        }
+         else {
+             osType = UNSPECIFIED;
          }
-         return Native.POINTER_SIZE == 8;
+@@ -112,6 +120,11 @@
+     public static final boolean isOpenBSD() {
+         return osType == OPENBSD;
      }
 +    public static final boolean isGNU() {
-+        String name = System.getProperty("os.name").toLowerCase().trim();
-+        return "gnu".equals(name);
-+    }
-+    public static final boolean iskFreeBSD() {
-+        String name = System.getProperty("os.name").toLowerCase().trim();
-+        return "gnu/kfreebsd".equals(name);
++        return osType == GNU;
++    }    public static final boolean iskFreeBSD() {
++        return osType == KFREEBSD;
 +    }
+     public static final boolean isX11() {
+         // TODO: check filesystem for /usr/X11 or some other X11-specific test
+         return !Platform.isWindows() && !Platform.isMac();
+@@ -173,4 +186,19 @@
+             return false;
+         }
+     }
++
 +    public static final String getBaseArch() {
 +        String arch =
 +            System.getProperty("os.arch").toLowerCase().trim();
@@ -27,109 +65,51 @@ Support multi-arch directories in library lookups.
 +            arch = "powerpc64";
 +        return arch;
 +    }
-+    public static final boolean isIntel() {
-+        String arch =
-+            System.getProperty("os.arch").toLowerCase().trim();
-+        if (arch.equals("i386") ||
-+            arch.equals("x86_64") ||
-+            arch.equals("amd64")) {
-+            return true;
-+        } else {
-+            return false;
-+        }
-+    }
-+
-+    public static final boolean isPPC() {
-+        String arch =
-+            System.getProperty("os.arch").toLowerCase().trim();
-+        if (arch.equals("ppc") ||
-+            arch.equals("ppc64")) {
-+            return true;
-+        } else {
-+            return false;
-+        }
-+    }
 +
-+    public static final boolean isARM() {
-+        String arch =
-+            System.getProperty("os.arch").toLowerCase().trim();
-+        if (arch.equals("arm"))  {
-+            return true;
-+        } else {
-+            return false;
-+        }
-+    }
  }
 --- a/src/com/sun/jna/NativeLibrary.java
 +++ b/src/com/sun/jna/NativeLibrary.java
-@@ -634,7 +634,7 @@
-             // 64bit machines, so we have to explicitly search the 64bit one when
-             // running a 64bit JVM.
+@@ -645,7 +645,8 @@
+             // on 64bit machines, so we have to explicitly search the 64bit
+             // one when running a 64bit JVM.
              //
 -            if (Platform.isLinux() || Platform.isSolaris() || Platform.isFreeBSD()) {
-+            if (Platform.isLinux() || Platform.isSolaris() || Platform.isFreeBSD() || Platform.iskFreeBSD()) {
++            if (Platform.isLinux() || Platform.isSolaris() || Platform.isFreeBSD()
++                || Platform.iskFreeBSD()) {
                  // Linux & FreeBSD use /usr/lib32, solaris uses /usr/lib/32
                  archPath = (Platform.isSolaris() ? "/" : "") + Pointer.SIZE * 8;
              }
-@@ -644,11 +644,48 @@
-                 "/usr/lib",
-                 "/lib",
-             };
--            // Linux 64-bit does not use /lib or /usr/lib
--            if (Platform.isLinux() && Pointer.SIZE == 8) {
-+            // Fix for multi-arch support on Ubuntu (and other
-+            // multi-arch distributions)
-+            // paths is scanned against real directory
-+            // so for platforms which are not multi-arch
-+            // this should continue to work.
-+            if (Platform.isLinux() || Platform.iskFreeBSD()) {
-+                // Defaults - overridden below
+@@ -660,23 +661,23 @@
+             // paths is scanned against real directory
+             // so for platforms which are not multi-arch
+             // this should continue to work.
+-            if (Platform.isLinux()) {
++            if (Platform.isLinux() || Platform.iskFreeBSD() || Platform.isGNU()) {
+                 // Defaults - overridden below
+-                String cpu = "";
 +                String cpu = Platform.getBaseArch();
-+                String kernel = "linux";
-+                String libc = "gnu";
-+
+                 String kernel = "linux";
+                 String libc = "gnu";
+ 
+-                if (Platform.isIntel()) {
+-                    cpu = (Platform.is64Bit() ? "x86_64" : "i386");
+-                } else if (Platform.isPPC()) {
+-                    cpu = (Platform.is64Bit() ? "powerpc64" : "powerpc");
+-                } else if (Platform.isARM()) {
+-                    cpu = "arm";
 +                if (Platform.isARM()) {
-+                    libc = "gnueabi";
-+                }
-+
-+                String multiArchPath =
-+                    cpu + "-" + kernel + "-" + libc;
-+
-+                // Assemble path with all possible options
-                 paths = new String[] {
-+                    "/usr/lib/" + multiArchPath,
-+                    "/lib/" + multiArchPath,
-                     "/usr/lib" + archPath,
-                     "/lib" + archPath,
-+                    "/usr/lib",
-+                    "/lib",
-+                };
-+            }
-+            if (Platform.isGNU()) {
-+                String cpu = Platform.getBaseArch();
-+                String libc = "gnu";
-+                String multiArchPath =
-+                    cpu + "-" + libc;
+                     libc = "gnueabi";
+                 }
+ 
+-                String multiArchPath =
+-                    cpu + "-" + kernel + "-" + libc;
++                String multiArchPath;
 +
-+               // Assemble path with all possible options
-+                paths = new String[] {
-+                    "/usr/lib/" + multiArchPath,
-+                    "/lib/" + multiArchPath,
-+                    "/usr/lib" + archPath,
-+                    "/lib" + archPath,
-+                    "/usr/lib",
-+                    "/lib",
-                 };
-             }
-             for (int i=0;i < paths.length;i++) {
---- a/build.xml
-+++ b/build.xml
-@@ -73,6 +73,8 @@
-     <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-     <echo>java.home=${java.home}</echo>
-     <echo>java.library.path=${java.library.path}</echo>
-+    <echo>os.name=${os.name}</echo>
-+    <echo>os.arch=${os.arch}</echo>
++                if (Platform.isGNU()) {
++                    multiArchPath = cpu + "-" + libc;
++                } else {
++                    multiArchPath = cpu + "-" + kernel + "-" + libc;
++                }
  
-     <replaceregexp match="(<version>).*(</version>)"
-                    replace="\1${jna.version}\2" 
+                 // Assemble path with all possible options
+                 paths = new String[] {
diff --git a/debian/patches/09-javadoc.patch b/debian/patches/09-javadoc.patch
index a481f90..bb99829 100644
--- a/debian/patches/09-javadoc.patch
+++ b/debian/patches/09-javadoc.patch
@@ -2,12 +2,12 @@ Link javadoc to the default-jdk javadoc.
 
 --- a/build.xml
 +++ b/build.xml
-@@ -567,7 +567,7 @@
+@@ -686,7 +686,7 @@
        <doctitle>JNA API Documentation</doctitle>
        <header>${header}</header>
        <bottom>${footer}</bottom>
--      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-+      <link href="/usr/share/doc/default-jdk-doc/api"/>
+-      <link href="http://download.oracle.com/javase/1.4.2/docs/api/"/>
++      <link href="/usr/share/doc/default-jdk-doc/api/"/>
  
        <packageset dir="${src}" defaultexcludes="yes">
          <patternset>
diff --git a/debian/patches/10-dynlink-and-cflags.dpatch b/debian/patches/10-dynlink-and-cflags.dpatch
deleted file mode 100644
index 89c06cb..0000000
--- a/debian/patches/10-dynlink-and-cflags.dpatch
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-dynlink-and-cflags.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dynamically link to system libffi instead of using own copy.
-
- at DPATCH@
-diff -urNad libjna-java-3.0.4~/build.xml libjna-java-3.0.4/build.xml
---- libjna-java-3.0.4~/build.xml	2008-07-25 00:33:37.000000000 -0300
-+++ libjna-java-3.0.4/build.xml	2008-07-25 00:34:08.000000000 -0300
-@@ -18,6 +18,8 @@
-   <property name="debug" value="true"/>
-   <property name="debug.native" value="false"/>
-   <property name="native" location="native"/>
-+  <property name="cflags_extra.native" value=""/>
-+  <property name="dynlink.native" value="false"/>
-   <property name="src" location="src"/>
-   <property name="dist" location="dist"/>
-   <property name="test.src" location="test"/>
-@@ -321,11 +323,13 @@
-     </condition>
-     <!-- Default make program -->
-     <property name="make" value="make"/>
--
-+    
-     <exec executable="${make}" dir="${native}" failonerror="true">
-       <arg value="JAVA_HOME=${jdk.home}"/>
-       <arg value="JAVAH=${build.native}"/>
-       <arg value="DEBUG=${debug.native}"/>
-+      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-+      <arg value="DYNAMIC_LINK=${dynlink.native}"/>
-       <arg value="${make.CC}"/>
-       <arg value="${make.BUILD}"/>
-       <arg value="${make.SDKROOT}"/>
-@@ -334,6 +338,19 @@
-       <arg value="VERSION=${jni.version}"/>
-       <arg value="CHECKSUM=${jni.md5}"/>
-     </exec>
-+    <antcall target="native-mixedjar"/>
-+    <!-- For web start, native libraries may be provided in the root of -->
-+    <!-- an included jar file -->
-+    <jar jarfile="${build}/${native.jar}">
-+      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-+      <manifest>
-+        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-+        <attribute name="Specification-Version" value="${jni.version}"/>
-+      </manifest>
-+    </jar>
-+  </target>
-+
-+  <target name="native-mixedjar" unless="nomixedjar.native">    
-     <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-     <copy todir="${classes}/com/sun/jna/${os.prefix}">
-       <fileset dir="${build.native}" 
-@@ -345,15 +362,6 @@
-       <fileset dir="${build.native}" 
-                includes="jnidispatch.dll,libjnidispatch.*"/>
-     </copy>
--    <!-- For web start, native libraries may be provided in the root of -->
--    <!-- an included jar file -->
--    <jar jarfile="${build}/${native.jar}">
--      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
--      <manifest>
--        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
--        <attribute name="Specification-Version" value="${jni.version}"/>
--      </manifest>
--    </jar>
-   </target>
- 
-   <target name="compile-tests" depends="compile,native"
-diff -urNad libjna-java-3.0.4~/native/Makefile libjna-java-3.0.4/native/Makefile
---- libjna-java-3.0.4~/native/Makefile	2008-07-25 00:33:37.000000000 -0300
-+++ libjna-java-3.0.4/native/Makefile	2008-07-25 00:36:10.000000000 -0300
-@@ -38,10 +38,12 @@
- INSTALLDIR=../build/$(OS)
- JNIDISPATCH_OBJS=$(BUILD)/dispatch.o $(BUILD)/callback.o $(EXTRAOBJS)
- RSRC=$(BUILD)/rsrc.o
-+ifneq ($(DYNAMIC_LINK),true)
- FFI_SRC=$(shell pwd)/libffi
- FFI_BUILD=$(BUILD)/libffi
- FFI_LIB=$(FFI_BUILD)/.libs/libffi_convenience.a
- FFI_CONFIG=--disable-static --with-pic=yes
-+endif
- LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch$(JNISFX)
- TESTLIB=$(BUILD)/$(LIBPFX)testlib$(LIBSFX)
- 
-@@ -51,6 +53,7 @@
- JNISFX=$(LIBSFX)
- CC=gcc
- LD=gcc
-+LIBS=
- # Default to Sun recommendations for JNI compilation
- #COPT=-O2 -fomit-frame-pointer
- COPT=-fno-omit-frame-pointer -fno-strict-aliasing 
-@@ -58,14 +61,22 @@
- ifeq ($(DEBUG),true)
- CDEBUG=-g
- endif
-+CFLAGS_EXTRA=
- COUT=-o $@
- CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
- CDEFINES=-D_REENTRANT
- PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
--CFLAGS=$(PCFLAGS) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-+CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-        -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
-+ifeq ($(DYNAMIC_LINK),true)
-+CFLAGS += `pkg-config --cflags libffi`
-+LIBS += `pkg-config --libs libffi` -ldl
-+endif
-+LDFLAGS=-o $@ -shared -Wl,-soname,$@ 
-+ifneq ($(DYNAMIC_LINK),true)       
- # -static-libgcc avoids gcc library incompatibilities across linux systems
--LDFLAGS=-o $@ -shared -static-libgcc
-+LDFLAGS += -static-libgcc
-+endif
- # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
- # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
- #LIBS=-L"$(LIBDIR)" -ljawt 
-@@ -202,14 +213,16 @@
- $(TESTLIB): $(BUILD)/testlib.o 
- 	$(LD) $(LDFLAGS) $< $(TESTDEF)
- 
-+ifneq ($(DYNAMIC_LINK), true)
- $(FFI_LIB):
- 	@mkdir -p $(FFI_BUILD)
- 	@if [ ! -f $(FFI_BUILD)/Makefile ]; then \
- 	  echo "Configuring libffi ($(ARCH))"; \
- 	  (cd $(FFI_BUILD) \
- 	    && CC="$(CC)" CFLAGS="$(CDEBUG)" CPPFLAGS="$(CDEFINES)" $(FFI_SRC)/configure $(FFI_CONFIG)); \
--	fi
-+	fi 
- 	$(MAKE) -C $(FFI_BUILD)
-+
- ifneq ($(SDKROOT),)
- 	@for arch in $(ALT_ARCHS); do \
- 	  mkdir -p $(BUILD)/libffi.$$arch; \
-@@ -225,7 +238,7 @@
- 	/usr/bin/libtool -static -o $@.tmp $(FFI_BUILD)/.libs/${@F} $(BUILD)/libffi.*/.libs/${@F}
- 	mv $@.tmp $@
- endif
--
-+endif
- clean:
- 	$(RM) -rf $(BUILD) 
- 
diff --git a/debian/patches/20-set-library-path-for-tests.dpatch b/debian/patches/20-set-library-path-for-tests.dpatch
deleted file mode 100644
index 4926610..0000000
--- a/debian/patches/20-set-library-path-for-tests.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-set-library-path-for-tests.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set library path for junit tests.
-
- at DPATCH@
-diff -urNad libjna-java-3.0.4~/build.xml libjna-java-3.0.4/build.xml
---- libjna-java-3.0.4~/build.xml	2008-07-24 22:45:15.000000000 -0300
-+++ libjna-java-3.0.4/build.xml	2008-07-24 22:49:56.000000000 -0300
-@@ -402,6 +402,7 @@
-     <property name="tests.platform" value=""/>
-     <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-       <jvmarg value="-Djna.library.path=${build.native}"/>
-+      <jvmarg value="-Djava.library.path=${build.native}:${java.library.path}"/>
-       <!-- Avoid VM crashes, if possible -->
-       <jvmarg value="-Djna.protected=true"/>
-       <jvmarg value="-Ddir.build.suffix=${dir.build.suffix}"/>
diff --git a/debian/patches/25-no-special-build-dir-for-d64.dpatch b/debian/patches/25-no-special-build-dir-for-d64.dpatch
deleted file mode 100644
index 28be065..0000000
--- a/debian/patches/25-no-special-build-dir-for-d64.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25-no-special-build-dir-for-d64.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not build files for 64 bit platforms in a separate dir, as
-## DP: this would mean detecting it again in package building scripts.
-
- at DPATCH@
-diff -urNad libjna-java-3.0.4~/build.xml libjna-java-3.0.4/build.xml
---- libjna-java-3.0.4~/build.xml	2008-07-25 00:08:43.000000000 -0300
-+++ libjna-java-3.0.4/build.xml	2008-07-25 00:11:48.000000000 -0300
-@@ -76,7 +76,7 @@
-         <os arch="amd64"/>
-       </or>
-     </condition>
--    <property name="build" value="build${vm.arch}"/>
-+    <property name="build" value="build"/>
-     <property name="classes" location="${build}/classes"/>
-     <property name="eclipse.classes" location="build.eclipse/classes"/>
-     <property name="test.classes" location="${build}/test-classes"/>
-@@ -396,16 +396,12 @@
-     <condition property="vmopt.arch" value="-d64" else="-Dignore">
-       <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-     </condition>
--    <condition property="dir.build.suffix" value="-d64" else="">
--      <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
--    </condition>
-     <property name="tests.platform" value=""/>
-     <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-       <jvmarg value="-Djna.library.path=${build.native}"/>
-       <jvmarg value="-Djava.library.path=${build.native}:${java.library.path}"/>
-       <!-- Avoid VM crashes, if possible -->
-       <jvmarg value="-Djna.protected=true"/>
--      <jvmarg value="-Ddir.build.suffix=${dir.build.suffix}"/>
-       <jvmarg value="${vmopt.arch}"/>
-       <classpath><path refid="test.runpath"/></classpath>
-       <formatter type="xml"/>
diff --git a/debian/patches/30-link-javadoc-to-classpath.dpatch b/debian/patches/30-link-javadoc-to-classpath.dpatch
deleted file mode 100644
index 5868d88..0000000
--- a/debian/patches/30-link-javadoc-to-classpath.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-link-javadoc-to-classpath.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove reference to web documentation and refer instead to 
-## DP: classpath-doc.
-
- at DPATCH@
-diff -urNad libjna-java-3.0.2~/build.xml libjna-java-3.0.2/build.xml
---- libjna-java-3.0.2~/build.xml	2008-02-28 16:34:44.000000000 -0300
-+++ libjna-java-3.0.2/build.xml	2008-05-20 23:09:25.000000000 -0300
-@@ -450,7 +450,7 @@
-       <doctitle>JNA API Documentation</doctitle>
-       <header>${header}</header>
-       <bottom>${footer}</bottom>
--      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-+      <link href="file:///usr/share/doc/classpath-doc/api/"/>
- 
-       <packageset dir="${src}" defaultexcludes="yes">
-         <patternset>
diff --git a/debian/patches/40-change-md5sum.dpatch b/debian/patches/40-change-md5sum.dpatch
deleted file mode 100644
index 84fc5dc..0000000
--- a/debian/patches/40-change-md5sum.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-change-md5sum.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Jna fails to build when it detects a change in the headers 
-## DP: of the native library, but it relies on the output of javah to
-## DP: compute a md5sum, and javah from gcj produces different output.
-
- at DPATCH@
-diff -urNad libjna-java-3.0.2~/build.xml libjna-java-3.0.2/build.xml
---- libjna-java-3.0.2~/build.xml	2008-02-28 16:34:44.000000000 -0300
-+++ libjna-java-3.0.2/build.xml	2008-05-23 18:50:49.000000000 -0300
-@@ -40,7 +40,7 @@
-   <property name="jni.revision" value="3"/>
-   <property name="jni.build" value="${build.number}"/>
-   <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
--  <property name="jni.md5" value="892beacd437514d23ed9b1cefeb2ead6"/>
-+  <property name="jni.md5" value="3a865a03042a115149114fc8e01bd9c8"/>
-   <property name="spec.title" value="Java Native Access (JNA)"/>
-   <property name="spec.vendor" value="${vendor}"/>
-   <property name="spec.version" value="${jna.major}"/>
diff --git a/debian/patches/50-remove-gjdoc-inexistent-options.dpatch b/debian/patches/50-remove-gjdoc-inexistent-options.dpatch
deleted file mode 100644
index 171224b..0000000
--- a/debian/patches/50-remove-gjdoc-inexistent-options.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-remove-gjdoc-inexistent-options.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: gjdoc fails to generate javadoc when it is given the -notimestamp
-## DP: option.
-
- at DPATCH@
-diff -urNad libjna-java-3.0.2~/build.xml libjna-java-3.0.2/build.xml
---- libjna-java-3.0.2~/build.xml	2008-05-31 18:23:08.000000000 -0300
-+++ libjna-java-3.0.2/build.xml	2008-05-31 18:23:09.000000000 -0300
-@@ -472,7 +472,6 @@
-       <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
-       <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
- 
--      <arg value="-notimestamp"/>
-     </javadoc>
-   </target>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7391929..e1b1a5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01-nbproject.patch
+#01-nbproject.patch
 02-builddir.patch
 03-dynlink-and-cflags.patch
 04-load-native-code-from-fs.patch

-- 
Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI



More information about the pkg-java-commits mailing list