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

Proposed by Tormod Volden on 2009-09-01
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~tormodvolden/ubuntu/karmic/googleearth-package/karmic-bugs
Merge into: lp:ubuntu/karmic/googleearth-package
Diff against target: None lines
To merge this branch: bzr merge lp:~tormodvolden/ubuntu/karmic/googleearth-package/karmic-bugs
Reviewer Review Type Date Requested Status
Bryce Harrington Approve on 2009-09-01
Ubuntu branches 2009-09-01 Pending
Review via email: mp+11016@code.launchpad.net
To post a comment you must log in.
Tormod Volden (tormodvolden) wrote :

[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) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-04-16 15:10:48 +0000
3+++ debian/changelog 2009-09-01 21:45:13 +0000
4@@ -1,3 +1,10 @@
5+googleearth-package (0.5.6ubuntu1) karmic; urgency=low
6+
7+ * Fix bashism in make-googleearth-package (Closes: #524686)
8+ * Do not use the shipped libssl (Closes: #537837) LP: #369471
9+
10+ -- Tormod Volden <debian.tormod@gmail.com> Tue, 01 Sep 2009 23:19:45 +0200
11+
12 googleearth-package (0.5.6) unstable; urgency=low
13
14 * Fix typo in googleearth wrapper script that broke things.
15
16=== modified file 'make-googleearth-package'
17--- make-googleearth-package 2009-04-16 15:10:48 +0000
18+++ make-googleearth-package 2009-09-01 21:28:44 +0000
19@@ -300,7 +300,7 @@
20 #exec /lib/ld-linux.so.2 --library-path /usr/lib/googleearth /usr/lib/googleearth/googleearth-bin "$@"
21
22 GOOGLE_EARTH_LD_LIBRARY_PATH=/usr/lib/googleearth
23-if [ "$LD_LIBRARY_PATH" == "" ]; then
24+if [ -z "$LD_LIBRARY_PATH" ]; then
25 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GOOGLE_EARTH_LD_LIBRARY_PATH}
26 else
27 LD_LIBRARY_PATH=${GOOGLE_EARTH_LD_LIBRARY_PATH}
28@@ -379,6 +379,7 @@
29
30 # Workaround symbol problem in libcrypto
31 mv libcrypto.so.0.9.8 libcrypto.so.0.9.8.moved.for.workaround
32+ mv libssl.so.0.9.8 libssl.so.0.9.8.moved.for.workaround
33
34 # debian menu entry
35 cd "$instdir"

Subscribers

People subscribed via source and target branches

to all changes: