Ubuntu

Merge lp:~lfaraone/ubuntu/karmic/etoys/lp301190 into lp:ubuntu/karmic/etoys

Proposed by Luke Faraone on 2010-04-16
Status: Merged
Merge reported by: Luke Faraone
Merged at revision: not available
Proposed branch: lp:~lfaraone/ubuntu/karmic/etoys/lp301190
Merge into: lp:ubuntu/karmic/etoys
Diff against target: 42 lines (+11/-2) 3 files modified
To merge this branch: bzr merge lp:~lfaraone/ubuntu/karmic/etoys/lp301190
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2010-04-16 Pending
Review via email: mp+23537@code.launchpad.net
To post a comment you must log in.

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2008-06-12 22:05:31 +0000
3+++ debian/changelog 2010-04-16 12:12:26 +0000
4@@ -1,3 +1,11 @@
5+etoys (3.0.1916+svn132-2ubuntu0.9.10.1) karmic-proposed; urgency=low
6+
7+ * etoys.in: Remove "-xshm" parameter from call to squeak-vm to work around
8+ lack of SHM support in squeak-vm. (LP: #301190)
9+ * Update maintainer field.
10+
11+ -- Luke Faraone <luke@faraone.cc> Thu, 15 Apr 2010 18:09:15 -0400
12+
13 etoys (3.0.1916+svn132-2) unstable; urgency=low
14
15 * Add myself to uploaders.
16
17=== modified file 'debian/control'
18--- debian/control 2008-06-12 22:05:31 +0000
19+++ debian/control 2010-04-16 12:12:26 +0000
20@@ -1,7 +1,8 @@
21 Source: etoys
22 Section: non-free/games
23 Priority: extra
24-Maintainer: José L. Redrejo Rodríguez <jredrejo@debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: José L. Redrejo Rodríguez <jredrejo@debian.org>
27 Uploaders: Holger Levsen <holger@debian.org>
28 Build-Depends: debhelper (>= 5), autotools-dev, automake
29 Standards-Version: 3.7.3
30
31=== modified file 'etoys.in'
32--- etoys.in 2008-06-12 22:05:31 +0000
33+++ etoys.in 2010-04-16 12:12:26 +0000
34@@ -5,7 +5,7 @@
35 # with the etoys.image
36
37 VM="@prefix@/bin/squeakvm"
38-VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"
39+VMOPTIONS="-encoding UTF-8 -vm-display-x11"
40 IMAGE="@prefix@/share/etoys/etoys.image"
41 IMOPTIONS=""
42 ALTIMG=`echo /media/*/olpc-dev/etoys.image`

Subscribers

People subscribed via source and target branches

to all changes: