[SCM] UNNAMED PROJECT branch, master, updated. 0.30-28-g930c284

[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  930c284ff119ed46f28cf2b3926477ec41a65940 (commit)
      from  24558c3d846e08030d2a74707788cda19d155f71 (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 930c284ff119ed46f28cf2b3926477ec41a65940
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jul 4 15:37:45 2010 +0200

    Stopped scan_javadocs from following symlinks.
    Made jh_installeclipse always set orbit:Depends (even when empty)
    Updated the tutorials to mention the java:Recommends variable.
    Added notice to the description of javahelper that some of the
     depends for the eclipse helpers are in Suggests.

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

Summary of changes:
 Java.pm           |    9 +--------
 debian/control    |    4 ++++
 jh_installeclipse |    9 ++++++++-
 tutorial.html     |   12 +++++++++++-
 tutorial.txt      |    7 +++++++
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Java.pm b/Java.pm
index fb5624e..63e6b4d 100644
--- a/Java.pm
+++ b/Java.pm
@@ -92,16 +92,9 @@ sub scan_javadoc{
 		$packname = $1;
 		$apif = $2;
 		if(!defined($packname)){
-		    print STDERR "Ignoring weird link target ($target).\n";
+		    print STDERR "Ignoring weird URL target ($target).\n";
 		    next;
 		}
-		# Follow the link (unless it is default-jdk-doc)
-		if( -l "/usr/share/doc/$packname/$apif" && $packname ne 'default-jdk-doc'){
-		    my $ltarget = abs_path("/usr/share/doc/$packname/$apif");
-		    $phash{$ltarget} = 1;
-		    next;
-		}
-		#print STDERR "$target -> ($packname, $apif)\n" unless(exists($debpack{"/usr/share/doc/$packname/$apif"}));	
 		$phash{"/usr/share/doc/$packname/$apif"} = 1;
 	    }
 	}
diff --git a/debian/control b/debian/control
index 5405cbe..5b4aa26 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,10 @@ Description: Helper scripts for packaging Java programs
  .
  javahelper provides CDBS and dh macros so that it can be used with those
  package build systems.
+ .
+ Note that some of the eclipse helpers depends on packages not pulled
+ by default (like with devscripts). You can find these scripts in
+ Suggests.
 
 Package: java-propose-classpath
 Architecture: all
diff --git a/jh_installeclipse b/jh_installeclipse
index 24433db..aea360a 100755
--- a/jh_installeclipse
+++ b/jh_installeclipse
@@ -131,7 +131,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
     }
 }
-
 while ( my ($sysjar, $users) = each(%needed) ){
     my ($pkg, $ver) = findDependency($sysjar);
     if(!defined($pkg)){
@@ -144,6 +143,14 @@ while ( my ($sysjar, $users) = each(%needed) ){
     }
 }
 
+foreach my $package (@{$dh{DOPACKAGES}}){
+	my $ext=pkgext($package);
+	my $substvars="debian/${ext}substvars";
+	if (! -e $substvars || system("grep -q '^orbit:Depends=' $substvars") != 0) {
+		complex_doit("echo orbit:Depends= >> $substvars");
+	}
+}
+
 exit(0);
 
 # Determines where to install something for a given package.
diff --git a/tutorial.html b/tutorial.html
index 6bd3c28..14d10fe 100644
--- a/tutorial.html
+++ b/tutorial.html
@@ -93,7 +93,7 @@ jh_build weirdx.jar src
 	of any dfsg suffix. Other version-mangling options or explicit version numbers can also be provided.
 	</p>
               <h4>jh_depends</h4>
-              <p><tt>jh_depends</tt> works like dpkg-shlibdeps, but for jar files. For each jar in the package it 
+              <p><tt>jh_depends</tt> works like <tt>dpkg-shlibdeps</tt>, but for jar files. For each jar in the package it
       takes the jars on which it depends and finds the packages to which they belong. These are included
       in the debhelper substvars as <tt>${java:Depends}</tt>. The control file can then just list that
       variable which is filled in automatically.
@@ -109,6 +109,16 @@ jh_build weirdx.jar src
       If the application uses executable jars (see <i>Runtime support</i> below) then jh_depends will
       also add the appropriate depends on <tt>jarwrapper</tt> and the correct Java runtime.
    </p>
+	      <p>
+		As of version 0.32, <tt>jh_depends</tt> also checks installed javadocs for links
+		to system installed javadocs. It will use this to populate the
+		<tt>${java:Recommends}</tt> variable, which can be used for the doc package.
+	      </p>
+	      <p>
+		Note that both substvars are always created even if they are empty,
+		like <tt>debhelper</tt> does with <tt>${misc:Depends}</tt>.
+	      </p>
+
               <h4>jh_manifest</h4>
               <p>
       Many upstream build systems do not set the <tt>Class-Path</tt> attribute in the jars they create.
diff --git a/tutorial.txt b/tutorial.txt
index da64c21..9cba967 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -99,6 +99,13 @@ jh_depends
    then jh_depends will also add the appropriate depends on jarwrapper
    and the correct Java runtime.
 
+   As of version 0.32, jh_depends also checks installed javadocs for links
+   to system installed javadocs. It will use this to populate the
+   ${java:Recommends} variable, which can be used for the doc package.
+
+   Note that both substvars are always created even if they are empty,
+   like debhelper does with ${misc:Depends}.
+
 jh_manifest
 -----------
 


hooks/post-receive
-- 
UNNAMED PROJECT