[SCM] UNNAMED PROJECT branch, master, updated. 0.37-13-gab56655

Niels Thykier niels at thykier.net
Mon Jan 23 10:35:29 UTC 2012


The following commit has been merged in the master branch:
commit 516b59ba97cdd2b8ebea4bc0eeaf6a8fab5e3d8e
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jan 17 17:21:57 2012 +0100

    Fixed a regression in jh_build introduced in 0.38
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index ef23f90..5fc00b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.40) UNRELEASED; urgency=low
+
+  * Fixed a regression jh_build (introduced in 0.38).
+    (Closes: #656872)
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 17 Jan 2012 17:08:25 +0100
+
 javatools (0.39) unstable; urgency=low
 
   * Corrected java-arch.sh output for armhf, sh4 and powerpcspe.
diff --git a/jh_build b/jh_build
index 37fd905..c5dd2d6 100755
--- a/jh_build
+++ b/jh_build
@@ -89,7 +89,7 @@ function dobuild()
 		echo "Main-Class: `getarg m main`"
 		echo "Debian-Java-Home: $JAVA_HOME"
 	    fi
-        ) | perl -p -e 's/(.{72})(?=.)/$1\n /go' >> debian/__jh_manifest.$ext
+        ) | perl -p -e 's/(.{72})(?=.)/$1\n /go' >> debian/_jh_manifest.$ext
         # (NB: see D::JH::Java::write_manifest_section_fd on the regex above)
 
    CLASSPATHDOCS="`for i in $(grep-dctrl --no-field-names --show-field Build-Depends,Build-Depends-Indep -F source "$pkg" debian/control | tr , ' ' | sed 's/([^)]*)//g') ; do dpkg -L $i 2>/dev/null | grep /usr/share/doc/.*/api$; done | sed 's/^/-link /' | xargs`"

-- 
UNNAMED PROJECT



More information about the pkg-java-commits mailing list