This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bsh.
commit 0d02ea82e0800c00934429a1591ed0b438a83ec1
Author: Niels Thykier <nthyk...@debian.org>
Date: Sun Nov 21 19:44:18 2010 +0000
Added mh_clean and link javadoc against sys javadoc.
---
debian/changelog | 2 ++
debian/control | 3 ++-
debian/patches/05_link_javadoc.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 5 ++++-
5 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a8491f1..172113f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ bsh (2.0b4-13) experimental; urgency=low
* 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
diff --git a/debian/control b/debian/control
index f4eb03a..257b10c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
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 @@ Package: bsh-doc
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
diff --git a/debian/patches/05_link_javadoc.patch
b/debian/patches/05_link_javadoc.patch
new file mode 100644
index 0000000..2798aa4
--- /dev/null
+++ b/debian/patches/05_link_javadoc.patch
@@ -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 -->
diff --git a/debian/patches/series b/debian/patches/series
index 4f08741..ea5057c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02_GNUvms_workaround.patch
03_target13_buildXml.patch
04_fix_typo.patch
+05_link_javadoc.patch
diff --git a/debian/rules b/debian/rules
index 760ef98..1182c0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ clean::
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 @@ install/bsh-src:: binary-install/bsh-doc
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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/bsh.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
