Author: mkoch Date: 2009-10-01 21:04:36 +0000 (Thu, 01 Oct 2009) New Revision: 10726
Added: trunk/libjna-java/debian/libjna-java-doc.install trunk/libjna-java/debian/libjna-java.README.Debian trunk/libjna-java/debian/patches/01-nbproject.patch trunk/libjna-java/debian/patches/02-builddir.patch trunk/libjna-java/debian/patches/03-dynlink-and-cflags.patch trunk/libjna-java/debian/patches/series Modified: 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.install trunk/libjna-java/debian/rules Log: libjna-java (3.1.0-5) unstable; urgency=low * Removing vcs fields. * Removing README.source. * Orphaning package. -- Daniel Baumann <[email protected]> Thu, 27 Aug 2009 08:47:56 +0200 libjna-java (3.1.0-4) unstable; urgency=low * Rediffing nbproject.patch (Closes: #538624). * Updating to standards version 3.8.3. * Adding maintainer homepage field to control. * Marking maintainer homepage field to be also included in binary packages and changelog. * Adding README.source. -- Daniel Baumann <[email protected]> Tue, 25 Aug 2009 11:41:51 +0200 libjna-java (3.1.0-3) unstable; urgency=low * Updating maintainer field. * Updating vcs fields. * Updating, sorting and wrapping depends. -- Daniel Baumann <[email protected]> Sat, 15 Aug 2009 09:40:19 +0200 libjna-java (3.1.0-2) unstable; urgency=low * Removing watch file. * Flipping maintainer and uploaders field. * Upgrading package to standards version 3.8.2. * Updating package sections. -- Daniel Baumann <[email protected]> Sun, 26 Jul 2009 15:57:25 +0200 libjna-java (3.1.0-1) unstable; urgency=low * Updating standards to 3.8.1. * Using correct rfc-2822 date formats in changelog. * Merging upstream version 3.1.0. * Updating version number in rules. * Updating year in copyright file. * Updating rules file to current state of the art. -- Daniel Baumann <[email protected]> Tue, 09 Jun 2009 11:36:24 +0200 libjna-java (3.0.9-1) unstable; urgency=low * Initial release (Closes: #480074). -- Daniel Baumann <[email protected]> Fri, 02 Jan 2009 09:41:00 -0500 Modified: trunk/libjna-java/debian/changelog =================================================================== --- trunk/libjna-java/debian/changelog 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/changelog 2009-10-01 21:04:36 UTC (rev 10726) @@ -1,6 +1,52 @@ -libjna-java (3.0.4-1) UNRELEASED; urgency=low +libjna-java (3.1.0-5) unstable; urgency=low - * Initial release (Closes: #480074) + * Removing vcs fields. + * Removing README.source. + * Orphaning package. - -- Tiago Saboga <[email protected]> Fri, 26 Jul 2008 23:04:03 -0300 + -- Daniel Baumann <[email protected]> Thu, 27 Aug 2009 08:47:56 +0200 +libjna-java (3.1.0-4) unstable; urgency=low + + * Rediffing nbproject.patch (Closes: #538624). + * Updating to standards version 3.8.3. + * Adding maintainer homepage field to control. + * Marking maintainer homepage field to be also included in binary + packages and changelog. + * Adding README.source. + + -- Daniel Baumann <[email protected]> Tue, 25 Aug 2009 11:41:51 +0200 + +libjna-java (3.1.0-3) unstable; urgency=low + + * Updating maintainer field. + * Updating vcs fields. + * Updating, sorting and wrapping depends. + + -- Daniel Baumann <[email protected]> Sat, 15 Aug 2009 09:40:19 +0200 + +libjna-java (3.1.0-2) unstable; urgency=low + + * Removing watch file. + * Flipping maintainer and uploaders field. + * Upgrading package to standards version 3.8.2. + * Updating package sections. + + -- Daniel Baumann <[email protected]> Sun, 26 Jul 2009 15:57:25 +0200 + +libjna-java (3.1.0-1) unstable; urgency=low + + * Updating standards to 3.8.1. + * Using correct rfc-2822 date formats in changelog. + * Merging upstream version 3.1.0. + * Updating version number in rules. + * Updating year in copyright file. + * Updating rules file to current state of the art. + + -- Daniel Baumann <[email protected]> Tue, 09 Jun 2009 11:36:24 +0200 + +libjna-java (3.0.9-1) unstable; urgency=low + + * Initial release (Closes: #480074). + + -- Daniel Baumann <[email protected]> Fri, 02 Jan 2009 09:41:00 -0500 Modified: trunk/libjna-java/debian/compat =================================================================== --- trunk/libjna-java/debian/compat 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/compat 2009-10-01 21:04:36 UTC (rev 10726) @@ -1 +1 @@ -5 +7 Modified: trunk/libjna-java/debian/control =================================================================== --- trunk/libjna-java/debian/control 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/control 2009-10-01 21:04:36 UTC (rev 10726) @@ -1,59 +1,43 @@ Source: libjna-java +Section: 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 +Maintainer: Debian QA Group <[email protected]> +Uploaders: Yulia Novozhilova <[email protected]> +Build-Depends: + debhelper (>= 7), ant, ant-optional, libx11-dev, libxt-dev, libffi-dev, + openjdk-6-jdk, pkg-config, quilt +Standards-Version: 3.8.3 +Homepage: http://jna.dev.java.net/ Package: libjna-java +Section: java Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime +Depends: ${misc:Depends}, ${shlibs: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 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. + 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. + 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. +Depends: ${misc:Depends} +Description: Dynamic access of native libraries from Java without JNI (documentation) + 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. + This package contains the Javadoc API documentation. Modified: trunk/libjna-java/debian/copyright =================================================================== --- trunk/libjna-java/debian/copyright 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/copyright 2009-10-01 21:04:36 UTC (rev 10726) @@ -1,35 +1,51 @@ -This package was debianized by Tiago Saboga <[email protected]> on -Mon, 05 May 2008 09:46:59 -0300. +Author: Timothy Wall <[email protected]> +Download: https://jna.dev.java.net/ -It was downloaded from <http://jna.dev.java.net> +Files: * +Copyright: + (C) 1998 Sun Microsystems, Inc. + (C) 2007-2009 Timothy Wall <[email protected]> + (C) 2007 Thomas Boerkel + (C) 2007 Wayne Meissner + (C) 2007 Olivier Chafik +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Library General Public License + can be found in /usr/share/common-licenses/LGPL-2.1 file. -Upstream Authors: -Timothy Wall <[email protected]> and others - +Files: debian/* 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 . - + (C) 2008-2009 Daniel Baumann <[email protected]> + (C) 2008 Sun Microsystems, Inc. +License: BSD + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Modified: trunk/libjna-java/debian/libjna-java-doc.doc-base =================================================================== --- trunk/libjna-java/debian/libjna-java-doc.doc-base 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/libjna-java-doc.doc-base 2009-10-01 21:04:36 UTC (rev 10726) @@ -1,4 +1,4 @@ -Document: libjna-javadoc +Document: libjna-java-doc Title: JNA API Documentation Author: Timothy Wall and others Section: Programming Added: trunk/libjna-java/debian/libjna-java-doc.install =================================================================== --- trunk/libjna-java/debian/libjna-java-doc.install (rev 0) +++ trunk/libjna-java/debian/libjna-java-doc.install 2009-10-01 21:04:36 UTC (rev 10726) @@ -0,0 +1 @@ +doc/javadoc/* /usr/share/doc/libjna-java-doc/api Added: trunk/libjna-java/debian/libjna-java.README.Debian =================================================================== --- trunk/libjna-java/debian/libjna-java.README.Debian (rev 0) +++ trunk/libjna-java/debian/libjna-java.README.Debian 2009-10-01 21:04:36 UTC (rev 10726) @@ -0,0 +1,11 @@ +libjna-java for Debian +---------------------- + +According to the current Debian policy for java [1], all jvm should include +/usr/lib/jni in their default library search path. Apparently this is not the +case; if libjnidispatch.so is not found when calling jna, please add +"-Djava.library.path=/usr/lib/jni" to your java invocation. + +[1] http://www.debian.org/doc/packaging-manuals/java-policy/c36.html#policy-vm + + -- Yulia Novozhilova <[email protected]> Wed, 18 Jun 2008 15:44:48 +0400 Modified: trunk/libjna-java/debian/libjna-java.install =================================================================== --- trunk/libjna-java/debian/libjna-java.install 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/libjna-java.install 2009-10-01 21:04:36 UTC (rev 10726) @@ -1 +1 @@ -build/native/libjnidispatch*.so usr/lib/jni +build/native/libjnidispatch.so /usr/lib/jni Added: trunk/libjna-java/debian/patches/01-nbproject.patch =================================================================== --- trunk/libjna-java/debian/patches/01-nbproject.patch (rev 0) +++ trunk/libjna-java/debian/patches/01-nbproject.patch 2009-10-01 21:04:36 UTC (rev 10726) @@ -0,0 +1,22 @@ +Author: Rene Engelhard <[email protected]> +Description: fix build.xml to remove nbproject usage as we don't have it. + +diff -Naurp libjna-java.orig/build.xml libjna-java/build.xml +--- libjna-java.orig/build.xml 2009-08-14 23:39:32.000000000 +0000 ++++ libjna-java/build.xml 2009-08-15 09:15:11.000000000 +0000 +@@ -58,7 +58,6 @@ + + <target name="default" depends="test" description="Build and Test."/> + +- <import file="nbproject/profiler-build-impl.xml"/> + <target name="init" depends="-setup"/> + <target name="compile-test-single" depends="compile-tests"/> + <target name="compile-single" depends="compile"/> +@@ -592,7 +591,6 @@ + <zipfileset src="${dist}/src.zip"/> + <zipfileset dir="lib" includes="junit.jar" prefix="lib"/> + <zipfileset dir="." includes=".classpath,.project"/> +- <zipfileset dir="nbproject" includes="**/*" prefix="nbproject"/> + <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/> + </zip> + <!-- Sources package as required by maven --> Added: trunk/libjna-java/debian/patches/02-builddir.patch =================================================================== --- trunk/libjna-java/debian/patches/02-builddir.patch (rev 0) +++ trunk/libjna-java/debian/patches/02-builddir.patch 2009-10-01 21:04:36 UTC (rev 10726) @@ -0,0 +1,15 @@ +Author: Yulia Novozhilova <[email protected]> +Description: no special build dir for d64 + +diff -Naurp libjna-java.orig/build.xml libjna-java/build.xml +--- libjna-java.orig/build.xml 2008-10-31 06:15:32.000000000 +0000 ++++ libjna-java/build.xml 2009-01-02 15:21:43.000000000 +0000 +@@ -83,7 +83,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"/> Added: trunk/libjna-java/debian/patches/03-dynlink-and-cflags.patch =================================================================== --- trunk/libjna-java/debian/patches/03-dynlink-and-cflags.patch (rev 0) +++ trunk/libjna-java/debian/patches/03-dynlink-and-cflags.patch 2009-10-01 21:04:36 UTC (rev 10726) @@ -0,0 +1,42 @@ +Author: Yulia Novozhilova <[email protected]> +Description: dynlink and cflags + +diff -Naurp libjna-java.orig/build.xml libjna-java/build.xml +--- libjna-java.orig/build.xml 2008-10-31 06:15:32.000000000 +0000 ++++ libjna-java/build.xml 2009-01-02 15:26:40.000000000 +0000 +@@ -358,6 +358,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}" +@@ -369,15 +382,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" Added: trunk/libjna-java/debian/patches/series =================================================================== --- trunk/libjna-java/debian/patches/series (rev 0) +++ trunk/libjna-java/debian/patches/series 2009-10-01 21:04:36 UTC (rev 10726) @@ -0,0 +1,3 @@ +01-nbproject.patch +02-builddir.patch +03-dynlink-and-cflags.patch Modified: trunk/libjna-java/debian/rules =================================================================== --- trunk/libjna-java/debian/rules 2009-10-01 21:02:19 UTC (rev 10725) +++ trunk/libjna-java/debian/rules 2009-10-01 21:04:36 UTC (rev 10726) @@ -1,71 +1,45 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make -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/-.*//') +export JAVA_HOME=/usr/lib/jvm/java-6-openjdk -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 $@ +VERSION=3.1.0 clean: clean-patched unpatch -clean-patched: +clean-patched: patch 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 + ant -f build.xml clean + rm -f build.number -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched + dh_clean -install-arch: build +build: build-stamp +build-stamp: patch 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 + ant -f build.xml -Dcflags_extra.native="" -Ddynlink.native=true -Dnomixedjar.native=true jar + ant -f build.xml javadoc -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 + touch build-stamp -binary-arch: install-arch +install: build dh_testdir dh_testroot + dh_prep + + install -D -m 0644 build/jna.jar debian/libjna-java/usr/share/java/jna-$(VERSION).jar + ln -s jna-$(VERSION).jar debian/libjna-java/usr/share/java/jna.jar + +binary: binary-arch binary-indep + +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a dh_installdocs -a dh_install -a dh_strip -a @@ -77,5 +51,17 @@ 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 +binary-indep: install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i + dh_install -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +.PHONY: clean build install binary binary-arch binary-indep _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
