[SCM] UNNAMED PROJECT branch, master, updated. 0.36-2-gc550f98

[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  c550f982f48c856a5b985e652eb963b0afcd41ca (commit)
       via  1557c4938ed019f03bf4c9d02d581f722be37916 (commit)
      from  db436cabe9de6176ad8851b7423463c31f26b1d2 (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 c550f982f48c856a5b985e652eb963b0afcd41ca
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jul 4 09:21:10 2011 +0200

    Applied s/gcj/gcj-jdk/ from Doko's NMU

commit 1557c4938ed019f03bf4c9d02d581f722be37916
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jul 4 09:18:10 2011 +0200

    Do not rely on $pkg/usr/share/doc being present in jh_depends

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

Summary of changes:
 debian/changelog |    9 +++++++++
 debian/control   |    2 +-
 jh_depends       |   11 +++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e6e267..fc6371e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+javatools (0.37) UNRELEASED; urgency=low
+
+  * Do not assume that $pkg/usr/share/doc is present when jh_depends
+    runs.  (Closes: #632620)
+  * Applied changes from NMU.
+    - depend on gcj-jdk rather than gcj for java-propose-classpath.
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 04 Jul 2011 09:17:23 +0200
+
 javatools (0.36) unstable; urgency=low
 
   * Made jh_manifest always follow symlinks - the fix for this in
diff --git a/debian/control b/debian/control
index ef81788..3e97a2d 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Description: Helper scripts for packaging Java programs
 
 Package: java-propose-classpath
 Architecture: all
-Depends: gcj, javahelper (= ${binary:Version}), fastjar, ${misc:Depends}
+Depends: gcj-jdk, javahelper (= ${binary:Version}), fastjar, ${misc:Depends}
 Description: Helper script to suggest a classpath for jar files
  java-propose-classpath analyzes a set of jar files and the installed
  jars on the system to suggest a correct classpath for use with
diff --git a/jh_depends b/jh_depends
index c191afe..e46a0a1 100755
--- a/jh_depends
+++ b/jh_depends
@@ -244,8 +244,15 @@ for p in $PACKAGES; do
       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`
+   # Do not rely on the presence of /usr/share/doc, it might have been removed already and
+   # it is a policy voliation to do so. #632620
+   if [ -d "$PACKAGEDIR/usr/share/doc" ] ; then
+       API=`find "$PACKAGEDIR/usr/share/doc" -type f -name 'package-list' -exec dirname {} \;`
+       DOC_REC=`/usr/share/javahelper/jh_scanjavadoc $API`
+   else
+       API=''
+       DOC_REC=''
+   fi
 
    if [ -n "$VERBOSE" ]; then
       echo "Adding substvars:" "java:Depends=$JVMDEPS`echo $DEBDEPS | sed 's/\([a-zA-Z0-9_.+-]*\( *([^)]*)\)\{0,1\}\)/\1, /g;s/, *$//'`" \


hooks/post-receive
-- 
UNNAMED PROJECT