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

[Luke Faraone]

[Benjamin Drung (bdrung)]

It was merged (uploaded to jaunty-proposed).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2008-06-12 22:05:31 +0000
+++ debian/changelog	2010-04-16 12:13:21 +0000
@@ -1,3 +1,11 @@
+etoys (3.0.1916+svn132-2ubuntu0.9.04.1) jaunty-proposed; urgency=low
+
+  * etoys.in: Remove "-xshm" parameter from call to squeak-vm to work around 
+    lack of SHM support in squeak-vm. (LP: #301190)
+  * Update maintainer field.
+
+ -- Luke Faraone <[e-mail]>  Thu, 15 Apr 2010 18:10:51 -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-16 12:13:21 +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-16 12:13:21 +0000
@@ -5,7 +5,7 @@
 #              with the etoys.image
 
 VM="@prefix@/bin/squeakvm"
-VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"
+VMOPTIONS="-encoding UTF-8 -vm-display-x11"
 IMAGE="@prefix@/share/etoys/etoys.image"
 IMOPTIONS=""
 ALTIMG=`echo /media/*/olpc-dev/etoys.image`