rename package, add gdm support

diff --git a/.gbp.conf b/.gbp.conf
index 19b243b8a8cbbfe57d29e8c66df8151d28e0dc59..e68910f0289c7e881c3a81adae7f231fd60b0f41 100644 (file)
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -25,7 +25,7 @@ debian-branch = master
 # push to a remote repository after a successful tag: 
 posttag = git push --mirror
 # use this for more svn-buildpackage like behaviour:
 # push to a remote repository after a successful tag: 
 posttag = git push --mirror
 # use this for more svn-buildpackage like behaviour:

-export-dir = ../build-area/slim-altusmetrum/
+export-dir = ../build-area/altusmetrum-themes/

 #tarball-dir = ../tarballs/
 
 # Options only affecting git-import-orig
 #tarball-dir = ../tarballs/
 
 # Options only affecting git-import-orig

diff --git a/debian/altusmetrum-themes.install b/debian/altusmetrum-themes.install
new file mode 100644 (file)
index 0000000..1b3fa1c
--- /dev/null
+++ b/debian/altusmetrum-themes.install
@@ -0,0 +1,7 @@
+background.png         usr/share/slim/themes/altusmetrum
+slim/panel.png         usr/share/slim/themes/altusmetrum
+slim/slim.theme                usr/share/slim/themes/altusmetrum
+background.png         usr/share/gdm/themes/altusmetrum
+gdm/altusmetrum.xml    /usr/share/gdm/themes/altusmetrum
+gdm/GdmGreeterTheme.desktop    /usr/share/gdm/themes/altusmetrum
+gdm/screenshot.png     /usr/share/gdm/themes/altusmetrum

diff --git a/debian/changelog b/debian/changelog
index 0d0cc6af6de0564f6c4c3f64e7932c078bef9a33..b2f17eb9e5be230ba3453671dceb124fde5b0dd6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+altusmetrum-themes (0.4) unstable; urgency=low
+
+  * rename package, add gdm support in addition to slim
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 02 Feb 2010 21:36:02 -0700
+

 slim-altusmetrum (0.3) unstable; urgency=low
 
   * put a rocket photo in the background instead of just white
 slim-altusmetrum (0.3) unstable; urgency=low
 
   * put a rocket photo in the background instead of just white

diff --git a/debian/control b/debian/control
index 7e4a3479841bdc4ec44624c9e3fd9a0e9da28889..43b257dbe8250c1592c369159583b98b14a4c6b4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: slim-altusmetrum
+Source: altusmetrum-themes

 Section: x11
 Priority: extra
 Maintainer: Bdale Garbee <bdale@gag.com>
 Section: x11
 Priority: extra
 Maintainer: Bdale Garbee <bdale@gag.com>


@@ -6,9 +6,9 @@ Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.3
 Homepage: http://altusmetrum.org
 
 Standards-Version: 3.8.3
 Homepage: http://altusmetrum.org
 

-Package: slim-altusmetrum
+Package: altusmetrum-themes

 Architecture: all
 Depends: ${misc:Depends}
 Architecture: all
 Depends: ${misc:Depends}

-Recommends: slim
-Description: AltusMetrum theme for the slim login manager
- A simple AltusMetrum theme for the slim login manager.
+Recommends: slim | gdm
+Description: AltusMetrum theme for login managers
+ A simple AltusMetrum theme, with support for the gdm and slim login managers.

diff --git a/debian/copyright b/debian/copyright
index 35b61572c542940617416fcb0bd0cda9aacddd5d..c50bc7006496b51cedcc2c60fb50dac551e4dc94 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This work was created for Debian by:
 
 Copyright:
 
 
 Copyright:
 

-    Copyright 2009 by Bdale Garbee <bdale@gag.com>
+    Copyright 2009-2010 by Bdale Garbee <bdale@gag.com>

 
 License:
 
 
 License:
 

diff --git a/debian/dirs b/debian/dirs
index cdab5c95b95c460280e27a75f07aa1f2a106b9f5..de9ff4d862417d68b7411cd4f06eff03878f4ec9 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
+/usr/share/gdm/themes/altusmetrum

 /usr/share/slim/themes/altusmetrum
 /usr/share/slim/themes/altusmetrum

diff --git a/debian/slim-altusmetrum.install b/debian/slim-altusmetrum.install
deleted file mode 100644 (file)
index 5d10687..0000000
--- a/debian/slim-altusmetrum.install
+++ /dev/null
@@ -1,3 +0,0 @@
-background.png         usr/share/slim/themes/altusmetrum
-panel.png              usr/share/slim/themes/altusmetrum
-slim.theme             usr/share/slim/themes/altusmetrum

diff --git a/gdm/GdmGreeterTheme.desktop b/gdm/GdmGreeterTheme.desktop
new file mode 100644 (file)
index 0000000..b0fa34b
--- /dev/null
+++ b/gdm/GdmGreeterTheme.desktop
@@ -0,0 +1,7 @@
+[GdmGreeterTheme]
+Greeter=altusmetrum.xml
+Name=AltusMetrum
+Description=altusmetrum.org
+Author=Bdale Garbee
+Copyright=Bdale Garbee
+Screenshot=screenshot.png

diff --git a/gdm/altusmetrum.xml b/gdm/altusmetrum.xml
new file mode 100644 (file)
index 0000000..e2755e8
--- /dev/null
+++ b/gdm/altusmetrum.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+
+<item type="pixmap">
+       <normal file="background.png"/>
+       <pos x="0" y="0" width="100%" height="100%"/>
+</item>
+
+<item type="rect">
+       <normal color="#ffffff" alpha="0.1"/>
+       <pos anchor="center" x="50%" y="94%" width="100%" height="6%"/>
+       <fixed>
+               <item type="rect">
+                       <normal color="#000000" alpha="0.3"/>
+                       <pos anchor="w" x="84%" y="50%" height="24" width="15%"/>
+                       <fixed>
+                               <item type="entry" id="user-pw-entry">
+                                       <pos anchor="nw" x="1" y="1" height="-2" width="-2"/>
+                                       <normal color="#000000" font="Bitstream Vera Sans 10"/>
+                               </item>
+                       </fixed>
+               </item>
+       </fixed>
+</item>
+
+<item type="label" id="system_button" button="true">
+       <pos anchor="w" x="1%" y="94%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff" alpha="0.8"/>
+       <active font="Bitstream Vera Sans Bold 10" color="#ffffff" alpha="0.8"/>
+       <prelight font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <text>%n | %c</text>
+</item>
+
+<item type="label" id="pam-prompt">
+       <pos anchor="e" x="83%" y="94%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff" alpha="0.8"/>
+       <stock type="username-label"/>
+</item>
+
+<item type="label" id="timed-label">
+       <pos anchor="center" x="50%" y="30%"/>
+       <show type="timed"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <stock type="timed-label"/>
+</item>
+
+<item type="label" id="pam-error">
+       <pos anchor="center" x="50%" y="50%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <text></text>
+</item>
+
+<item type="label" id="caps-lock-warning">
+       <pos anchor="center" x="50%" y="70%"/>
+       <normal font="Bitstream Vera Sans Bold 10" color="#ffffff"/>
+       <stock type="caps-lock-warning"/>
+</item>
+
+</greeter>

diff --git a/gdm/screenshot.png b/gdm/screenshot.png
new file mode 100644 (file)
index 0000000..5c49ec1
Binary files /dev/null and b/gdm/screenshot.png differ

diff --git a/panel.png b/panel.png
deleted file mode 100644 (file)
index f61bafe..0000000
Binary files a/panel.png and /dev/null differ

diff --git a/slim.theme b/slim.theme
deleted file mode 100644 (file)
index 1eeef96..0000000
--- a/slim.theme
+++ /dev/null
@@ -1,37 +0,0 @@
-# altusmetrum theme for SLiM
-# by Bdale Garbee <bdale@gag.com>
-
-# Messages (ie: shutdown)
-msg_color               #000000
-msg_font                Verdana:size=18:bold:dpi=75
-msg_x                   50%
-msg_y                   40%
-msg_shadow_color #FFFFFF
-msg_shadow_xoffset 1
-msg_shadow_yoffset 1
-
-# valid values: stretch, tile
-background_style        stretch
-background_color        #eedddd
-
-# Input controls
-input_panel_x           50%
-input_panel_y           70%
-input_name_x            59
-input_name_y            161
-input_font             Verdana:size=12:dpi=75
-input_fgcolor           #000000
-
-# Username / password request
-username_font                  Verdana:size=14:bold:dpi=75
-username_color         #000000
-username_x              50%
-username_y              122
-password_x              50%
-password_y              122
-username_shadow_color   #FFFFFF
-username_shadow_xoffset 1
-username_shadow_yoffset 1
-
-username_msg            Username:
-password_msg            Password:

diff --git a/slim/panel.png b/slim/panel.png
new file mode 100644 (file)
index 0000000..f61bafe
Binary files /dev/null and b/slim/panel.png differ

diff --git a/slim/slim.theme b/slim/slim.theme
new file mode 100644 (file)
index 0000000..1eeef96
--- /dev/null
+++ b/slim/slim.theme
@@ -0,0 +1,37 @@
+# altusmetrum theme for SLiM
+# by Bdale Garbee <bdale@gag.com>
+
+# Messages (ie: shutdown)
+msg_color               #000000
+msg_font                Verdana:size=18:bold:dpi=75
+msg_x                   50%
+msg_y                   40%
+msg_shadow_color #FFFFFF
+msg_shadow_xoffset 1
+msg_shadow_yoffset 1
+
+# valid values: stretch, tile
+background_style        stretch
+background_color        #eedddd
+
+# Input controls
+input_panel_x           50%
+input_panel_y           70%
+input_name_x            59
+input_name_y            161
+input_font             Verdana:size=12:dpi=75
+input_fgcolor           #000000
+
+# Username / password request
+username_font                  Verdana:size=14:bold:dpi=75
+username_color         #000000
+username_x              50%
+username_y              122
+password_x              50%
+password_y              122
+username_shadow_color   #FFFFFF
+username_shadow_xoffset 1
+username_shadow_yoffset 1
+
+username_msg            Username:
+password_msg            Password: