[SCM] UNNAMED PROJECT branch, master, updated. 0.33-1-g4b3112f

[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  4b3112fdca0ffd0ee5f37e2314acf938371ede1b (commit)
      from  e3cbc5068e7967f5a7fe6e1b8d6c4e45fa103596 (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 4b3112fdca0ffd0ee5f37e2314acf938371ede1b
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Apr 29 08:42:35 2011 +0200

    Fixed a regression where jh_installlibs might install into /
    
    Introduced in 0.33 (commit: a7b20a13)

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

Summary of changes:
 debian/changelog |    8 ++++++++
 jh_installlibs   |   11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37327b1..93cc4b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+javatools (0.34) UNRELEASED; urgency=low
+
+  * Fixed a regression in 0.33 that in some cases would make
+    jh_installlibs install in to the system root and not the package
+    root.  (Closes: #624503)
+
+ -- Niels Thykier <niels at thykier.net>  Fri, 29 Apr 2011 08:41:18 +0200
+
 javatools (0.33) unstable; urgency=low
 
   [ Matthew Johnson ]
diff --git a/jh_installlibs b/jh_installlibs
index 6bfd697..f5e95af 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -53,8 +53,9 @@ function processjar()
 	fi
 
 	if [ -n "`getarg n no-act`" ]; then
-		echo install -m 644 "$from" "debian/$p/usr/share/java/${to%.jar}-${VERSION}.jar"
-		echo ln -sf ${to%.jar}-${VERSION}.jar "debian/$p/usr/share/java/$to"
+	        echo mkdir -p "$PACKAGEDIR/usr/share/java"
+		echo install -m 644 "$from" "$PACKAGEDIR/usr/share/java/${to%.jar}-${VERSION}.jar"
+		echo ln -sf ${to%.jar}-${VERSION}.jar "$PACKAGEDIR/usr/share/java/$to"
 	else
 		if [ -n "$VERBOSE" ]; then
 			echo "Installing library $j into package $p"
@@ -68,6 +69,12 @@ function processjar()
 if [ "$ARGC" != "0" ] ; then
    
    p="`firstpackage`"    
+   PACKAGEDIR="`getarg P tmpdir`"
+   if [ -z "$PACKAGEDIR" ]; then
+      PACKAGEDIR="`pwd`/debian/$p"
+   else
+      PACKAGEDIR=`readlink -f $PACKAGEDIR`
+   fi
 
    for (( i=0; i < $ARGC; i++ )); do
       j=${ARGV[i]}


hooks/post-receive
-- 
UNNAMED PROJECT