Merge lp:~lfaraone/ubuntu/lucid/etoys/squeakvm-in-lib into lp:ubuntu/lucid/etoys

[Luke Faraone]

[James Westby (james-w)]

On Wed, 14 Apr 2010 16:27:19 -0000, Luke Faraone <email address hidden> wrote:
> Luke Faraone has proposed merging lp:~lfaraone/ubuntu/lucid/etoys/squeakvm-in-lib into lp:ubuntu/etoys.
>

> -VM="@prefix@/bin/squeakvm"
> +# Part copied from /usr/bin/squeak in package squeak-vm. ~lfaraone 2010-04-14
> +VM_VERSION=`find /usr/lib/squeak/ -name "squeakvm" -type f|cut -f5 -d"/"`
> +SQ_DIR=/usr/lib/squeak/$VM_VERSION

Why drop the @prefix@ support?

Thanks,

James

[Luke Faraone (lfaraone)]

> Why drop the @prefix@ support?

Fixed.

[lp:~lfaraone/ubuntu/lucid/etoys/squeakvm-in-lib]

4. By Luke Faraone on 2010-04-14

Restore @prefix@ functionality.

=== modified file 'debian/changelog'
--- debian/changelog	2008-06-12 22:05:31 +0000
+++ debian/changelog	2010-04-14 17:41:41 +0000
@@ -1,3 +1,10 @@
+etoys (3.0.1916+svn132-2ubuntu1) lucid; urgency=low
+
+  * etoys.in: use squeakvm in lib rather than /usr/bin/squeakvm, which no
+    longer exists. (LP: #561332, #301190)
+
+ -- Luke Faraone <[e-mail]>  Wed, 14 Apr 2010 12:21:38 -0400
+
 etoys (3.0.1916+svn132-2) unstable; urgency=low
 
   * Add myself to uploaders.

=== modified file 'debian/control'
--- debian/control	2008-06-12 22:05:31 +0000
+++ debian/control	2010-04-14 17:41:41 +0000
@@ -1,7 +1,8 @@
 Source: etoys
 Section: non-free/games
 Priority: extra
-Maintainer: José L. Redrejo Rodríguez <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: José L. Redrejo Rodríguez <[e-mail]>
 Uploaders: Holger Levsen <[e-mail]>
 Build-Depends: debhelper (>= 5), autotools-dev, automake
 Standards-Version: 3.7.3

=== modified file 'etoys.in'
--- etoys.in	2008-06-12 22:05:31 +0000
+++ etoys.in	2010-04-14 17:41:41 +0000
@@ -4,7 +4,17 @@
 # Description: Script to start the Squeak VM binary 
 #              with the etoys.image
 
-VM="@prefix@/bin/squeakvm"
+# Part copied from /usr/bin/squeak in package squeak-vm. ~lfaraone 2010-04-14
+VM_VERSION=`find @prefix@/lib/squeak/ -name "squeakvm" -type f|cut -f5 -d"/"`
+SQ_DIR=@prefix@/lib/squeak/$VM_VERSION
+if [ ! -n "$SQUEAK" ]
+then
+    VM="$SQ_DIR/squeakvm"
+else
+    VM="$SQUEAK"
+fi
+
+# End part.
 VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"
 IMAGE="@prefix@/share/etoys/etoys.image"
 IMOPTIONS=""