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

Proposed by Luke Faraone
Status: Merged
Merged at revision: 3
Proposed branch: lp:~lfaraone/ubuntu/lucid/etoys/squeakvm-in-lib
Merge into: lp:ubuntu/lucid/etoys
Diff against target: 51 lines (+20/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
etoys.in (+11/-1)
To merge this branch: bzr merge lp:~lfaraone/ubuntu/lucid/etoys/squeakvm-in-lib
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team Pending
Review via email: mp+23408@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

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

Revision history for this message
Luke Faraone (lfaraone) wrote :

> Why drop the @prefix@ support?

Fixed.

4. By Luke Faraone

Restore @prefix@ functionality.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1etoys (3.0.1916+svn132-2ubuntu1) lucid; urgency=low
2
3 * etoys.in: use squeakvm in lib rather than /usr/bin/squeakvm, which no
4 longer exists. (LP: #561332, #301190)
5
6 -- Luke Faraone <luke@faraone.cc> Wed, 14 Apr 2010 12:21:38 -0400
7
1etoys (3.0.1916+svn132-2) unstable; urgency=low8etoys (3.0.1916+svn132-2) unstable; urgency=low
29
3 * Add myself to uploaders.10 * Add myself to uploaders.
411
=== 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 @@
1Source: etoys1Source: etoys
2Section: non-free/games2Section: non-free/games
3Priority: extra3Priority: extra
4Maintainer: José L. Redrejo Rodríguez <jredrejo@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: José L. Redrejo Rodríguez <jredrejo@debian.org>
5Uploaders: Holger Levsen <holger@debian.org>6Uploaders: Holger Levsen <holger@debian.org>
6Build-Depends: debhelper (>= 5), autotools-dev, automake7Build-Depends: debhelper (>= 5), autotools-dev, automake
7Standards-Version: 3.7.38Standards-Version: 3.7.3
89
=== 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 @@
4# Description: Script to start the Squeak VM binary 4# Description: Script to start the Squeak VM binary
5# with the etoys.image5# with the etoys.image
66
7VM="@prefix@/bin/squeakvm"7# Part copied from /usr/bin/squeak in package squeak-vm. ~lfaraone 2010-04-14
8VM_VERSION=`find @prefix@/lib/squeak/ -name "squeakvm" -type f|cut -f5 -d"/"`
9SQ_DIR=@prefix@/lib/squeak/$VM_VERSION
10if [ ! -n "$SQUEAK" ]
11then
12 VM="$SQ_DIR/squeakvm"
13else
14 VM="$SQUEAK"
15fi
16
17# End part.
8VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"18VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"
9IMAGE="@prefix@/share/etoys/etoys.image"19IMAGE="@prefix@/share/etoys/etoys.image"
10IMOPTIONS=""20IMOPTIONS=""

Subscribers

People subscribed via source and target branches

to all changes: