Author: nthykier Date: 2010-11-21 19:44:18 +0000 (Sun, 21 Nov 2010) New Revision: 13094
Added: trunk/bsh/debian/patches/05_link_javadoc.patch Modified: trunk/bsh/debian/changelog trunk/bsh/debian/control trunk/bsh/debian/patches/series trunk/bsh/debian/rules Log: Added mh_clean and link javadoc against sys javadoc. Modified: trunk/bsh/debian/changelog =================================================================== --- trunk/bsh/debian/changelog 2010-11-21 19:15:44 UTC (rev 13093) +++ trunk/bsh/debian/changelog 2010-11-21 19:44:18 UTC (rev 13094) @@ -9,6 +9,8 @@ * Updated README.Debian to better reflect the current times. * Added descriptions to the patches. * Added patch to fix a typo in the upstream code. + * Added mh_clean to the clean rule. + * Linked the javadoc against the system javadoc. -- Niels Thykier <ni...@thykier.net> Sun, 21 Nov 2010 20:11:13 +0100 Modified: trunk/bsh/debian/control =================================================================== --- trunk/bsh/debian/control 2010-11-21 19:15:44 UTC (rev 13093) +++ trunk/bsh/debian/control 2010-11-21 19:44:18 UTC (rev 13094) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Michael Koch <konque...@gmx.de> Build-Depends: debhelper (>= 7), cdbs, default-jdk, gcj-native-helper, ant, libservlet2.5-java, libbsf-java, - javacc, maven-repo-helper + javacc, maven-repo-helper, default-jdk-doc, libservlet2.5-java-doc, javahelper (>= 0.32~) Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bsh Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bsh @@ -47,6 +47,7 @@ Section: doc Architecture: all Depends: ${misc:Depends} +Recommends: ${java:Recommends} Suggests: bsh Description: Documentation for bsh BeanShell is a small, free, embeddable, Java source interpreter with object Added: trunk/bsh/debian/patches/05_link_javadoc.patch =================================================================== --- trunk/bsh/debian/patches/05_link_javadoc.patch (rev 0) +++ trunk/bsh/debian/patches/05_link_javadoc.patch 2010-11-21 19:44:18 UTC (rev 13094) @@ -0,0 +1,18 @@ +Description: Link the Javadoc against system installed javadocs. +Author: Niels Thykier <ni...@thykier.net> + +--- a/build.xml 2010-11-21 20:16:20.000000000 +0100 ++++ b/build.xml 2010-11-21 20:24:15.544531250 +0100 +@@ -201,7 +201,11 @@ + windowtitle="BeanShell ${version}" + doctitle="<h1>BeanShell ${version}<h1>" + bottom="<em>© 2000-2005 p...@pat.net :-)</em>" +- /> ++ > ++ <link href="/usr/share/doc/default-jdk-doc/api/" /> ++ <link href="/usr/share/doc/libbsf-java/api/" /> ++ <link href="/usr/share/doc/libservlet2.5-java/api/" /> ++ </javadoc> + </target> + + <!-- Jar target setup --> Modified: trunk/bsh/debian/patches/series =================================================================== --- trunk/bsh/debian/patches/series 2010-11-21 19:15:44 UTC (rev 13093) +++ trunk/bsh/debian/patches/series 2010-11-21 19:44:18 UTC (rev 13094) @@ -2,3 +2,4 @@ 02_GNUvms_workaround.patch 03_target13_buildXml.patch 04_fix_typo.patch +05_link_javadoc.patch Modified: trunk/bsh/debian/rules =================================================================== --- trunk/bsh/debian/rules 2010-11-21 19:15:44 UTC (rev 13093) +++ trunk/bsh/debian/rules 2010-11-21 19:44:18 UTC (rev 13094) @@ -28,7 +28,7 @@ tests/test-scripts/class3.bsh \ tests/test-scripts/classinterf1.bsh \ tests/test-scripts/strings.bsh - -rm -rf debian/tmp + mh_clean install/$(PACKAGE):: mh_installpoms -p$(PACKAGE) @@ -46,6 +46,9 @@ tar --exclude debian --exclude classes --exclude dist --exclude api \ -zcf debian/bsh-src/usr/src/bsh-src/bsh.tar.gz * +binary-fixup/bsh-doc:: + jh_depends -pbsh-doc + get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits