[SCM] UNNAMED PROJECT branch, policy-dc10, updated. 0.30-50-gc04e9ee

[Matthew Johnson]

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, policy-dc10 has been updated
       via  c04e9eeb79e8a271041291189be17ddf061e0208 (commit)
      from  494e0d41649fbacd9e24d0010545ddb39a0bf176 (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 c04e9eeb79e8a271041291189be17ddf061e0208
Author: Matthew Johnson <mjj29 at debian.org>
Date:   Sun Aug 8 20:55:25 2010 +0100

    fix the postinst stuff after testing it

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

Summary of changes:
 jh_build         |    8 ++++----
 jh_postinst      |    4 ++--
 postinst-javalib |    2 +-
 prerm-javalib    |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jh_build b/jh_build
index 1ee94b6..1bd0e1f 100755
--- a/jh_build
+++ b/jh_build
@@ -130,15 +130,15 @@ function dobuild()
 	(
 		cd debian/_jh_build.$ext;
 		if [ -z "`getarg q quiet`" ]; then
-			echo $JAR -c -f "$jarpath" -m ../_jh_manifest.$ext *   
+			echo $JAR cfm "$jarpath" ../_jh_manifest.$ext *   
 		fi
-		$JAR -c -f "$jarpath" -m ../_jh_manifest.$ext *
+		$JAR cfm "$jarpath" ../_jh_manifest.$ext *
 	)
 	if [ -n "$JH_JAR_EXTRA" ]; then
 		if [ -z "`getarg q quiet`" ]; then
-			echo $JAR -u -f "$jarpath" -@
+			echo $JAR uf "$jarpath" -@
 		fi
-		echo "$JH_JAR_EXTRA" | sed 's/ /\n/g' | $JAR -u -f "$jarpath" -@ 
+		echo "$JH_JAR_EXTRA" | sed 's/ /\n/g' | $JAR uf "$jarpath" -@ 
 	fi
 
 }
diff --git a/jh_postinst b/jh_postinst
index 2a9339d..78d33c4 100755
--- a/jh_postinst
+++ b/jh_postinst
@@ -31,10 +31,10 @@ linklib()
 	PACKAGE="${ARGV[4]}"
 
 	echo "# Automatically added by javahelper" >> "debian/$PACKAGE.postinst.debhelper"
-	sed "s%#SOURCE#%$SOURCE%;s%#TARGET#%$TARGET%;s%#SONAME#%$SONAME%" /usr/share/debhelper/autoscripts/postinst-javalib >> "debian/$PACKAGE.postinst.debhelper"
+	sed "s%#SOURCE#%$SOURCE%g;s%#TARGET#%$TARGET%g;s%#SONAME#%$SONAME%g" /usr/share/debhelper/autoscripts/postinst-javalib >> "debian/$PACKAGE.postinst.debhelper"
 	echo "# End automatically added section" >> "debian/$PACKAGE.postinst.debhelper"
 	echo "# Automatically added by javahelper" >> "debian/$PACKAGE.prerm.debhelper"
-	sed "s%#SOURCE#%$SOURCE%;s%#TARGET#%$TARGET%;s%#SONAME#%$SONAME%" /usr/share/debhelper/autoscripts/prerm-javalib >> "debian/$PACKAGE.prerm.debhelper"
+	sed "s%#SOURCE#%$SOURCE%g;s%#TARGET#%$TARGET%g;s%#SONAME#%$SONAME%g" /usr/share/debhelper/autoscripts/prerm-javalib >> "debian/$PACKAGE.prerm.debhelper"
 	echo "# End automatically added section" >> "debian/$PACKAGE.prerm.debhelper"
 }
 
diff --git a/postinst-javalib b/postinst-javalib
index 0d2f681..db6b044 100644
--- a/postinst-javalib
+++ b/postinst-javalib
@@ -9,7 +9,7 @@ if [ -e "#TARGET#" ]; then
 			ln -sf "#SOURCE#" "#TARGET#"
 		else
 			# do nothing, the symlink points to a newer version
-			;
+			true
 		fi
 	else
 		echo "#TARGET# exists and is not a symlink"
diff --git a/prerm-javalib b/prerm-javalib
index 6b26e96..16e2c7c 100644
--- a/prerm-javalib
+++ b/prerm-javalib
@@ -3,7 +3,7 @@ if [ -e "#TARGET#" ]; then
 		# need to work out if it's pointing at us
 		old="`readlink "#TARGET#"`"
 		SONAME="`basename "$old" .jar | sed 's/.*\([0-9][0-9.]*\)/\1/'`" 
-		if [ '#SONAME#' = "$SONAME" ] then
+		if [ '#SONAME#' = "$SONAME" ]; then
 			# it's our symlink, do something with it
 			NEWSOURCE=""
 			NEWSONAME="0"
@@ -23,7 +23,7 @@ if [ -e "#TARGET#" ]; then
 			fi
 		else
 			# do nothing, the symlink points to a different version
-			;
+			true
 		fi
 	else
 		echo "#TARGET# exists and is not a symlink"


hooks/post-receive
-- 
UNNAMED PROJECT