Merge lp:~tormodvolden/ubuntu/karmic/googleearth-package/karmic-bugs into lp:ubuntu/karmic/googleearth-package

[Tormod Volden]

[Tormod Volden (tormodvolden)]

[PATCH] Do not use local libssl either.
Move the local libssl away the same way we do for libcrypto.
The standard libssl0.9.8 Debian package should work fine.
(Closes: 528029, 537837)

[PATCH] Fix bashism in make-googleearth-package
The string equality operator in the Bourne shell is "=". Anyway, if
we want to probe for the empty string, use -z instead.
(Closes: 524686)

[Bryce Harrington (bryce)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-16 15:10:48 +0000
+++ debian/changelog	2009-09-01 21:45:13 +0000
@@ -1,3 +1,10 @@
+googleearth-package (0.5.6ubuntu1) karmic; urgency=low
+
+  * Fix bashism in make-googleearth-package (Closes: #524686)
+  * Do not use the shipped libssl (Closes: #537837) LP: #369471
+
+ -- Tormod Volden <[e-mail]>  Tue, 01 Sep 2009 23:19:45 +0200
+
 googleearth-package (0.5.6) unstable; urgency=low
 
   * Fix typo in googleearth wrapper script that broke things.
 
=== modified file 'make-googleearth-package'
--- make-googleearth-package	2009-04-16 15:10:48 +0000
+++ make-googleearth-package	2009-09-01 21:28:44 +0000
@@ -300,7 +300,7 @@
 #exec /lib/ld-linux.so.2 --library-path /usr/lib/googleearth /usr/lib/googleearth/googleearth-bin "$@"
 
 GOOGLE_EARTH_LD_LIBRARY_PATH=/usr/lib/googleearth
-if [ "$LD_LIBRARY_PATH" == "" ]; then
+if [ -z "$LD_LIBRARY_PATH" ]; then
   LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GOOGLE_EARTH_LD_LIBRARY_PATH}
 else
   LD_LIBRARY_PATH=${GOOGLE_EARTH_LD_LIBRARY_PATH}
@@ -379,6 +379,7 @@
 
   # Workaround symbol problem in libcrypto
   mv libcrypto.so.0.9.8 libcrypto.so.0.9.8.moved.for.workaround
+  mv libssl.so.0.9.8 libssl.so.0.9.8.moved.for.workaround
 
   # debian menu entry
   cd "$instdir"