[23056] in Source-Commits
/svn/athena r22719 - in trunk/debathena/config/gdm-config: . debathena debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Tue Jan 29 22:45:45 2008
Date: Tue, 29 Jan 2008 22:45:12 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801300345.WAA29733@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-01-29 22:45:12 -0500 (Tue, 29 Jan 2008)
New Revision: 22719
Added:
trunk/debathena/config/gdm-config/debathena/
trunk/debathena/config/gdm-config/debathena/GdmGreeterTheme.desktop
trunk/debathena/config/gdm-config/debathena/debathena-owl-100.png
trunk/debathena/config/gdm-config/debathena/debathena.xml
trunk/debathena/config/gdm-config/debathena/fuzzball-100.png
trunk/debathena/config/gdm-config/debathena/screenshot.png
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
trunk/debathena/config/gdm-config/debian/rules
Log:
Added: trunk/debathena/config/gdm-config/debathena/GdmGreeterTheme.desktop
Added: trunk/debathena/config/gdm-config/debathena/debathena-owl-100.png
Property changes on: trunk/debathena/config/gdm-config/debathena/debathena-owl-100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/debathena/config/gdm-config/debathena/debathena.xml
Added: trunk/debathena/config/gdm-config/debathena/fuzzball-100.png
Property changes on: trunk/debathena/config/gdm-config/debathena/fuzzball-100.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/debathena/config/gdm-config/debathena/screenshot.png
Property changes on: trunk/debathena/config/gdm-config/debathena/screenshot.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2008-01-30 03:38:30 UTC (rev 22718)
+++ trunk/debathena/config/gdm-config/debian/changelog 2008-01-30 03:45:12 UTC (rev 22719)
@@ -1,3 +1,11 @@
+debathena-gdm-config (1.1) unstable; urgency=low
+
+ * New version using graphical theme.
+ * Use gdm.conf-custom instead of gdm.conf when it exists in order to
+ support Ubuntu.
+
+ -- Tim Abbott <tabbott@mit.edu> Tue, 29 Jan 2008 22:40:35 -0500
+
debathena-gdm-config (1.0) unstable; urgency=low
* Initial release.
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install 2008-01-30 03:38:30 UTC (rev 22718)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install 2008-01-30 03:45:12 UTC (rev 22719)
@@ -1,2 +1,3 @@
-debian/gdm.conf.debathena etc/gdm
+debian/gdm.conf-custom.debathena etc/gdm
debian/debathena.png usr/share/pixmaps
+debathena /usr/share/gdm/themes/
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2008-01-30 03:38:30 UTC (rev 22718)
+++ trunk/debathena/config/gdm-config/debian/rules 2008-01-30 03:45:12 UTC (rev 22719)
@@ -1,21 +1,26 @@
#!/usr/bin/make -f
+ifneq ($(wildcard /etc/gdm/gdm.conf-custom),)
+ GDM_CONFFILE = /etc/gdm/gdm.conf-custom
+else
+ GDM_CONFFILE = /etc/gdm/gdm.conf
+endif
+
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
DEBATHENA_DIVERT_FILES_debathena-gdm-config += \
- /etc/gdm/gdm.conf.debathena
+ ${GDM_CONFFILE}.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/debathena-divert.mk
include /usr/share/cdbs/1/rules/debathena-check-conffiles.mk
-common-build-indep:: debian/gdm.conf.debathena
+DEB_DH_LINK_ARGS=/etc/gdm/gdm.conf-custom.debathena /etc/gdm/gdm.conf.debathena
-debian/gdm.conf.debathena: $(call debathena_check_conffiles,/etc/gdm/gdm.conf)
+common-build-indep:: debian/gdm.conf-custom.debathena
+
+debian/gdm.conf-custom.debathena: $(call debathena_check_conffiles,${GDM_CONFFILE})
perl -0pe ' \
s/(\[daemon\]\n)/\1UserAuthDir=\/tmp\n/ and \
- s/(\[daemon\]\n)/\1Greeter=\/usr\/lib\/gdm\/gdmlogin\n/ and \
- s/(\[greeter\]\n)/\1Logo=\/usr\/share\/pixmaps\/debathena.png\n/ and \
- s/(\[greeter\]\n)/\1DefaultWelcome=false\n/ and \
- s/(\[greeter\]\n)/\1Welcome=Welcome to Debian-Athena\n/ or die;' $< > $@
+ s/(\[greeter\]\n)/\1GraphicalTheme=debathena\n/ or die;' $< > $@
clean::
- rm -f debian/gdm.conf.debathena
+ rm -f debian/gdm.conf-custom.debathena
