[SCM] UNNAMED PROJECT branch, master, updated. 0.30-24-g4b41e8f

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  4b41e8f70b763075cbaf71fe00e1dafd9e6da554 (commit)
       via  ca7aff7f4acaf01a1eb87d9b6cedd48b9ab82762 (commit)
      from  c2544231a5c932dc1a491712c5297bca2c7433ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4b41e8f70b763075cbaf71fe00e1dafd9e6da554
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jul 2 16:43:30 2010 +0200

    Updated changelog.

commit ca7aff7f4acaf01a1eb87d9b6cedd48b9ab82762
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jul 2 16:39:39 2010 +0200

    Corrected package of Java.pm. Added helper script to assist jh_depends
    in finding the recommends for doc packages by scanning the javadoc.

-----------------------------------------------------------------------

Summary of changes:
 Java.pm                   |    4 ++--
 debian/changelog          |    3 +++
 debian/javahelper.install |    2 ++
 jh_depends                |    9 +++++++--
 jh_scanjavadoc            |   18 ++++++++++++++++++
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/Java.pm b/Java.pm
index 5829a21..fb5624e 100644
--- a/Java.pm
+++ b/Java.pm
@@ -1,4 +1,4 @@
-package Java;
+package Debian::Javahelper::Java;
 
 =head1 NAME
 
@@ -14,7 +14,7 @@ use File::Spec;
 use Exporter;
 use vars qw(@ISA @EXPORT);
 @ISA = qw(Exporter);
- at EXPORT = qw(scan_javadoc find_package_for_existing_files);
+ at EXPORT = qw(&scan_javadoc &find_package_for_existing_files);
 
 =head1 SYNOPSIS
 
diff --git a/debian/changelog b/debian/changelog
index 69062cf..1c54193 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ javatools (0.32) UNRELEASED; urgency=low
     java-gcj-compat, since the latter is now a virtual package.
   * Made jh_depends produce (>= ${source:Version}) instead of
     (= ${binary:Version}). The latter would break with binNMUs.
+  * jh_depends now generates a dependency list for javadocs based on
+    which system javadocs they have been linked against. These packages
+    are added to the new ${java:Recommends} variable.
 
  -- Niels Thykier <niels at thykier.net>  Wed, 23 Jun 2010 16:16:59 +0200
 
diff --git a/debian/javahelper.install b/debian/javahelper.install
index c2f4ae5..6251f08 100644
--- a/debian/javahelper.install
+++ b/debian/javahelper.install
@@ -15,6 +15,8 @@ jh_generateorbitdir /usr/bin
 jh_setupenvironment /usr/bin
 jh_compilefeatures /usr/bin
 jh_lib.sh /usr/share/javahelper
+# Internal helper command - not ready for /usr/bin
+jh_scanjavadoc /usr/share/javahelper
 java-vars.mk /usr/share/javahelper
 java-arch.sh /usr/share/javahelper
 javahelper.mk /usr/share/cdbs/1/class
diff --git a/jh_depends b/jh_depends
index 886f535..48066cf 100755
--- a/jh_depends
+++ b/jh_depends
@@ -239,16 +239,21 @@ for p in $PACKAGES; do
          JVMDEPS="$JVMDEPS, "
       fi
    fi
-
    cd "$OLDDIR"
+   API=`find "$PACKAGEDIR/usr/share/doc" -type f -name 'package-list' -exec dirname {} \;`
+   DOC_REC=`/usr/share/javahelper/jh_scanjavadoc $API`
+
    if [ -n "$VERBOSE" ]; then
-      echo "Adding substvars:" "java:Depends=$JVMDEPS`echo $DEBDEPS | sed 's/\([a-zA-Z0-9_.+-]*\( *([^)]*)\)\{0,1\}\)/\1, /g;s/, *$//'`"
+      echo "Adding substvars:" "java:Depends=$JVMDEPS`echo $DEBDEPS | sed 's/\([a-zA-Z0-9_.+-]*\( *([^)]*)\)\{0,1\}\)/\1, /g;s/, *$//'`" \
+           "java:Recommends=$DOC_REC"
    fi
 
    if [ -z "`getarg n no-act`" ]; then
       echo "java:Depends=$JVMDEPS`echo $DEBDEPS | sed 's/\([a-zA-Z0-9_.+-]*\( *([^)]*)\)\{0,1\}\)/\1, /g;s/, *$//'`" >> debian/$p.substvars
+      echo "java:Recommends=$DOC_REC" >> debian/$p.substvars
    else
       echo "java:Depends=$JVMDEPS`echo $DEBDEPS | sed 's/\([a-zA-Z0-9_.+-]*\( *([^)]*)\)\{0,1\}\)/\1, /g;s/, *$//'`"
+      echo "java:Recommends=$DOC_REC"
    fi
 
    unset PACKAGEDIR
diff --git a/jh_scanjavadoc b/jh_scanjavadoc
new file mode 100755
index 0000000..7edfbb1
--- /dev/null
+++ b/jh_scanjavadoc
@@ -0,0 +1,18 @@
+#!/usr/bin/perl
+
+# Internal command - do not use directly.
+#
+# Finds Dependencies of javadocs.
+
+use strict;
+use warnings;
+use Debian::Javahelper::Java;
+
+my @dep = ();
+
+foreach my $doclink ( map { scan_javadoc($_) } @ARGV){
+     $doclink = "$doclink/package-list" unless ( -l $doclink);
+     push(@dep, $doclink);
+}
+
+print join(", ", find_package_for_existing_files(@dep)), "\n" if(@dep);


hooks/post-receive
-- 
UNNAMED PROJECT