Author: hauro-guest Date: 2008-07-20 22:13:25 +0000 (Sun, 20 Jul 2008) New Revision: 6718
Added: trunk/pj/debian/libpj-java-doc.dirs trunk/pj/debian/libpj-java-doc.install trunk/pj/debian/libpj-java-doc.lintian-overrides Modified: trunk/pj/debian/changelog trunk/pj/debian/control trunk/pj/debian/libpj-java.dirs trunk/pj/debian/patches/10-buildfile trunk/pj/debian/rules Log: New upstream release; building documentation package Modified: trunk/pj/debian/changelog =================================================================== --- trunk/pj/debian/changelog 2008-07-20 13:46:53 UTC (rev 6717) +++ trunk/pj/debian/changelog 2008-07-20 22:13:25 UTC (rev 6718) @@ -1,3 +1,11 @@ +pj (0.0~20080719-1) unstable; urgency=low + + * New upstream release + * Moving PJ to main by build-depending on OpenJDK + * Building a package that contains the API documentation + + -- Manuel Prinz <[EMAIL PROTECTED]> Sun, 20 Jul 2008 23:28:47 +0200 + pj (0.0~20080628-1) unstable; urgency=low * New upstream release Modified: trunk/pj/debian/control =================================================================== --- trunk/pj/debian/control 2008-07-20 13:46:53 UTC (rev 6717) +++ trunk/pj/debian/control 2008-07-20 22:13:25 UTC (rev 6718) @@ -1,17 +1,27 @@ Source: pj -Section: contrib/libs +Section: libs Priority: extra Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Manuel Prinz <[EMAIL PROTECTED]> Homepage: http://www.cs.rit.edu/~ark/pj.shtml Build-Depends: debhelper (>= 5), cdbs, quilt -Build-Depends-Indep: ant, sun-java5-jdk +Build-Depends-Indep: ant, openjdk-6-jdk Standards-Version: 3.8.0 Package: libpj-java Architecture: all -Depends: sun-java5-jre | java2-runtime +Depends: openjdk-6-jre | java2-runtime Description: The Parallel Java Library Parallel Java (PJ) is an API and middleware for parallel programming in 100% Java on shared memory multiprocessor (SMP) parallel computers, cluster parallel computers, and hybrid SMP cluster parallel computers. + +Package: libpj-java-doc +Section: doc +Architecture: all +Description: Documentation for the Parallel Java Library + Parallel Java (PJ) is an API and middleware for parallel programming + in 100% Java on shared memory multiprocessor (SMP) parallel computers, + cluster parallel computers, and hybrid SMP cluster parallel computers. + . + This package contains the class API documentation for PJ. Added: trunk/pj/debian/libpj-java-doc.dirs =================================================================== --- trunk/pj/debian/libpj-java-doc.dirs (rev 0) +++ trunk/pj/debian/libpj-java-doc.dirs 2008-07-20 22:13:25 UTC (rev 6718) @@ -0,0 +1 @@ +usr/share/libpj-java-doc/api Added: trunk/pj/debian/libpj-java-doc.install =================================================================== --- trunk/pj/debian/libpj-java-doc.install (rev 0) +++ trunk/pj/debian/libpj-java-doc.install 2008-07-20 22:13:25 UTC (rev 6718) @@ -0,0 +1 @@ +doc/* usr/share/doc/libpj-java-doc/api/ Added: trunk/pj/debian/libpj-java-doc.lintian-overrides =================================================================== --- trunk/pj/debian/libpj-java-doc.lintian-overrides (rev 0) +++ trunk/pj/debian/libpj-java-doc.lintian-overrides 2008-07-20 22:13:25 UTC (rev 6718) @@ -0,0 +1,3 @@ +# Most Java packages have their JavaDoc in an api/ sub-directory. PJ adopts +# this practice. +libpj-java-doc: package-contains-empty-directory usr/share/libpj-java-doc/api/ Modified: trunk/pj/debian/libpj-java.dirs =================================================================== --- trunk/pj/debian/libpj-java.dirs 2008-07-20 13:46:53 UTC (rev 6717) +++ trunk/pj/debian/libpj-java.dirs 2008-07-20 22:13:25 UTC (rev 6718) @@ -1,2 +1 @@ usr/share/java - Modified: trunk/pj/debian/patches/10-buildfile =================================================================== --- trunk/pj/debian/patches/10-buildfile 2008-07-20 13:46:53 UTC (rev 6717) +++ trunk/pj/debian/patches/10-buildfile 2008-07-20 22:13:25 UTC (rev 6718) @@ -1,12 +1,12 @@ -Index: pj/build.xml +Index: pj-0.0~20080719/build.xml =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ pj/build.xml 2007-12-16 19:18:43.000000000 +0100 -@@ -0,0 +1,66 @@ ++++ pj-0.0~20080719/build.xml 2008-07-20 23:09:51.000000000 +0200 +@@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<!-- +Build.xml file for the Parallel Java Library (PJ) -+Copyright (C) 2007 Manuel Prinz <[EMAIL PROTECTED]> ++Copyright (C) 2007-2008 Manuel Prinz <[EMAIL PROTECTED]> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ + + <target name="init"> + <property name="app.name" value="pj"/> -+ <property name="app.version" value="20071212"/> ++ <property name="app.version" value="20080719"/> + </target> + + <target name="compile"> @@ -48,16 +48,20 @@ + </target> + + <target name="javadoc"> ++ <copy todir="doc/doc-files"> ++ <fileset dir="lib/doc-files" includes="*"/> ++ </copy> + <javadoc + destdir="doc" ++ packagenames="edu.rit.*" + sourcepath="lib" + overview="lib/overview.html" + use="yes" + splitindex="yes" + doctitle="THE PARALLEL JAVA LIBRARY" + windowtitle="Parallel Java Library Documentation"> -+ <bottom><![CDATA[<FONT SIZE="-2">Copyright © 2005-2007 by Alan Kaminsky. All rights reserved. Send comments to ark</FONT><FONT SIZE="1" COLOR="#FFFFFF">­</FONT><FONT SIZE="-2">@</FONT><FONT SIZE="1" COLOR="#FFFFFF">­</FONT><FONT SIZE="-2">cs.rit.edu.</FONT>]]></bottom> -+ <fileset dir="lib" includes="**/*.java"/> ++ <bottom><![CDATA[<FONT SIZE="-2">Copyright © 2005-2008 by Alan Kaminsky. All rights reserved. Send comments to ark</FONT><FONT SIZE="1" COLOR="#FFFFFF">­</FONT><FONT SIZE="-2">@</FONT><FONT SIZE="1" COLOR="#FFFFFF">­</FONT><FONT SIZE="-2">cs.rit.edu.</FONT>]]></bottom> ++ <fileset dir="lib" includes="**/*.java" excludes="*.java"/> + </javadoc> + </target> + @@ -66,6 +70,7 @@ + <delete> + <fileset dir="lib" includes="**/*.class"/> + </delete> ++ <delete dir="doc"/> + </target> + +</project> Modified: trunk/pj/debian/rules =================================================================== --- trunk/pj/debian/rules 2008-07-20 13:46:53 UTC (rev 6717) +++ trunk/pj/debian/rules 2008-07-20 22:13:25 UTC (rev 6718) @@ -9,9 +9,9 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun +JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_ANT_BUILD_TARGET := jar +DEB_ANT_BUILD_TARGET := jar javadoc PACKAGE := pj DEBIAN_VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1) @@ -27,6 +27,9 @@ get-orig-source: pj_$(DEBIAN_VERSION).orig.tar.gz +configure/lib$(PACKAGE)-java:: + rm -rf lib/edu/rit/draw/item/doc-files/ + install/lib$(PACKAGE)-java:: install -m 0644 lib/$(PACKAGE)-$(DEBIAN_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE)-$(DEBIAN_VERSION).jar ln -s $(PACKAGE)-$(DEBIAN_VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(PACKAGE).jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
