[23893] in Source-Commits
/svn/athena r23503 - in trunk/debathena: config config/gdm-config/debathena config/gdm-config/debian scripts
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sun Mar 1 00:30:10 2009
Date: Sun, 1 Mar 2009 00:30:03 -0500
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200903010530.n215U3eF028464@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-03-01 00:30:03 -0500 (Sun, 01 Mar 2009)
New Revision: 23503
Added:
trunk/debathena/config/gdm-config/debathena/bottomlogo.png
trunk/debathena/config/gdm-config/debathena/capslock.png
trunk/debathena/config/gdm-config/debathena/loginbox.png
trunk/debathena/config/gdm-config/debathena/marble-512x512.png
trunk/debathena/config/gdm-config/debathena/owl-glow.png
Removed:
trunk/debathena/config/gdm-config-athena10/
trunk/debathena/config/gdm-config/debathena/debathena-owl-100.png
trunk/debathena/config/gdm-config/debathena/fuzzball-100.png
Modified:
trunk/debathena/config/gdm-config/debathena/GdmGreeterTheme.desktop
trunk/debathena/config/gdm-config/debathena/debathena.xml
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/scripts/gen-packages
Log:
Merge debathena-gdm-config-athena10 into debathena-gdm-config.
Modified: trunk/debathena/config/gdm-config/debathena/GdmGreeterTheme.desktop
===================================================================
--- trunk/debathena/config/gdm-config/debathena/GdmGreeterTheme.desktop 2009-03-01 04:32:13 UTC (rev 23502)
+++ trunk/debathena/config/gdm-config/debathena/GdmGreeterTheme.desktop 2009-03-01 05:30:03 UTC (rev 23503)
@@ -2,7 +2,7 @@
Encoding=UTF-8
Greeter=debathena.xml
Name=Debathena
-Description=Athena-style login dialog
-Author=Geoffrey Thomas <geofft@mit.edu>
-Copyright=© 2008 SIPB (GPL)
+Description=Standard Athena login dialog
+Author=Debathena Project <debathena@mit.edu>
+Copyright=© 2009 MIT (MIT license)
Screenshot=screenshot.png
Copied: trunk/debathena/config/gdm-config/debathena/bottomlogo.png (from rev 23480, trunk/debathena/config/gdm-config-athena10/debathena/bottomlogo.png)
===================================================================
(Binary files differ)
Copied: trunk/debathena/config/gdm-config/debathena/capslock.png (from rev 23480, trunk/debathena/config/gdm-config-athena10/debathena/capslock.png)
===================================================================
(Binary files differ)
Deleted: trunk/debathena/config/gdm-config/debathena/debathena-owl-100.png
Modified: trunk/debathena/config/gdm-config/debathena/debathena.xml
===================================================================
--- trunk/debathena/config/gdm-config/debathena/debathena.xml 2009-03-01 04:32:13 UTC (rev 23502)
+++ trunk/debathena/config/gdm-config/debathena/debathena.xml 2009-03-01 05:30:03 UTC (rev 23503)
@@ -1,134 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE greeter SYSTEM "greeter.dtd">
<greeter>
- <item type="rect">
- <normal color="#660022" />
+ <!-- The background -->
+ <item type="pixmap">
+ <normal file="marble-512x512.png" />
<pos x="0" y="0" width="100%" height="100%" anchor="nw" />
</item>
+ <!-- Bottom bar -->
<item type="rect">
- <normal color="#000000" />
- <pos anchor="n" x="50%" y="25%" height="box" width="box" />
- <box xpadding="1" ypadding="1">
- <item type="rect">
- <normal color="#FFFFFF" />
- <pos height="box" width="box" />
- <box orientation="vertical" spacing="20">
- <item type="rect">
- <pos x="50%" y="20" anchor="n" height="box" width="box" />
- <box orientation="horizontal" spacing="40">
- <item type="pixmap">
- <normal file="debathena-owl-100.png" />
- <pos y="50%" x="20" anchor="w" />
- </item>
- <item type="rect">
- <pos y="50%" anchor="w" height="box" width="box" />
- <box orientation="vertical" spacing="10">
- <item type="label">
- <normal color="#d70751" font="Trebuchet MS Bold 24" />
- <pos anchor="n" x="50%" />
- <text>Welcome to Debathena</text>
- </item>
- <item type="label">
- <pos anchor="n" x="50%" />
- <normal color="#000000" font="Trebuchet MS 14" />
- <text>%h</text>
- </item>
- <item type="label" id="clock">
- <normal color="#000000" font="Trebuchet MS 12" />
- <pos anchor="n" x="50%" />
- <text>%c</text>
- </item>
- </box>
- </item>
- <item type="pixmap">
- <normal file="fuzzball-100.png" />
- <pos y="50%" x="-20" anchor="e" />
- </item>
- </box>
+ <normal color="#000000"/>
+ <pos x="0" y="-60" width="100%" height="60"/>
+ <fixed>
+ <!-- The black border of the bottom bar -->
+ <item type="rect" background="true">
+ <normal color="#ffffff"/>
+ <pos x="0" y="5" width="100%" height="100%"/>
+ <!-- A box containing the session and action buttons -->
+ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="0">
+ <item type="button" id="session_button">
+ <pos y="50%" anchor="w" height="30" width="100"/>
+ <stock type="session"/>
</item>
- <item type="label" id="pam-prompt">
- <pos anchor="n" x="50%" />
- <normal color="#000000" font="Trebuchet MS 12" />
- <text></text>
+ <item type="button" id="options_button">
+ <pos y="50%" anchor="w" width="100" height="30" />
+ <stock type="system"/>
</item>
- <item type="rect">
- <normal color="#000000" />
- <pos anchor="n" x="50%" height="30" width="60%" />
- <fixed>
- <item type="entry" id="user-pw-entry">
- <normal color="#000000" font="Trebuchet MS 14" />
- <pos anchor="nw" x="2" y="2" height="-4" width="-4" />
- </item>
- </fixed>
- </item>
- <item type="label" id="caps-lock-warning">
- <normal color="#000000" font="Trebuchet MS 12" />
- <pos anchor="n" x="50%" />
- <stock type="caps-lock-warning" />
- </item>
- <item type="label" id="pam-error">
- <pos anchor="n" x="50%" />
- <normal color="#000000" font="Trebuchet MS 12" />
- <text></text>
- </item>
- <item type="label" id="timed-label">
- <pos anchor="n" x="50%" />
- <normal color="#000000" font="Trebuchet MS 12" />
- <stock type="timed-label" />
- <show type="timed" />
- </item>
- <item type="rect">
- <pos anchor="n" x="50%" width="box" height="box" />
- <box orientation="horizontal" spacing="50">
- <item type="rect" id="session_button" button="true">
- <pos anchor="w" width="120" height="36" />
- <fixed>
- <item type="rect">
- <pos anchor="c" x="50%" y="50%" width="120" height="36" />
- <normal color="#000000" />
- </item>
- <item type="rect">
- <pos anchor="c" x="50%" y="50%" width="118" height="34" />
- <normal color="#FFFFFF" />
- </item>
- <item type="label">
- <normal color="#000000" font="Trebuchet MS 12" />
- <pos anchor="c" x="50%" y="50%" />
- <text>Login Options</text>
- </item>
- </fixed>
- </item>
- <item type="rect" id="options_button" button="true">
- <pos anchor="w" width="120" height="36" />
- <fixed>
- <item type="rect">
- <pos anchor="c" x="50%" y="50%" width="120" height="36" />
- <normal color="#000000" />
- </item>
- <item type="rect">
- <pos anchor="c" x="50%" y="50%" width="118" height="34" />
- <normal color="#FFFFFF" />
- </item>
- <item type="label">
- <normal color="#000000" font="Trebuchet MS 12" />
- <pos anchor="c" x="50%" y="50%" />
- <text>Other Options</text>
- </item>
- </fixed>
- </item>
- </box>
- </item>
</box>
</item>
- <!--item type="rect" width="0" />
- </box></item>
- <item type="rect" height="0" /-->
+ <!-- The clock -->
+ <item type="label" id="clock">
+ <normal color="#000000" font="Trebuchet MS 10" />
+ <pos x="-10" y="50%" anchor="e" />
+ <text>%c</text>
+ </item>
+ <!-- The caps-lock icon -->
+ <item type="pixmap" id="caps-lock-warning">
+ <pos x="80%" y="50%" anchor="c" />
+ <normal file="capslock.png" />
+ </item>
+ <!-- The sipb and isnt logos -->
+ <item type="pixmap">
+ <normal file="bottomlogo.png" />
+ <pos x="50%" y="55%" anchor="c" />
+ </item>
+ </fixed>
+ </item>
+ <!-- The owl icon -->
+ <item type="pixmap">
+ <normal file="owl-glow.png" />
+ <pos x="50%" y="5%" anchor="n" />
+ </item>
+ <!-- The background for the login box -->
+ <item type="pixmap">
+ <normal file="loginbox.png" />
+ <pos x="50%" y="45%" anchor="c" width="500" height="320" />
+ </item>
+ <!-- An invisible rectangle for the login box -->
+ <item type="rect">
+ <normal color="#000000" alpha="0.0" />
+ <pos anchor="c" x="50%" y="46%" width="400" height="220" />
+ <box orientation="vertical" padding="5" spacing="10" homogenous="false">
+ <!-- Welcome -->
+ <item type="label" id="title">
+ <normal color="#993333" font="Trebuchet MS Bold 20" />
+ <pos anchor="c" x="50%" y="50%"/>
+ <text>Welcome to Athena</text>
+ </item>
+ <!-- Hostname -->
+ <item type="label">
+ <normal color="#993333" font="Trebuchet MS Bold 14" />
+ <pos anchor="n" x="50%" />
+ <text>%h</text>
+ </item>
+ <!-- Timed login (we don't use this) -->
+ <item type="label" id="timed-label">
+ <normal color="#000000" font="Trebuchet MS 12" />
+ <pos anchor="n" x="50%" />
+ <stock type="timed-label"/>
+ <show type="timed" />
+ </item>
+ <!-- Spacer (empty label) shown in console (normal) mode -->
+ <item type="label">
+ <normal color="#000000" font="Trebuchet MS 12" />
+ <pos anchor="n" x="50%" />
+ <show type="console" />
+ <text></text>
+ </item>
+ <!-- PAM prompt -->
+ <!-- text tag is ignored, but set here because gdmthemetester
+ is broken -->
+ <item type="label" id="pam-prompt">
+ <pos anchor="n" x="50%" />
+ <normal color="#000000" font="Trebuchet MS 12" />
+ <text>Username:</text>
+ </item>
+ <!-- black border around username field -->
+ <item type="rect">
+ <normal color="#000000" />
+ <pos anchor="n" x="50%" height="30" width="60%"/>
+ <fixed>
+ <!-- username field -->
+ <item type="entry" id="user-pw-entry">
+ <normal color="#000000" font="Trebuchet MS Bold 12" />
+ <pos anchor="nw" x="2" y="2" height="-4" width="-4" />
+ </item>
+ </fixed>
+ </item>
+ <!-- PAM error text (ie: username/passsword incorret -->
+ <item type="label" id="pam-error">
+ <pos anchor="n" x="50%" />
+ <normal color="#ff0000" font="Trebuchet MS 10" />
+ <text></text>
+ </item>
</box>
</item>
+
<!-- pam message (hidden, but required) -->
<item type="label" id="pam-message">
<pos x="50%" anchor="c" />
- <normal alpha="0.00"/>
+ <normal alpha="1.00"/>
<text></text>
</item>
</greeter>
Deleted: trunk/debathena/config/gdm-config/debathena/fuzzball-100.png
Copied: trunk/debathena/config/gdm-config/debathena/loginbox.png (from rev 23480, trunk/debathena/config/gdm-config-athena10/debathena/loginbox.png)
===================================================================
(Binary files differ)
Copied: trunk/debathena/config/gdm-config/debathena/marble-512x512.png (from rev 23480, trunk/debathena/config/gdm-config-athena10/debathena/marble-512x512.png)
===================================================================
(Binary files differ)
Copied: trunk/debathena/config/gdm-config/debathena/owl-glow.png (from rev 23480, trunk/debathena/config/gdm-config-athena10/debathena/owl-glow.png)
===================================================================
(Binary files differ)
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2009-03-01 04:32:13 UTC (rev 23502)
+++ trunk/debathena/config/gdm-config/debian/changelog 2009-03-01 05:30:03 UTC (rev 23503)
@@ -1,3 +1,9 @@
+debathena-gdm-config (1.10) unstable; urgency=low
+
+ * Merge the athena10.mit.edu apt repo's fork into the original package.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Sun, 01 Mar 2009 00:06:53 -0500
+
debathena-gdm-config (1.7) unstable; urgency=low
* Remove the somewhat broken "Secure Remote Connection" session
Modified: trunk/debathena/scripts/gen-packages
===================================================================
--- trunk/debathena/scripts/gen-packages 2009-03-01 04:32:13 UTC (rev 23502)
+++ trunk/debathena/scripts/gen-packages 2009-03-01 05:30:03 UTC (rev 23503)
@@ -71,20 +71,7 @@
done
fi
-# Athena 10 uses a different version of gdm-config from SIPB. Using
-# DEBATHENA_APT to distinguish between the two is a little hackish,
-# but it's what we've got. We're setting $gdm to the location we want
-# to filter out, not the path we want to keep.
-case $DEBATHENA_APT in
-*athena10*)
- gdm=' debathena/config/gdm-config$'
- ;;
-*)
- gdm=' debathena/config/gdm-config-athena10$'
- ;;
-esac
-
# cyrus-sasl2-mit has a debian dir but is really a debathenify package.
# config-package dev has some example packages we want to filter out.
-sort -u packages.unsorted | egrep -v "cyrus-sasl2-mit|/examples/|$gdm" > packages
+sort -u packages.unsorted | egrep -v "cyrus-sasl2-mit|/examples/" > packages
rm -f packages.unsorted
