[24433] in Source-Commits
/svn/athena r24024 - in trunk/debathena/config: gdm-config/debian gdm-config/debian/PostSession gdm-config/debian/PreSession reactivate/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Sep 28 15:26:01 2009
Date: Mon, 28 Sep 2009 15:25:46 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200909281925.n8SJPkKA008096@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-09-28 15:25:46 -0400 (Mon, 28 Sep 2009)
New Revision: 24024
Modified:
trunk/debathena/config/gdm-config/debian/PostSession/Default.debathena
trunk/debathena/config/gdm-config/debian/PreSession/Default.debathena
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs
trunk/debathena/config/gdm-config/debian/rules
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/debathena-reactivate.install
Log:
Use /usr/share/debathena-gdm-config/{Pre,Post}Session.d instead of
/etc/gdm, to avoid potential conflicts with upstream.
Modified: trunk/debathena/config/gdm-config/debian/PostSession/Default.debathena
===================================================================
--- trunk/debathena/config/gdm-config/debian/PostSession/Default.debathena 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/gdm-config/debian/PostSession/Default.debathena 2009-09-28 19:25:46 UTC (rev 24024)
@@ -6,7 +6,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-for i in `run-parts --list /etc/gdm/PostSession.d`; do . "$i"; done
+for i in `run-parts --list /usr/share/debathena-gdm-config/PostSession.d`; do . "$i"; done
# Chain over to the native post-session default script.
exec /etc/gdm/PostSession/Default.debathena-orig
Modified: trunk/debathena/config/gdm-config/debian/PreSession/Default.debathena
===================================================================
--- trunk/debathena/config/gdm-config/debian/PreSession/Default.debathena 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/gdm-config/debian/PreSession/Default.debathena 2009-09-28 19:25:46 UTC (rev 24024)
@@ -5,7 +5,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-for i in `run-parts --list /etc/gdm/PreSession.d`; do . "$i"; done
+for i in `run-parts --list /usr/share/debathena-gdm-config/PreSession.d`; do . "$i"; done
# Chain over to the native pre-session default script.
exec /etc/gdm/PreSession/Default.debathena-orig
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/gdm-config/debian/changelog 2009-09-28 19:25:46 UTC (rev 24024)
@@ -1,7 +1,7 @@
debathena-gdm-config (1.14) unstable; urgency=low
- * Provide /etc/gdm/{Pre,Post}Session.d directories so that multiple
- packages can insert scripts.
+ * Provide /usr/share/debathena-gdm-config/{Pre,Post}Session.d
+ directories so that multiple packages can insert scripts.
-- Evan Broder <broder@mit.edu> Sat, 26 Sep 2009 23:00:49 -0400
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.dirs 2009-09-28 19:25:46 UTC (rev 24024)
@@ -1,4 +1,4 @@
etc/gdm
usr/share/pixmaps
-etc/gdm/PreSession.d
-etc/gdm/PostSession.d
+usr/share/debathena-gdm-config/PreSession.d
+usr/share/debathena-gdm-config/PostSession.d
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/gdm-config/debian/rules 2009-09-28 19:25:46 UTC (rev 24024)
@@ -12,8 +12,8 @@
${GDM_CONFFILE}
DEB_TRANSFORM_SCRIPT_${GDM_CONFFILE} = debian/transform_gdm.conf.debathena
DEB_DIVERT_FILES_debathena-gdm-config += \
- /etc/gdm/PreSession.d/Default.debathena \
- /etc/gdm/PostSession.d/Default.debathena \
+ /etc/gdm/PreSession/Default.debathena \
+ /etc/gdm/PostSession/Default.debathena \
/usr/share/gdm/BuiltInSessions/default.desktop.debathena
DEB_REMOVE_FILES_debathena-gdm-config += \
/usr/share/xsessions/ssh.desktop
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/reactivate/debian/changelog 2009-09-28 19:25:46 UTC (rev 24024)
@@ -1,6 +1,7 @@
debathena-reactivate (1.22) unstable; urgency=low
- * Use the new /etc/gdm/{Pre,Post}Session.d directories in gdm-config.
+ * Use the new /usr/share/debathena-gdm-config/{Pre,Post}Session.d
+ directories in gdm-config.
-- Evan Broder <broder@mit.edu> Mon, 28 Sep 2009 14:44:49 -0400
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.install
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2009-09-28 18:49:29 UTC (rev 24023)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.install 2009-09-28 19:25:46 UTC (rev 24024)
@@ -1,7 +1,7 @@
debian/athena-login-snapshot usr/sbin
debian/Xsession.debathena etc/gdm
-debian/99debathena-reactivate-setup etc/gdm/PreSession.d
-debian/01debathena-reactivate-cleanup etc/gdm/PostSession.d
+debian/99debathena-reactivate-setup usr/share/debathena-gdm-config/PreSession.d
+debian/01debathena-reactivate-cleanup usr/share/debathena-gdm-config/PostSession.d
debian/updatedb.findutils.cron.local etc
debian/policy-rc.d usr/sbin
debian/sudo-warning etc/athena
