Author: onkarshinde-guest Date: 2011-05-19 04:16:31 +0000 (Thu, 19 May 2011) New Revision: 13695
Added: trunk/jug/debian/libjug-java-doc.install Modified: trunk/jug/debian/changelog trunk/jug/debian/control trunk/jug/debian/patches/build-xml.diff trunk/jug/debian/rules Log: Fixed review comments Modified: trunk/jug/debian/changelog =================================================================== --- trunk/jug/debian/changelog 2011-05-18 22:42:15 UTC (rev 13694) +++ trunk/jug/debian/changelog 2011-05-19 04:16:31 UTC (rev 13695) @@ -3,11 +3,16 @@ * debian/control - Bump ant version in build dependency. - Remove dependency on JRE. + - Add 'Suggests' liblog4j1.2-java. + - Add libjug-java-doc package containing API documentation. - Update standards version to 3.9.2. No changes needed. * debian/patches/build-xml.diff - - Added patch description as per DEP-3. + - Add patch description as per DEP-3. + - Add log4j jar to classpath in MANIFEST.MF. + - Update to link javadoc against system javadoc. * debian/rules - Removed ant-trax from build classpath. Not relevant with latest ant. + - Add target for javadoc generation. * Converted package to source format 3.0. -- Onkar Shinde <onkarshi...@ubuntu.com> Thu, 05 May 2011 09:41:30 +0530 Modified: trunk/jug/debian/control =================================================================== --- trunk/jug/debian/control 2011-05-18 22:42:15 UTC (rev 13694) +++ trunk/jug/debian/control 2011-05-19 04:16:31 UTC (rev 13695) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Onkar Shinde <onkarshi...@ubuntu.com> -Build-Depends-Indep: default-jdk, liblog4j1.2-java, junit +Build-Depends-Indep: default-jdk, default-jdk-doc, liblog4j1.2-java, junit Build-Depends: ant (>= 1.8.2), ant-optional (>= 1.8.2), debhelper (>= 5), cdbs (>= 0.4.5.3) Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jug/ @@ -14,6 +14,21 @@ Package: libjug-java Architecture: all Depends: ${misc:Depends} +Suggests: liblog4j1.2-java, libjug-java-doc (= ${binary:Version}) Description: Pure java UUID generator JUG is a pure java UUID generator that generates UUIDs according to the IETF UUID draft specification. + . + This package contains the library. + +Package: libjug-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: default-jdk-doc +Suggests: libjug-java (= ${binary:Version}) +Description: Pure java UUID generator (API documentation) + JUG is a pure java UUID generator that generates UUIDs according to the IETF + UUID draft specification. + . + This package contains API documentation. Added: trunk/jug/debian/libjug-java-doc.install =================================================================== --- trunk/jug/debian/libjug-java-doc.install (rev 0) +++ trunk/jug/debian/libjug-java-doc.install 2011-05-19 04:16:31 UTC (rev 13695) @@ -0,0 +1 @@ +javadoc/* usr/share/doc/libjug-java/api/ Modified: trunk/jug/debian/patches/build-xml.diff =================================================================== --- trunk/jug/debian/patches/build-xml.diff 2011-05-18 22:42:15 UTC (rev 13694) +++ trunk/jug/debian/patches/build-xml.diff 2011-05-19 04:16:31 UTC (rev 13695) @@ -1,9 +1,8 @@ Description: Various fixes to build.xml. Forwarded: not-needed Author: Thierry Carrez <thierry.car...@ubuntu.com> -diff -Nur -x '*.orig' -x '*~' jug-2.0.0/build.xml jug-2.0.0.new/build.xml ---- jug-2.0.0/build.xml 2009-07-22 11:45:31.000000000 +0200 -+++ jug-2.0.0.new/build.xml 2009-07-22 11:50:15.000000000 +0200 +--- a/build.xml 2011-05-18 20:36:41.000000000 +0530 ++++ b/build.xml 2011-05-19 09:32:33.000000000 +0530 @@ -104,6 +104,7 @@ <delete dir="${DocDir}"/> <delete dir="${TestDir}"/> @@ -20,7 +19,23 @@ </javac> </target> -@@ -254,9 +254,11 @@ +@@ -148,6 +148,7 @@ + <attribute name="Implementation-Title" value="${JUG_TITLE}"/> + <attribute name="Implementation-Version" value="${JUG_VERSION}"/> + <attribute name="Implementation-Vendor" value="${JUG_VENDOR}"/> ++ <attribute name="Class-Path" value="log4j-1.2.jar"/> + </manifest> + <fileset dir="${BuildClassesDir}"> + <include name="org/safehaus/uuid/*.class" /> +@@ -208,6 +209,7 @@ + <include name="com/ccg/net/ethernet/**" /> + <include name="org/safehaus/uuid/**" /> + </packageset> ++ <link offline="true" packagelistLoc="/usr/share/doc/default-jdk-doc/api" href="/usr/share/doc/default-jdk-doc/api/" /> + </javadoc> + </target> + +@@ -254,9 +256,11 @@ <available property="junit.present" classname="junit.framework.TestCase" /> </target> @@ -33,7 +48,7 @@ <classpath> <pathelement location="${BuildClassesDir}" /> </classpath> -@@ -264,7 +266,7 @@ +@@ -264,7 +268,7 @@ </target> <target name="test" depends="compile_test" if="junit.present"> Modified: trunk/jug/debian/rules =================================================================== --- trunk/jug/debian/rules 2011-05-18 22:42:15 UTC (rev 13694) +++ trunk/jug/debian/rules 2011-05-19 04:16:31 UTC (rev 13695) @@ -5,7 +5,7 @@ JARNAME := jug-asl JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar.asl +DEB_ANT_BUILD_TARGET := jar.asl javadoc DEB_ANT_CHECK_TARGET := test DEB_JARS := log4j-1.2 ant-junit junit _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits