The unified diff between revisions [266fd03a..] and [544de2c1..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_file "debian/dh_javadoc"
# content [65d32566c5b82b1ebd5e7436421193a516e0f51b]
#
# patch "debian/changelog"
# from [4252cf649ea2ae6fbd8c549b240d28b3b7b67434]
# to [fab040e204949cf6e5b21a2c0a51df3de165ff2e]
#
# patch "debian/rules"
# from [b348a8630819824e44c1c0f2361d5d2deade9411]
# to [86c13d19d93b1270674cbd5f7c9670147ee4b4ac]
#
============================================================
--- debian/dh_javadoc 65d32566c5b82b1ebd5e7436421193a516e0f51b
+++ debian/dh_javadoc 65d32566c5b82b1ebd5e7436421193a516e0f51b
@@ -0,0 +1,141 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_javadoc - generate javadoc documentation and install in package directory
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_javadoc> [S<I<debhelper options>>] [B<-p<package>>] [B<--sourcedir I<source path>>] [S<I<Java packages>>]
+
+=head1 DESCRIPTION
+
+dh_javadoc is a debhelper program that is responsible for generating HTML Java
+documentation and installing it in package directories. This should be done in
+the documentaion package of all Java libraries. Normal Java programs should not
+be supplied with javadoc documentation (neither in their main package or in a
+separate documentation package)
+
+Any package specified as parameters will be installed into the first package
+dh_javadoc is told to act on. Use of the standard debhelper B<-p> option is
+highly recommended.
+
+A file named debian/package.javadoc may list additional packages to have
+documentation generated. These should be separated by new lines.
+
+When the Java policy is modified, this script will also install links to the
+documentation in a common place so that javadoc pages may be interlinked; and
+also provide a substitution variable for documentation package dependencies.
+
+Javadoc generation is done using gjdoc, currently the only free javadoc
+implementation. When new features are added to this (such as overview files),
+this script will be modified accordingly.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<--sourcedir I<source path>>
+
+Specify the source path in which to look for Java source files.
+
+=item I<Java packages>
+
+Names of Java packages to be documented.
+
+=back
+
+=head1 TODO
+
+=over 4
+
+=item +
+
+Check parameters more carefully.
+
+=item +
+
+Add substvar for documentation dependencies
+
+=item +
+
+Don't put the 'common' directory in all packages - refer to one in
+/usr/share/gjdoc & insist on creating that dependency
+
+=item +
+
+Other items depend on gjdoc improvements:
+
+=over 8
+
+=item -
+
+Add package listings to common directory
+
+=item -
+
+Generate dependency substvar based on additional doc packages used.
+
+=back
+
+=back
+
+=cut
+
+use Cwd;
+
+init(options => {
+ "sourcedir=s" => \$dh{SOURCEDIR},
+});
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+ my $tmp=tmpdir($package);
+
+ my @packages = @ARGV;
+
+ if (-e "debian/$package.javadoc"){
+ open PACKAGES, "debian/$package.javadoc"
+ or error("Unable to open file: debian/$package.javadoc: $!");
+ my @pkgs;
+ my $i = 0;
+ while(<PACKAGES>){chomp($pkgs[$i++]=$_);}
+ close PACKAGES or warning("Error closing debian/$package.javadoc: $!");
+ @packages = (@packages, @pkgs);
+ }
+
+ my $src_dir;
+ if ($dh{SOURCEDIR}){
+ $src_dir = getcwd .'/'. $dh{SOURCEDIR};
+ }else{
+ $src_dir = getcwd();
+ }
+
+ if (! -e "/usr/bin/javadoc"){
+ error("/usr/bin/javadoc not found");
+ }
+
+ # make directory
+ doit('install', '-g', '0', '-o', '0', '-d', "$tmp/usr/share/doc/$package/api/");
+ # generate javadoc
+ doit('javadoc', "-sourcepath", $src_dir, "-d", "$tmp/usr/share/doc/$package/api/", @packages);
+ # and remove gjdoc_rawcomment.cache
+ doit('rm', "-f", "gjdoc_rawcomment.cache");
+
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is designed similar to debhelper
+
+=head1 AUTHOR
+
+Mark Howard <mh@debian.org>
+
+=cut
============================================================
--- debian/changelog 4252cf649ea2ae6fbd8c549b240d28b3b7b67434
+++ debian/changelog fab040e204949cf6e5b21a2c0a51df3de165ff2e
@@ -1,3 +1,9 @@
+gcc-defaults (1.91) unstable; urgency=low
+
+ * gcj-jdk: Add dh_javadoc, conflict with gjdoc.
+
+ -- Matthias Klose <doko@debian.org> Wed, 09 Dec 2009 01:28:37 +0100
+
gcc-defaults (1.90) unstable; urgency=low
* Make GCC-4.4 the default.
============================================================
--- debian/rules b348a8630819824e44c1c0f2361d5d2deade9411
+++ debian/rules 86c13d19d93b1270674cbd5f7c9670147ee4b4ac
@@ -333,7 +333,7 @@ endif
echo 'pkgmulti:gfort=gfortran-multilib'; \
) >> debian/substvars.local
endif
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
+#ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
( \
echo 'dep:jrehl=gcj-$${pv:gij}-jre-headless $${reqv:gij}'; \
echo 'dep:jre=gcj-$${pv:gij}-jre $${reqv:gij}'; \
@@ -341,14 +341,14 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj
echo 'pkg:gjdoc=gjdoc'; \
echo 'ver:gcjconflict=4:4.4.0-2'; \
) >> debian/substvars.local
-else
- ( \
- echo 'dep:jrehl=java-gcj-compat-headless (>= 1.0.80), gij-$${pv:gij} $${reqv:gij}'; \
- echo 'dep:jre=java-gcj-compat (>= 1.0.80)'; \
- echo 'dep:jdk=java-gcj-compat-dev (>= 1.0.80), gcj-$${pv:gcj} $${reqv:gcj}'; \
- echo 'ver:gcjconflict=4:4.3.3-6'; \
- ) >> debian/substvars.local
-endif
+#else
+# ( \
+# echo 'dep:jrehl=java-gcj-compat-headless (>= 1.0.80), gij-$${pv:gij} $${reqv:gij}'; \
+# echo 'dep:jre=java-gcj-compat (>= 1.0.80)'; \
+# echo 'dep:jdk=java-gcj-compat-dev (>= 1.0.80), gcj-$${pv:gcj} $${reqv:gcj}'; \
+# echo 'ver:gcjconflict=4:4.3.3-6'; \
+# ) >> debian/substvars.local
+#endif
build: README build-stamp
build-stamp:
@@ -611,11 +611,14 @@ ifneq (,$(filter gcj, $(packages)))
/usr/share/info/gcj-$(PV_GCJ).info.gz /usr/share/info/gcj.info.gz
endif
- ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
+# ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
dh_link -pgcj-jdk \
/usr/bin/gjdoc-$(PV_GCJ) /usr/bin/gjdoc \
/usr/share/man/man1/gjdoc-$(PV_GCJ).1.gz /usr/share/man/man1/gjdoc.1.gz
- endif
+ cp -p debian/dh_javadoc debian/gcj-jdk/usr/bin/
+ pod2man -c Debhelper -r $(PV_GCJ) \
+ debian/dh_javadoc debian/gcj-jdk/usr/share/man/man1/dh_javadoc.1
+# endif
: # libgcj-bc
dh_installdirs -plibgcj-bc \
@@ -633,7 +636,7 @@ ifneq (,$(filter gcj, $(packages)))
> debian/libgcj-bc.shlibs
# echo "libgcj_bc 1 libgcj-bc" > debian/libgcj-bc.shlibs
- ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
+# ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs)))
: # gcj-jre-headless
dh_installdirs -pgcj-jre-headless \
usr/share/doc usr/lib/jvm
@@ -643,7 +646,7 @@ ifneq (,$(filter gcj, $(packages)))
debian/gcj-jre-headless/usr/lib/jvm/java-1.5.0-gcj
ln -sf java-gcj-$(PV_GCJ) \
debian/gcj-jre-headless/usr/lib/jvm/java-gcj
- endif
+# endif
endif
: # libgcj-common