Author: nthykier Date: 2011-10-25 19:10:31 +0000 (Tue, 25 Oct 2011) New Revision: 15258
Added: trunk/libgnujaf-java/debian/libgnujaf-java-doc.javadoc trunk/libgnujaf-java/debian/libgnujaf-java.jlibs trunk/libgnujaf-java/debian/source/ trunk/libgnujaf-java/debian/source/format trunk/libgnujaf-java/debian/source/lintian-overrides Removed: trunk/libgnujaf-java/debian/dirs trunk/libgnujaf-java/debian/install trunk/libgnujaf-java/debian/links Modified: trunk/libgnujaf-java/debian/changelog trunk/libgnujaf-java/debian/control trunk/libgnujaf-java/debian/copyright trunk/libgnujaf-java/debian/docs trunk/libgnujaf-java/debian/rules Log: Fixed copyright and migrated d/rules to dh7 + javahelper Modified: trunk/libgnujaf-java/debian/changelog =================================================================== --- trunk/libgnujaf-java/debian/changelog 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/changelog 2011-10-25 19:10:31 UTC (rev 15258) @@ -1,9 +1,25 @@ -libgnujaf-java (1.1.1-7) UNRELEASED; urgency=low +libgnujaf-java (1.1.1-7) unstable; urgency=low + [ Jakub Adam ] * Add OSGi metadata to jar manifest * Bump to Standards-Version 3.9.2. * Increase debhelper compatibility level to 8. + [ Niels Thykier ] + * Corrected license to GPL-2+ with special exception rather than + LGPL-2+. + * Added missing copyright statements for the upstream code in + d/copyright. + * Converted the source package to 3.0 (quilt) format. + * Added lintian override for ancient-autotools-helper-file as those + files are not used for the debian build. + * Converted d/rules to dh tiny-style build. + - Use javahelper for install jars and javadocs. + * Split javadoc documentation into a separate package. + - Link the javadoc against the JDK docs. + - The API doc has moved to /usr/share/doc/libgnujaf-java-doc/api, + previously it was at /usr/share/doc/libgnujaf-java/apidocs. + -- Jakub Adam <[email protected]> Sun, 16 Oct 2011 11:09:37 +0200 libgnujaf-java (1.1.1-6) unstable; urgency=low Modified: trunk/libgnujaf-java/debian/control =================================================================== --- trunk/libgnujaf-java/debian/control 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/control 2011-10-25 19:10:31 UTC (rev 15258) @@ -3,7 +3,8 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Michael Koch <[email protected]> -Build-Depends: debhelper (>= 8), default-jdk +Build-Depends: debhelper (>= 8), default-jdk, javahelper (>= 0.33~), + default-jdk-doc Standards-Version: 3.9.2 Homepage: http://savannah.gnu.org/projects/classpathx Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgnujaf-java @@ -11,7 +12,7 @@ Package: libgnujaf-java Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${java:Depends} Description: free implementation of the javabeans activation framework With the javabeans activation framework developer can take advantage of standard services to determine the type of an arbitrary piece of @@ -19,3 +20,17 @@ instanciate the appropriate bean to perform operations. . This is the classpathx free implementation of the library + +Package: libgnujaf-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${java:Depends} +Recommends: ${java:Recommends} +Description: free implementation of the javabeans activation framework (docs) + With the javabeans activation framework developer can take advantage + of standard services to determine the type of an arbitrary piece of + data, encapsulate accesss to it, discover operations available and + instanciate the appropriate bean to perform operations. + . + This package contains the javadoc for the classpathx free + implementation of the library Modified: trunk/libgnujaf-java/debian/copyright =================================================================== --- trunk/libgnujaf-java/debian/copyright 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/copyright 2011-10-25 19:10:31 UTC (rev 15258) @@ -6,8 +6,28 @@ Upstream Authors: Andrew Selkirk <[email protected]>, Nic Ferrier <[email protected]> -Copyright: +Copyright (C) 2004 The Free Software Foundation -GNU Lesser GPL Version 2.1 +GNU JAF is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -More informations: /usr/share/common-licenses/LGPL-2.1 +GNU JAF 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. + +On Debian based system, the full text of the GNU GPL license can be +found in: /usr/share/common-licenses/GPL-2 + Deleted: trunk/libgnujaf-java/debian/dirs =================================================================== --- trunk/libgnujaf-java/debian/dirs 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/dirs 2011-10-25 19:10:31 UTC (rev 15258) @@ -1,2 +0,0 @@ -usr/share/java - Modified: trunk/libgnujaf-java/debian/docs =================================================================== --- trunk/libgnujaf-java/debian/docs 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/docs 2011-10-25 19:10:31 UTC (rev 15258) @@ -1,2 +1 @@ AUTHORS -apidoc Deleted: trunk/libgnujaf-java/debian/install =================================================================== --- trunk/libgnujaf-java/debian/install 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/install 2011-10-25 19:10:31 UTC (rev 15258) @@ -1 +0,0 @@ -activation-1.1.1.jar usr/share/java Added: trunk/libgnujaf-java/debian/libgnujaf-java-doc.javadoc =================================================================== --- trunk/libgnujaf-java/debian/libgnujaf-java-doc.javadoc (rev 0) +++ trunk/libgnujaf-java/debian/libgnujaf-java-doc.javadoc 2011-10-25 19:10:31 UTC (rev 15258) @@ -0,0 +1 @@ +api Added: trunk/libgnujaf-java/debian/libgnujaf-java.jlibs =================================================================== --- trunk/libgnujaf-java/debian/libgnujaf-java.jlibs (rev 0) +++ trunk/libgnujaf-java/debian/libgnujaf-java.jlibs 2011-10-25 19:10:31 UTC (rev 15258) @@ -0,0 +1 @@ +activation.jar Deleted: trunk/libgnujaf-java/debian/links =================================================================== --- trunk/libgnujaf-java/debian/links 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/links 2011-10-25 19:10:31 UTC (rev 15258) @@ -1 +0,0 @@ -usr/share/java/activation-1.1.1.jar usr/share/java/activation.jar Modified: trunk/libgnujaf-java/debian/rules =================================================================== --- trunk/libgnujaf-java/debian/rules 2011-10-24 22:30:35 UTC (rev 15257) +++ trunk/libgnujaf-java/debian/rules 2011-10-25 19:10:31 UTC (rev 15258) @@ -1,112 +1,27 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - LIBRARY=activation -VERSION=1.1.1 JAVA_HOME=/usr/lib/jvm/default-java -CFLAGS = -Wall -g +%: + dh $@ --with javahelper -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif +override_dh_auto_configure: + # Do nothing (i.e. ignore ./configure, ty) -config.status: configure - dh_testdir - -mkdir classes - -find source -name \*.java>list.sources +override_dh_auto_build: + mkdir classes + find source -name \*.java>list.sources -build: build-stamp - -build-stamp: config.status - dh_testdir - $(JAVA_HOME)/bin/javac -source 1.4 -sourcepath source -d classes @list.sources - $(JAVA_HOME)/bin/jar -cfm ${LIBRARY}-${VERSION}.jar debian/manifest.mf -C classes javax -C classes gnu - $(JAVA_HOME)/bin/javadoc -d apidoc -sourcepath source javax.activation + $(JAVA_HOME)/bin/jar -cfm $(LIBRARY).jar debian/manifest.mf -C classes javax -C classes gnu + $(JAVA_HOME)/bin/javadoc -link /usr/share/doc/default-jdk-doc/api \ + -d api -sourcepath source javax.activation touch build-stamp -clean: - dh_testdir - dh_testroot - rm -f build-stamp +override_dh_auto_clean: + rm -fr classes list.sources $(LIBRARY).jar gjdoc_rawcomment.cache activation.so apidoc - -rm -fr classes list.sources ${LIBRARY}-${VERSION}.jar gjdoc_rawcomment.cache activation.so apidoc -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - echo "${LIBRARY}-${VERSION}.jar usr/share/java">debian/install - echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar">debian/links - - -# Build architecture-dependent files here. -binary-indep: install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs -# dh_installexamples - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_installman - dh_link -# dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -build-arch: build - -build-indep: build - -binary-arch: - -binary: binary-indep #binary-arch -.PHONY: build clean binary-indep binary-arch binary install Added: trunk/libgnujaf-java/debian/source/format =================================================================== --- trunk/libgnujaf-java/debian/source/format (rev 0) +++ trunk/libgnujaf-java/debian/source/format 2011-10-25 19:10:31 UTC (rev 15258) @@ -0,0 +1 @@ +3.0 (quilt) Added: trunk/libgnujaf-java/debian/source/lintian-overrides =================================================================== --- trunk/libgnujaf-java/debian/source/lintian-overrides (rev 0) +++ trunk/libgnujaf-java/debian/source/lintian-overrides 2011-10-25 19:10:31 UTC (rev 15258) @@ -0,0 +1,2 @@ +# They are not used for the debian build +ancient-autotools-helper-file _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
