[26349] in Source-Commits
/svn/athena r25532 - in trunk/debathena/debathena/kiosk: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed May 30 11:06:09 2012
Date: Wed, 30 May 2012 11:06:08 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205301506.q4UF68ej022155@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-30 11:06:08 -0400 (Wed, 30 May 2012)
New Revision: 25532
Modified:
trunk/debathena/debathena/kiosk/debian/control.in
trunk/debathena/debathena/kiosk/xinitrc
Log:
We don't want --debug when xinitrc calls bugme
Depend on correct version of bugme
Modified: trunk/debathena/debathena/kiosk/debian/control.in
===================================================================
--- trunk/debathena/debathena/kiosk/debian/control.in 2012-05-30 14:50:35 UTC (rev 25531)
+++ trunk/debathena/debathena/kiosk/debian/control.in 2012-05-30 15:06:08 UTC (rev 25532)
@@ -8,7 +8,7 @@
Package: debathena-kiosk
Architecture: all
Depends: ${misc:Depends}, firefox | iceweasel, metacity, unzip, adduser,
- gdm, python, python-gtk2, python-glade2, python-dbus, sun-java6-plugin | icedtea6-plugin, debathena-bugme (>> 10.0.4-0debathena1)
+ gdm, python, python-gtk2, python-glade2, python-dbus, sun-java6-plugin | icedtea6-plugin, debathena-bugme (>= 10.0.4-0debathena1)
Description: Starts a kiosk mode web browser on a new virtual terminal
This package provides a tool to launch a separate X11 session, running
a kiosk mode web browser, on a new virtual terminal. It is most useful
Modified: trunk/debathena/debathena/kiosk/xinitrc
===================================================================
--- trunk/debathena/debathena/kiosk/xinitrc 2012-05-30 14:50:35 UTC (rev 25531)
+++ trunk/debathena/debathena/kiosk/xinitrc 2012-05-30 15:06:08 UTC (rev 25532)
@@ -69,7 +69,7 @@
# Launch firefox.
if [ "$(machtype -q)" = "quickstation" ] && [ -x /usr/bin/bugme ]; then
- bugme --debug --fatal firefox
+ bugme --fatal firefox
else
firefox
fi
