[SCM] UNNAMED PROJECT branch, master, updated. 0.31-67-g73088bc

[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  73088bcaf0de319723236978faa3eb29bb8bc490 (commit)
      from  c5cd36a7c0549a562eda61aa20aaa2d5af170dcb (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 73088bcaf0de319723236978faa3eb29bb8bc490
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Apr 16 21:25:38 2011 +0200

    Updated jh_makepkg to add java:Recommends and separate lib-doc pkg

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

Summary of changes:
 debian/changelog |    4 ++++
 jh_makepkg       |   30 +++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1a41ae..696e453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ javatools (0.33) unreleased; urgency=low
     jar file does not exist.
   * Updated file suggestions for jh_classpath and added a note about
     the sequence change in the tutorial.
+  * Updated jh_makepkg:
+    - It now creates a separate doc package for the javadoc if making
+      a library package.
+    - It now adds ${java:Recommends} to all binary packages added.
 
  -- Matthew Johnson <mjj29 at debian.org>  Sat, 12 Mar 2011 12:58:50 +0000
 
diff --git a/jh_makepkg b/jh_makepkg
index acec058..0a6c0e9 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -6,7 +6,7 @@
 #    gcj, sun
 
 COMPAT=7
-STANDARDS=3.9.1
+STANDARDS=3.9.2
 
 set -e
 
@@ -284,17 +284,33 @@ Source: $SRCPACKAGE
 Section: ${CONTRIB}$SECTION
 Priority: optional
 Maintainer: $DEBFULLNAME <$DEBEMAIL>
-Build-Depends: debhelper (>> $COMPAT), $COMPILER, javahelper (>= $JAVATOOLS_VERSION) $DEPENDS
+Build-Depends: debhelper (>= $COMPAT), $COMPILER, javahelper (>= $JAVATOOLS_VERSION) $DEPENDS
 Standards-Version: $STANDARDS
 Homepage: <homepage>
 
 Package: $BINPACKAGE
 Architecture: all
 Depends: \${java:Depends}, \${misc:Depends}
+Recommends: \${java:Recommends}
 Description: Short Description
  Long Description
 END
 
+if [ "$TYPE" = "lib" ] ; then
+    # add doc package template
+    cat >> debian/control <<END
+Package: $BINPACKAGE-doc
+Architecture: all
+Depends: \${java:Depends}, \${misc:Depends}
+Recommends: \${java:Recommends}
+Description: Short Description - doc
+ Long Description
+ .
+ This package contains the Javadoc API
+END
+
+fi
+
 cat > debian/copyright <<END
 This package was Debianised by $DEBFULLNAME <$DEBEMAIL> on `date`
 
@@ -358,11 +374,11 @@ END
    ;;
    "lib")
       echo "$SRCPACKAGE.jar" > debian/$BINPACKAGE.jlibs
-		if [ "$BUILD" = "byhand" ]; then
-			touch debian/$BINPACKAGE.javadoc
-		else
-			echo "<javadoc build dir here>" > debian/$BINPACKAGE.javadoc
-		fi
+      if [ "$BUILD" = "byhand" ]; then
+	  echo "internal" > debian/$BINPACKAGE-doc.javadoc
+      else
+	  echo "<javadoc build dir here>" > debian/$BINPACKAGE-doc.javadoc
+      fi
    ;;
 esac
 


hooks/post-receive
-- 
UNNAMED PROJECT