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

Proposed by Luke Faraone on 2010-04-14
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 2010-04-14 Pending
Review via email: mp+23408@code.launchpad.net
To post a comment you must log in.
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

Luke Faraone (lfaraone) wrote :

> Why drop the @prefix@ support?

Fixed.

4. By Luke Faraone on 2010-04-14

Restore @prefix@ functionality.

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 2008-06-12 22:05:31 +0000
3+++ debian/changelog 2010-04-14 17:41:41 +0000
4@@ -1,3 +1,10 @@
5+etoys (3.0.1916+svn132-2ubuntu1) lucid; urgency=low
6+
7+ * etoys.in: use squeakvm in lib rather than /usr/bin/squeakvm, which no
8+ longer exists. (LP: #561332, #301190)
9+
10+ -- Luke Faraone <luke@faraone.cc> Wed, 14 Apr 2010 12:21:38 -0400
11+
12 etoys (3.0.1916+svn132-2) unstable; urgency=low
13
14 * Add myself to uploaders.
15
16=== modified file 'debian/control'
17--- debian/control 2008-06-12 22:05:31 +0000
18+++ debian/control 2010-04-14 17:41:41 +0000
19@@ -1,7 +1,8 @@
20 Source: etoys
21 Section: non-free/games
22 Priority: extra
23-Maintainer: José L. Redrejo Rodríguez <jredrejo@debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: José L. Redrejo Rodríguez <jredrejo@debian.org>
26 Uploaders: Holger Levsen <holger@debian.org>
27 Build-Depends: debhelper (>= 5), autotools-dev, automake
28 Standards-Version: 3.7.3
29
30=== modified file 'etoys.in'
31--- etoys.in 2008-06-12 22:05:31 +0000
32+++ etoys.in 2010-04-14 17:41:41 +0000
33@@ -4,7 +4,17 @@
34 # Description: Script to start the Squeak VM binary
35 # with the etoys.image
36
37-VM="@prefix@/bin/squeakvm"
38+# Part copied from /usr/bin/squeak in package squeak-vm. ~lfaraone 2010-04-14
39+VM_VERSION=`find @prefix@/lib/squeak/ -name "squeakvm" -type f|cut -f5 -d"/"`
40+SQ_DIR=@prefix@/lib/squeak/$VM_VERSION
41+if [ ! -n "$SQUEAK" ]
42+then
43+ VM="$SQ_DIR/squeakvm"
44+else
45+ VM="$SQUEAK"
46+fi
47+
48+# End part.
49 VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"
50 IMAGE="@prefix@/share/etoys/etoys.image"
51 IMOPTIONS=""

Subscribers

People subscribed via source and target branches

to all changes: