Author: tiagosab-guest Date: 2008-07-26 18:41:39 +0000 (Sat, 26 Jul 2008) New Revision: 6760
Added: trunk/libjna-java/debian/ trunk/libjna-java/debian/README.Debian trunk/libjna-java/debian/ant.properties trunk/libjna-java/debian/changelog trunk/libjna-java/debian/compat trunk/libjna-java/debian/control trunk/libjna-java/debian/copyright trunk/libjna-java/debian/libjna-java-doc.doc-base trunk/libjna-java/debian/libjna-java-doc.examples trunk/libjna-java/debian/libjna-java.dirs trunk/libjna-java/debian/libjna-java.install trunk/libjna-java/debian/patches/ trunk/libjna-java/debian/patches/00list trunk/libjna-java/debian/patches/10-dynlink-and-cflags.dpatch trunk/libjna-java/debian/patches/20-set-library-path-for-tests.dpatch trunk/libjna-java/debian/patches/25-no-special-build-dir-for-d64.dpatch trunk/libjna-java/debian/patches/30-link-javadoc-to-classpath.dpatch trunk/libjna-java/debian/patches/40-change-md5sum.dpatch trunk/libjna-java/debian/patches/50-remove-gjdoc-inexistent-options.dpatch trunk/libjna-java/debian/repack-source.sh trunk/libjna-java/debian/rules trunk/libjna-java/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/libjna-java/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Added: trunk/libjna-java/debian/README.Debian =================================================================== --- trunk/libjna-java/debian/README.Debian (rev 0) +++ trunk/libjna-java/debian/README.Debian 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,12 @@ +jna for Debian +-------------- + +This package has been patched to use external libffi and to build only +the library for the current architecture. However, the libffi version +contained in jna's svn repository is itself patched, and the absence +of this patch in debian's libffi causes one of libjna's tests to +fail. The patch to libffi has already been submitted upstream [1]. + + -- Tiago Saboga <[EMAIL PROTECTED]>, Sun, 18 May 2008 21:42:56 -0300 + +[1] - http://gcc.gnu.org/ml/gcc-patches/2008-01/msg01095.html Added: trunk/libjna-java/debian/ant.properties =================================================================== --- trunk/libjna-java/debian/ant.properties (rev 0) +++ trunk/libjna-java/debian/ant.properties 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,3 @@ +dynlink.native=true +nomixedjar.native=true +javadoc.link=/usr/share/doc/classpath-doc/api/ \ No newline at end of file Added: trunk/libjna-java/debian/changelog =================================================================== --- trunk/libjna-java/debian/changelog (rev 0) +++ trunk/libjna-java/debian/changelog 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,6 @@ +libjna-java (3.0.4-1) unstable; urgency=low + + * Initial release (Closes: #480074) + + -- Tiago Saboga <[EMAIL PROTECTED]> Fri, 25 Jul 2008 23:04:03 -0300 + Added: trunk/libjna-java/debian/compat =================================================================== --- trunk/libjna-java/debian/compat (rev 0) +++ trunk/libjna-java/debian/compat 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1 @@ +5 Added: trunk/libjna-java/debian/control =================================================================== --- trunk/libjna-java/debian/control (rev 0) +++ trunk/libjna-java/debian/control 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,59 @@ +Source: libjna-java +Priority: optional +Section: libs +Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> +Uploaders: Tiago Saboga <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5), default-jdk-builddep, ant, dpatch, ant-optional, libx11-dev, libxt-dev, pkg-config, libffi-dev +Build-Depends-Indep: classpath-doc +Homepage: https://jna.dev.java.net/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjna-java +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjna-java +Standards-Version: 3.8.0 + +Package: libjna-java +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime +Suggests: libjna-java-doc +Description: Dynamic access of native libraries from Java without JNI + JNA provides Java programs easy access to native shared libraries + without writing anything but Java code—no JNI or native code is + required. This functionality is comparable to Windows' + Platform/Invoke and Python's ctypes. Access is dynamic at runtime + without code generation. + . + JNA's design aims to provide native access in a natural way with a + minimum of effort. No boilerplate or generated code is + required. While some attention is paid to performance, correctness + and ease of use take priority. + . + The JNA library uses a small native library stub to dynamically + invoke native code. The developer uses a Java interface to describe + functions and structures in the target native library. This makes it + quite easy to take advantage of native platform features without + incurring the high overhead of configuring and building JNI code for + multiple platforms. + +Package: libjna-java-doc +Section: doc +Architecture: all +Suggests: libjna-java +Description: Access of native libraries from Java without JNI - javadoc + JNA provides Java programs easy access to native shared libraries + without writing anything but Java code—no JNI or native code is + required. This functionality is comparable to Windows' + Platform/Invoke and Python's ctypes. Access is dynamic at runtime + without code generation. + . + JNA's design aims to provide native access in a natural way with a + minimum of effort. No boilerplate or generated code is + required. While some attention is paid to performance, correctness + and ease of use take priority. + . + The JNA library uses a small native library stub to dynamically + invoke native code. The developer uses a Java interface to describe + functions and structures in the target native library. This makes it + quite easy to take advantage of native platform features without + incurring the high overhead of configuring and building JNI code for + multiple platforms. + . + This package contain the documentation relative to the library. Added: trunk/libjna-java/debian/copyright =================================================================== --- trunk/libjna-java/debian/copyright (rev 0) +++ trunk/libjna-java/debian/copyright 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,35 @@ +This package was debianized by Tiago Saboga <[EMAIL PROTECTED]> on +Mon, 05 May 2008 09:46:59 -0300. + +It was downloaded from <http://jna.dev.java.net> + +Upstream Authors: +Timothy Wall <[EMAIL PROTECTED]> and others + +Copyright: + Copyright 1998 Sun Microsystems, Inc. + Copyright 2007-2008 Timothy Wall + Copyright 2007 Thomas Boerkel + Copyright 2007 Wayne Meissner + Copyright 2007 Olivier Chafik + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + as published by the Free Software Foundation; either version 2.1 + of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + The Debian packaging is Copyright 2008 Tiago Saboga + <[EMAIL PROTECTED]> and is licensed under the LGPL, version + 2.1 or later. + +On Debian GNU/Linux systems, the complete text of the version 2.1 +of the GNU Lesser General Public License can be found in +/usr/share/common-licenses/LGPL-2.1 . + Added: trunk/libjna-java/debian/libjna-java-doc.doc-base =================================================================== --- trunk/libjna-java/debian/libjna-java-doc.doc-base (rev 0) +++ trunk/libjna-java/debian/libjna-java-doc.doc-base 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,8 @@ +Document: libjna-javadoc +Title: JNA API Documentation +Author: Timothy Wall and others +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjna-java-doc/api/index.html +Files: /usr/share/doc/libjna-java-doc/api/*.html Added: trunk/libjna-java/debian/libjna-java-doc.examples =================================================================== --- trunk/libjna-java/debian/libjna-java-doc.examples (rev 0) +++ trunk/libjna-java/debian/libjna-java-doc.examples 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1 @@ +contrib/* \ No newline at end of file Added: trunk/libjna-java/debian/libjna-java.dirs =================================================================== --- trunk/libjna-java/debian/libjna-java.dirs (rev 0) +++ trunk/libjna-java/debian/libjna-java.dirs 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,2 @@ +usr/share/java +usr/lib/jni Added: trunk/libjna-java/debian/libjna-java.install =================================================================== --- trunk/libjna-java/debian/libjna-java.install (rev 0) +++ trunk/libjna-java/debian/libjna-java.install 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1 @@ +build/native/libjnidispatch*.so usr/lib/jni Added: trunk/libjna-java/debian/patches/00list =================================================================== --- trunk/libjna-java/debian/patches/00list (rev 0) +++ trunk/libjna-java/debian/patches/00list 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,6 @@ +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 Added: trunk/libjna-java/debian/patches/10-dynlink-and-cflags.dpatch =================================================================== --- trunk/libjna-java/debian/patches/10-dynlink-and-cflags.dpatch (rev 0) +++ trunk/libjna-java/debian/patches/10-dynlink-and-cflags.dpatch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,146 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-dynlink-and-cflags.dpatch by Tiago Saboga <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Dynamically link to system libffi instead of using own copy. + [EMAIL PROTECTED]@ +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 [EMAIL PROTECTED] $(FFI_BUILD)/.libs/[EMAIL PROTECTED] $(BUILD)/libffi.*/.libs/[EMAIL PROTECTED] + mv [EMAIL PROTECTED] $@ + endif +- ++endif + clean: + $(RM) -rf $(BUILD) + Property changes on: trunk/libjna-java/debian/patches/10-dynlink-and-cflags.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/patches/20-set-library-path-for-tests.dpatch =================================================================== --- trunk/libjna-java/debian/patches/20-set-library-path-for-tests.dpatch (rev 0) +++ trunk/libjna-java/debian/patches/20-set-library-path-for-tests.dpatch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-set-library-path-for-tests.dpatch by Tiago Saboga <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Set library path for junit tests. + [EMAIL PROTECTED]@ +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}"/> Property changes on: trunk/libjna-java/debian/patches/20-set-library-path-for-tests.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/patches/25-no-special-build-dir-for-d64.dpatch =================================================================== --- trunk/libjna-java/debian/patches/25-no-special-build-dir-for-d64.dpatch (rev 0) +++ trunk/libjna-java/debian/patches/25-no-special-build-dir-for-d64.dpatch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25-no-special-build-dir-for-d64.dpatch by Tiago Saboga <[EMAIL PROTECTED]> +## +## 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. + [EMAIL PROTECTED]@ +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"/> Property changes on: trunk/libjna-java/debian/patches/25-no-special-build-dir-for-d64.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/patches/30-link-javadoc-to-classpath.dpatch =================================================================== --- trunk/libjna-java/debian/patches/30-link-javadoc-to-classpath.dpatch (rev 0) +++ trunk/libjna-java/debian/patches/30-link-javadoc-to-classpath.dpatch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-link-javadoc-to-classpath.dpatch by Tiago Saboga <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove reference to web documentation and refer instead to +## DP: classpath-doc. + [EMAIL PROTECTED]@ +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> Property changes on: trunk/libjna-java/debian/patches/30-link-javadoc-to-classpath.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/patches/40-change-md5sum.dpatch =================================================================== --- trunk/libjna-java/debian/patches/40-change-md5sum.dpatch (rev 0) +++ trunk/libjna-java/debian/patches/40-change-md5sum.dpatch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-change-md5sum.dpatch by Tiago Saboga <[EMAIL PROTECTED]> +## +## 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. + [EMAIL PROTECTED]@ +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}"/> Property changes on: trunk/libjna-java/debian/patches/40-change-md5sum.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/patches/50-remove-gjdoc-inexistent-options.dpatch =================================================================== --- trunk/libjna-java/debian/patches/50-remove-gjdoc-inexistent-options.dpatch (rev 0) +++ trunk/libjna-java/debian/patches/50-remove-gjdoc-inexistent-options.dpatch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-remove-gjdoc-inexistent-options.dpatch by Tiago Saboga <[EMAIL PROTECTED]> +## +## 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. + [EMAIL PROTECTED]@ +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> + Property changes on: trunk/libjna-java/debian/patches/50-remove-gjdoc-inexistent-options.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/repack-source.sh =================================================================== --- trunk/libjna-java/debian/repack-source.sh (rev 0) +++ trunk/libjna-java/debian/repack-source.sh 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,48 @@ +#!/bin/sh + +if [ $# -ne 3 ] +then + echo "Usage: $0 option version filename" + echo "If option=--upstream-version, run uupdate after repacking sources." + echo "Filename is never used, as uscan will always download the wrong file." + exit +fi + +VERSION=$2 + +CURDIR=$(pwd) +TMPDIR=`mktemp -d libjna-tmp` +BASEDIR=$TMPDIR/libjna-java-${VERSION} +mkdir ${BASEDIR} + +# retrieve sources from svn +# svn export https://jna.dev.java.net/svn/jna/tags/${VERSION}/jnalib/ --username guest ${BASEDIR} +wget --user guest --password "" \ + --directory-prefix=${TMPDIR} \ + https://jna.dev.java.net/svn/jna/tags/${VERSION}/jnalib/dist/src.zip \ + https://jna.dev.java.net/svn/jna/tags/${VERSION}/jnalib/src/com/sun/jna/overview.html \ + https://jna.dev.java.net/svn/jna/tags/${VERSION}/jnalib/src/com/sun/jna/package.html + +unzip -d ${BASEDIR} ${TMPDIR}/src.zip + +# remove jar files +rm -rf ${BASEDIR}/lib + +# remove libffi +rm -rf ${BASEDIR}/native/libffi + +# files missing in src.zip +mv ${TMPDIR}/*html ${BASEDIR}/src/com/sun/jna/ + +# Repack +GZIP=-9 tar -C "$TMPDIR" -czf ../libjna-java_${VERSION}.orig.tar.gz "libjna-java-${VERSION}" + +# Clean temporary files +rm -rf "$TMPDIR" +rm -rf "$BASEDIR" +rm -f "$FILENAME" + +if [ $1 = --upstream-version ] ; +then + uupdate --upstream-version $2 $3 +fi Added: trunk/libjna-java/debian/rules =================================================================== --- trunk/libjna-java/debian/rules (rev 0) +++ trunk/libjna-java/debian/rules 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,81 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +JAVA_HOME:=/usr/lib/jvm/default-java +ANT_OPTIONS:=-propertyfile debian/ant.properties +DEB_VERSION:=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_UPSTREAM_VERSION:=$(shell echo $(DEB_VERSION) | sed -e 's/-.*//') + +build: patch-stamp build-stamp +build-stamp: + dh_testdir + JAVA_HOME=$(JAVA_HOME) ant jar examples javadoc $(ANT_OPTIONS) + -JAVA_HOME=$(JAVA_HOME) ant test $(ANT_OPTIONS) + touch $@ + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + JAVA_HOME=$(JAVA_HOME) ant clean + rm build.number + dh_clean + +patch: patch-stamp +patch-stamp: + dpatch apply-all + dpatch cat-all >patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +install-arch: build + dh_testdir + dh_testroot + dh_installdirs + dh_installchangelogs -a + install -m 644 build/jna.jar \ + $(CURDIR)/debian/libjna-java/usr/share/java/jna-$(DEB_UPSTREAM_VERSION).jar + dh_link -plibjna-java \ + usr/share/java/jna-$(DEB_UPSTREAM_VERSION).jar \ + usr/share/java/jna.jar + +install-indep: build + dh_testdir + dh_testroot + dh_installdocs -i + dh_installchangelogs -i + dh_installexamples -i + cp -r doc/javadoc $(CURDIR)/debian/libjna-java-doc/usr/share/doc/libjna-java-doc/api + +binary-indep: install-indep + dh_testdir + dh_testroot + dh_fixperms -i + dh_compress -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install-arch + dh_testdir + dh_testroot + dh_installdocs -a + dh_install -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install-arch install-indep patch unpatch Property changes on: trunk/libjna-java/debian/rules ___________________________________________________________________ Name: svn:executable + * Added: trunk/libjna-java/debian/watch =================================================================== --- trunk/libjna-java/debian/watch (rev 0) +++ trunk/libjna-java/debian/watch 2008-07-26 18:41:39 UTC (rev 6760) @@ -0,0 +1,5 @@ +version=3 + +https://jna.dev.java.net/source/browse/jna/tags/ ([\d\.]+\d)/ debian debian/repack-source.sh + + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
