Merge lp:~lfaraone/ubuntu/intrepid/etoys/lp301190 into lp:ubuntu/intrepid/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/intrepid/etoys/lp301190
Merge into: lp:ubuntu/intrepid/etoys
Diff against target: 42 lines (+11/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
etoys.in (+1/-1)
To merge this branch: bzr merge lp:~lfaraone/ubuntu/intrepid/etoys/lp301190
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2010-04-16 Pending
Review via email: mp+23539@code.launchpad.net
To post a comment you must log in.

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-16 12:13:24 +0000
@@ -1,3 +1,11 @@
1etoys (3.0.1916+svn132-2ubuntu0.8.10.1) intrepid-proposed; urgency=low
2
3 * etoys.in: Remove "-xshm" parameter from call to squeak-vm to work around
4 lack of SHM support in squeak-vm. (LP: #301190)
5 * Update maintainer field.
6
7 -- Luke Faraone <luke@faraone.cc> Thu, 15 Apr 2010 18:13:50 -0400
8
1etoys (3.0.1916+svn132-2) unstable; urgency=low9etoys (3.0.1916+svn132-2) unstable; urgency=low
210
3 * Add myself to uploaders.11 * Add myself to uploaders.
412
=== modified file 'debian/control'
--- debian/control 2008-06-12 22:05:31 +0000
+++ debian/control 2010-04-16 12:13:24 +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-16 12:13:24 +0000
@@ -5,7 +5,7 @@
5# with the etoys.image5# with the etoys.image
66
7VM="@prefix@/bin/squeakvm"7VM="@prefix@/bin/squeakvm"
8VMOPTIONS="-encoding UTF-8 -vm-display-x11 -xshm"8VMOPTIONS="-encoding UTF-8 -vm-display-x11"
9IMAGE="@prefix@/share/etoys/etoys.image"9IMAGE="@prefix@/share/etoys/etoys.image"
10IMOPTIONS=""10IMOPTIONS=""
11ALTIMG=`echo /media/*/olpc-dev/etoys.image`11ALTIMG=`echo /media/*/olpc-dev/etoys.image`

Subscribers

People subscribed via source and target branches

to all changes: