Bug#460605: gjdoc: dh_javadoc doesn't read .javadoc files correctly

[Matthew Johnson]

Package: gjdoc
Version: 0.7.7-7
Severity: important


dh_javadoc is meant to read (Java) package names from the file
debian/$package.javadoc. However, when reading the file it does
not strip linebreaks before passing them to gjdoc. As a result,
it calls gjdoc with the arguments:

   "foo.bar\n" "bar.baz\n"

which fails. There is also a typo in one of the error messages.

The attached patch fixes the problem

-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.6.22-2-686
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)

Versions of packages gjdoc depends on:
ii  antlr                  2.7.6-7           language tool for constructing rec
ii  debhelper              5.0.42            helper programs for debian/rules
ii  gij [java1-runtime]    4:4.1.1-15        The GNU Java bytecode interpreter
ii  gij-4.1 [java1-runtime 4.1.1-20          The GNU Java bytecode interpreter
ii  java-gcj-compat        1.0.65-10         Java runtime environment using GIJ
ii  libc6                  2.3.6.ds1-13etch2 GNU C Library: Shared libraries
ii  libgcc1                1:4.1.1-21        GCC support library
ii  libgcj-bc              4.1.1-21          Link time only library for use wit
ii  libgcj7-0              4.1.1-20          Java runtime library for use with 
ii  sun-java5-jre [java1-r 1.5.0-10-3        Sun Java(TM) Runtime Environment (
ii  sun-java6-jre [java1-r 6-00-2~bpo.1      Sun Java(TM) Runtime Environment (
ii  zlib1g                 1:1.2.3-13        compression library - runtime

gjdoc recommends no packages.

-- no debconf information
-------------- next part --------------
--- dh_javadoc.old	2008-01-13 23:10:25.071094866 +0000
+++ dh_javadoc	2008-01-13 23:24:42.591899534 +0000
@@ -98,8 +98,10 @@
 
 	if (-e "debian/$package.javadoc"){
 		open PACKAGES, "debian/$package.javadoc"
-			or error("Unable to open file: debian/$package.javadocL: $!");
-		my @pkgs = <PACKAGES>;
+			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);
 	}