Author: ewl-guest Date: 2010-04-18 16:56:47 +0000 (Sun, 18 Apr 2010) New Revision: 12171
Added: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.javadoc Removed: trunk/knopflerfish-osgi/debian/patches/debian-changes-2.3.3-1 Modified: trunk/knopflerfish-osgi/debian/changelog trunk/knopflerfish-osgi/debian/clean-sources trunk/knopflerfish-osgi/debian/control trunk/knopflerfish-osgi/debian/copyright trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links trunk/knopflerfish-osgi/debian/patches/series trunk/knopflerfish-osgi/debian/rules trunk/knopflerfish-osgi/debian/watch Log: Changes requested by Matthew Johnson: add -doc package with javadoc fix mix of simple and quilt patch systems ant in build-depends-indep must be runnable with just build-depend jar+link into a subdirectory of /usr/share/java, which is not what policy says. Modified: trunk/knopflerfish-osgi/debian/changelog =================================================================== --- trunk/knopflerfish-osgi/debian/changelog 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/changelog 2010-04-18 16:56:47 UTC (rev 12171) @@ -2,4 +2,4 @@ * Initial release (Closes: #478323). - -- Eric Lavarde <d...@zorglub.s.bawue.de> Sat, 13 Feb 2010 21:58:35 +0100 + -- Eric Lavarde <d...@zorglub.s.bawue.de> Sat, 17 Apr 2010 13:13:00 +0200 Modified: trunk/knopflerfish-osgi/debian/clean-sources =================================================================== --- trunk/knopflerfish-osgi/debian/clean-sources 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/clean-sources 2010-04-18 16:56:47 UTC (rev 12171) @@ -30,6 +30,8 @@ unzip -q -d "${packdir}" "${file}" || exit 1 find "${packdir}" -name \*.zip -o -name \*.jar -o -name \*.class | xargs rm -f +rm -fr "${packdir}/knopflerfish.org/docs/javadoc" +rm -f "${packdir}/knopflerfish.org/osgi/framework/resources/tstamp" tar czf "${origtar}" -C "${basedir}" $(basename "${packdir}") || exit 1 echo "Original source file saved to '${origtar}'." Modified: trunk/knopflerfish-osgi/debian/control =================================================================== --- trunk/knopflerfish-osgi/debian/control 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/control 2010-04-18 16:56:47 UTC (rev 12171) @@ -3,14 +3,14 @@ Priority: extra Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Eric Lavarde <d...@zorglub.s.bawue.de> -Build-Depends-Indep: libasm3-java, ant, openjdk-6-jdk -Build-Depends: cdbs, debhelper (>= 7) +Build-Depends-Indep: libasm3-java, openjdk-6-jdk +Build-Depends: cdbs, debhelper (>= 7), ant Standards-Version: 3.8.4 Homepage: http://www.knopflerfish.org/ Package: libknopflerfish-osgi-framework-java Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java5-jre | sun-java6-jre | java2-runtime +Depends: ${misc:Depends}, openjdk-6-jre | sun-java5-jre | sun-java6-jre Description: Java framework implementing the OSGi R4 version OSGi, Open Service Gateway Initiative, specifies an industry standard Java application platform, allowing multiple applications, to securely run in a @@ -22,3 +22,19 @@ was the embedded market, but other uses are certainly possible. . This package specifically provides the framework JAR file. + +Package: libknopflerfish-osgi-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: Java framework implementing the OSGi R4 version (docs) + OSGi, Open Service Gateway Initiative, specifies an industry standard Java + application platform, allowing multiple applications, to securely run in a + single JVM. These programs can share resources as data, functionality and + threads. + . + Applications areas for OSGi ranges from use as a service platform on embedded + devices, to plugin mechanisms for larger programs. The initial goal of OSGi + was the embedded market, but other uses are certainly possible. + . + This package contains the documentation, currently mainly for the framework. Modified: trunk/knopflerfish-osgi/debian/copyright =================================================================== --- trunk/knopflerfish-osgi/debian/copyright 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/copyright 2010-04-18 16:56:47 UTC (rev 12171) @@ -18,7 +18,7 @@ License: - BSD, see "/usr/share/common-licenses/BSD". + BSD for the Knopflerfish part, see "/usr/share/common-licenses/BSD". The Debian packaging is: @@ -38,11 +38,11 @@ ---------------------------------------------------------------------- This product includes the OSGi Service Platform API code from the OSGi Alliance provided under an Apache 2 license. + see "/usr/share/common-licenses/Apache-2.0". http://www.osgi.org Copyright (c) OSGi Alliance (2001, 2006). All Rights Reserved. - ---------------------------------------------------------------------- - Carlitus icons Notice ---------------------------------------------------------------------- Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs =================================================================== --- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.dirs 2010-04-18 16:56:47 UTC (rev 12171) @@ -1 +1 @@ -usr/share/java/knopflerfish +usr/share/java Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install =================================================================== --- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.install 2010-04-18 16:56:47 UTC (rev 12171) @@ -1 +1 @@ -knopflerfish.org/osgi/framework-2.3.3.jar usr/share/java/knopflerfish/ +knopflerfish.org/osgi/framework-2.3.3.jar usr/share/java/ Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links =================================================================== --- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-framework-java.links 2010-04-18 16:56:47 UTC (rev 12171) @@ -1 +1 @@ -usr/share/java/knopflerfish/framework-2.3.3.jar usr/share/java/knopflerfish/framework.jar +usr/share/java/framework-2.3.3.jar usr/share/java/framework.jar Added: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs =================================================================== --- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs (rev 0) +++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs 2010-04-18 16:56:47 UTC (rev 12171) @@ -0,0 +1,3 @@ +knopflerfish.org/osgi/framework/readme.txt +knopflerfish.org/docs/ +api/ Added: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.javadoc =================================================================== --- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.javadoc (rev 0) +++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.javadoc 2010-04-18 16:56:47 UTC (rev 12171) @@ -0,0 +1 @@ +api Deleted: trunk/knopflerfish-osgi/debian/patches/debian-changes-2.3.3-1 =================================================================== --- trunk/knopflerfish-osgi/debian/patches/debian-changes-2.3.3-1 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/patches/debian-changes-2.3.3-1 2010-04-18 16:56:47 UTC (rev 12171) @@ -1,32 +0,0 @@ -Description: Upstream changes introduced in version 2.3.3-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - knopflerfish-osgi (2.3.3-1) unstable; urgency=low - . - * Initial release (Closes: #478323). - . - The person named in the Author field signed this changelog entry. -Author: Eric Lavarde <d...@zorglub.s.bawue.de> -Bug-Debian: http://bugs.debian.org/478323 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- knopflerfish-osgi-2.3.3.orig/knopflerfish.org/osgi/framework/resources/tstamp -+++ knopflerfish-osgi-2.3.3/knopflerfish.org/osgi/framework/resources/tstamp -@@ -1 +1 @@ --Build Fri September 11 2009, 14:19:45 -\ No newline at end of file -+Build Sat March 13 2010, 13:19:57 -\ No newline at end of file Modified: trunk/knopflerfish-osgi/debian/patches/series =================================================================== --- trunk/knopflerfish-osgi/debian/patches/series 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/patches/series 2010-04-18 16:56:47 UTC (rev 12171) @@ -1 +1,2 @@ -debian-changes-2.3.3-1 +10_build_asm.patch +20_versioned_jar.patch Modified: trunk/knopflerfish-osgi/debian/rules =================================================================== --- trunk/knopflerfish-osgi/debian/rules 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/rules 2010-04-18 16:56:47 UTC (rev 12171) @@ -2,10 +2,11 @@ # debian/rules for Commons Fileupload (uses CDBS) clean:: buildxml-clean +build/libknopflerfish-osgi-java-doc:: build-javadoc include /usr/share/cdbs/1/rules/debhelper.mk +#include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk @@ -17,7 +18,12 @@ buildxml-clean:: -$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET) + -rm -f knopflerfish.org/osgi/framework/resources/tstamp + -rm -fr api/ +build-javadoc:: + javadoc -sourcepath knopflerfish.org/osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi + # Get original sources directly using uscan get-orig-source: uscan Modified: trunk/knopflerfish-osgi/debian/watch =================================================================== --- trunk/knopflerfish-osgi/debian/watch 2010-04-16 21:34:45 UTC (rev 12170) +++ trunk/knopflerfish-osgi/debian/watch 2010-04-18 16:56:47 UTC (rev 12171) @@ -6,7 +6,7 @@ # Compulsory line, this is a version 3 file version=3 -http://www.knopflerfish.com/releases/(2\.\d\.\d)/knopflerfish_osgi_([\d\.]+)\.jar debian ./debian/clean-sources +http://www.knopflerfish.com/releases/([\d\.]+)/knopflerfish_osgi_([\d\.]+)\.jar debian ./debian/clean-sources # Uncomment to examine a Webpage # <Webpage URL> <string match> _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits