debian/0000755000000000000000000000000012157454465007203 5ustar debian/watch0000644000000000000000000000016012157454465010231 0ustar version=3 http://github.com/wmeissner/jffi/downloads \ /wmeissner/jffi/tarball/(.*) debian debian/orig-tar.sh debian/README.Debian-source0000644000000000000000000000036112157454465012542 0ustar jffi ==== Use the rules/get-orig-source target to create the orig.tar.gz. For more details on repackaging of upstream sources please see the debian/orig-tar.sh file. -- Torsten Werner Fri, 30 Jul 2010 21:47:34 +0200 debian/rules0000755000000000000000000000162512157454465010267 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := -Duse.system.libffi=1 jar test DEB_JARS := ant-nodeps ant-junit junit4 common-post-build-indep:: # Generate OSGi metadata for jffi.jar bnd wrap -properties debian/jffi.bnd -output dist/jffi.jar dist/jffi.jar install/libjffi-java:: mh_installpom -plibjffi-java pom.xml $(JAVA_HOME)/bin/jar umf debian/manifest dist/jffi.jar mh_installjar -plibjffi-java pom.xml -l dist/jffi.jar install/libjffi-jni:: install -D -m644 dist/jffi-*-*.jar \ debian/libjffi-jni/usr/lib/jffi/jffi-native.jar cp ./build/jni/libjffi-1.0.so debian/libjffi-jni/usr/lib/ binary-predeb/libjffi-jni:: rm -f debian/libjffi-jni/usr/lib/libjffi-1.0.so get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename debian/changelog0000644000000000000000000000623012157454465011056 0ustar jffi (1.0.2-11) unstable; urgency=low * Re-enable OSGi metadata generation. - Request from Ubuntu only applies to their 'main' components, this package is in 'universe'. -- Jakub Adam Sat, 15 Jun 2013 20:23:54 +0200 jffi (1.0.2-10) unstable; urgency=low * Team upload. [ Jakub Adam ] * Add OSGi metadata into jffi.jar. (currently disabled - see below) * Add Jakub Adam to Uploaders. * Bump Standards-Version to 3.9.4. [ tony mancill ] * Comment-out call to bnd as per request on debian-java: - http://lists.debian.org/debian-java/2013/02/msg00057.html * Remove non UTF-8 in debian changelog. (Closes: #711890) * Acknowledge NMU - thank you to Matthias Klose. - Closes: #646594, #707797, #701301 * Address lintian warning regarding BSD license. -- tony mancill Mon, 10 Jun 2013 13:16:54 -0700 jffi (1.0.2-9.1) unstable; urgency=low * Non maintainer upload. * Remove Torsten Werner from uploaders. * Don't hard-code dependency on libffi runtime library. Closes: #646593, #707797. * Fix build failure with GCC 4.8. Closes: #701301. -- Matthias Klose Sun, 12 May 2013 01:00:25 +0200 jffi (1.0.2-9) unstable; urgency=low * Team upload. * Patch d/control build-dep on default-jdk. (Closes: #675180) - Thanks to James Page. * Bump Standards-Version to 3.9.3 (no changes). * d/copyright: update for DEP5 and to address lintian warnings. * d/control: update Vcs-Git URL. -- tony mancill Wed, 30 May 2012 21:48:31 -0700 jffi (1.0.2-8.1) unstable; urgency=low * Non maintainer upload. * Fix build failure with GCC 4.7. Closes: #667215. -- Matthias Klose Fri, 04 May 2012 08:53:38 +0200 jffi (1.0.2-8) unstable; urgency=low * Add version restriction to Depends: libjffi-jni. * Add a patch to load jffi-native.jar from system directory. -- Torsten Werner Sat, 17 Sep 2011 11:44:48 +0200 jffi (1.0.2-7) experimental; urgency=low * Change Build-Depends: openjdk-6-jdk. (Closes: #594023) -- Torsten Werner Thu, 16 Sep 2010 22:35:57 +0200 jffi (1.0.2-6) unstable; urgency=low * Do not add -m32 or -m64 to CC and LD in libtest, too. -- Torsten Werner Thu, 05 Aug 2010 05:12:12 +0200 jffi (1.0.2-5) unstable; urgency=low * Do not add -m32 or -m64 to CC and LD. -- Torsten Werner Thu, 05 Aug 2010 04:29:25 +0200 jffi (1.0.2-4) unstable; urgency=low * Move all Build-Depends-Indep to Build-Depends. (Closes: #591641) -- Torsten Werner Thu, 05 Aug 2010 02:53:54 +0200 jffi (1.0.2-3) unstable; urgency=low * Fix debian/copyright. -- Torsten Werner Sun, 01 Aug 2010 19:59:54 +0200 jffi (1.0.2-2) unstable; urgency=low * Add missing Build-Depends: pkg-config. * Add missing Depends: libffi5 to -jni package. -- Torsten Werner Sat, 31 Jul 2010 18:13:35 +0200 jffi (1.0.2-1) unstable; urgency=low * Initial Release (closes: #590990). - The package is needed by JRuby. -- Torsten Werner Fri, 30 Jul 2010 21:47:34 +0200 debian/jffi.bnd0000644000000000000000000000026212157454465010606 0ustar Bundle-Name: Java Foreign Function Interface Bundle-SymbolicName: com.kenai.jffi Bundle-Version: 1.0.0 Bundle-Vendor: Debian.org Import-Package: sun.misc;resolution:=optional, * debian/patches/0000755000000000000000000000000012157454465010632 5ustar debian/patches/0004-load-jffi-native.jar-from-system-directory.patch0000644000000000000000000000401612157454465022414 0ustar From: twerner@debian.org Date: Sat, 17 Sep 2011 11:43:48 +0200 Subject: load jffi-native.jar from system directory --- src/com/kenai/jffi/Init.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) Index: b/src/com/kenai/jffi/Init.java =================================================================== --- a/src/com/kenai/jffi/Init.java 2013-05-11 23:11:40.488998792 +0000 +++ b/src/com/kenai/jffi/Init.java 2013-05-11 23:11:40.484998854 +0000 @@ -27,6 +27,9 @@ import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; import java.util.Properties; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.MalformedURLException; /** * Utility class to load the jffi stub library @@ -159,7 +162,20 @@ private static final InputStream getStubLibraryStream() { String path = getStubLibraryPath(); - InputStream is = Init.class.getResourceAsStream(path); + File jar = new File("/usr/lib/jffi/jffi-native.jar"); + if (jar == null) { + throw new UnsatisfiedLinkError("Could not open jar file /usr/lib/jffi/jffi-native.jar"); + } + URL url; + try { + url = jar.toURL(); + } + catch(MalformedURLException e) { + throw new UnsatisfiedLinkError("Problem with /usr/lib/jffi/jffi-native.jar"); + } + URL[] urls = { url }; + URLClassLoader ulc = new URLClassLoader(urls); + InputStream is = ulc.getResourceAsStream(path); // On MacOS, the stub might be named .dylib or .jnilib - cater for both if (is == null && Platform.getPlatform().getOS() == Platform.OS.DARWIN) { @@ -188,7 +204,7 @@ * @return The path of the jar file. */ private static final String getStubLibraryPath() { - return "/jni/" + Platform.getPlatform().getName() + "/"+ System.mapLibraryName(stubLibraryName); + return "jni/" + Platform.getPlatform().getName() + "/"+ System.mapLibraryName(stubLibraryName); } } debian/patches/series0000644000000000000000000000027412157454465012052 0ustar 0001-don-t-access-removed-jars.patch 0002-ignore-test-failures.patch 0003-do-not-add-m32-or-m64-to-CC-and-LD.patch 0004-load-jffi-native.jar-from-system-directory.patch ftbfs-gcc-4.7.diff debian/patches/0003-do-not-add-m32-or-m64-to-CC-and-LD.patch0000644000000000000000000000223712157454465017546 0ustar From: Torsten Werner Date: Thu, 5 Aug 2010 04:28:08 +0200 Subject: do not add -m32 or -m64 to CC and LD --- jni/GNUmakefile | 4 ++-- libtest/GNUmakefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/GNUmakefile b/jni/GNUmakefile index 87d1ef1..166ff8a 100755 --- a/jni/GNUmakefile +++ b/jni/GNUmakefile @@ -198,8 +198,8 @@ endif ifneq ($(strip $(findstring $(OS), linux solaris)),) # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags # makes the libffi build choke - CC += -m$(MODEL) - LD += -m$(MODEL) + #CC += -m$(MODEL) + #LD += -m$(MODEL) endif LIBJFFI = $(BUILD_DIR)/$(PREFIX)$(LIBNAME)-$(VERSION).$(JNIEXT) diff --git a/libtest/GNUmakefile b/libtest/GNUmakefile index 298a612..bd2928a 100644 --- a/libtest/GNUmakefile +++ b/libtest/GNUmakefile @@ -149,8 +149,8 @@ endif ifneq ($(strip $(findstring $(OS), linux solaris)),) # Change the CC/LD instead of CFLAGS/LDFLAGS, incase other things in the flags # makes the libffi build choke - CC += -m$(MODEL) - LD += -m$(MODEL) + #CC += -m$(MODEL) + #LD += -m$(MODEL) endif LIBTEST = $(BUILD_DIR)/$(LIBNAME) -- debian/patches/0001-don-t-access-removed-jars.patch0000644000000000000000000001065312157454465017112 0ustar From: Torsten Werner Date: Fri, 30 Jul 2010 21:32:52 +0200 Subject: don't access removed jars --- custom-build.xml | 11 ----------- nbproject/build-impl.xml | 15 ++++++--------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/custom-build.xml b/custom-build.xml index fedf250..2ee9ea3 100644 --- a/custom-build.xml +++ b/custom-build.xml @@ -198,18 +198,7 @@ - - - - - - - - - - - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index b7e8374..2219b94 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -506,14 +506,13 @@ is divided into following sections: - - + - + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" @@ -531,13 +530,12 @@ is divided into following sections: - - + - + @@ -552,13 +550,12 @@ is divided into following sections: - - + - + -- debian/patches/ftbfs-gcc-4.7.diff0000644000000000000000000000253712157454465013637 0ustar Index: b/jni/GNUmakefile =================================================================== --- a/jni/GNUmakefile 2013-05-11 23:13:56.101912633 +0000 +++ b/jni/GNUmakefile 2013-05-11 23:14:28.978133869 +0000 @@ -65,7 +65,7 @@ # MacOS headers aren't completely warning free, so turn them off ifneq ($(OS),darwin) - WFLAGS += -Wundef -Werror + WFLAGS += -Wundef -Werror -Wno-error=unused-parameter endif WFLAGS += -W -Wall -Wno-unused -Wno-parentheses PICFLAGS = -fPIC @@ -156,7 +156,7 @@ endif ifeq ($(OS), linux) - SOFLAGS = -shared -mimpure-text -static-libgcc -Wl,-soname,$(@F) -Wl,-O1 + SOFLAGS = -shared -static-libgcc -Wl,-soname,$(@F) -Wl,-O1 CFLAGS += -pthread endif Index: b/libtest/GNUmakefile =================================================================== --- a/libtest/GNUmakefile 2013-05-11 23:13:56.101912633 +0000 +++ b/libtest/GNUmakefile 2013-05-11 23:14:17.886064740 +0000 @@ -45,9 +45,9 @@ # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing OFLAGS = -O2 $(JFLAGS) -WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses +WFLAGS = -W -Werror -Wno-error=unused-parameter -Wall -Wno-unused -Wno-parentheses PICFLAGS = -fPIC -SOFLAGS = -shared -mimpure-text -Wl,-O1 +SOFLAGS = -shared -Wl,-O1 LDFLAGS += $(SOFLAGS) IFLAGS = -I"$(BUILD_DIR)" debian/patches/0002-ignore-test-failures.patch0000644000000000000000000000264712157454465016313 0ustar From: Torsten Werner Date: Fri, 30 Jul 2010 22:17:56 +0200 Subject: ignore test failures --- nbproject/build-impl.xml | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 2219b94..968288c 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -704,7 +704,6 @@ is divided into following sections: - Some tests failed; see details above. @@ -717,7 +716,6 @@ is divided into following sections: - Some tests failed; see details above.