[27029] in Source-Commits
/svn/athena r25904 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Apr 9 15:13:12 2013
Date: Tue, 9 Apr 2013 15:13:05 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304091913.r39JD5fx010248@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-09 15:13:05 -0400 (Tue, 09 Apr 2013)
New Revision: 25904
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/rules
Log:
In gdm-config:
* Undivert gdm2 diversions on upgrade to new-gdm (Trac: #1059)
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2013-04-09 18:08:48 UTC (rev 25903)
+++ trunk/debathena/config/gdm-config/debian/changelog 2013-04-09 19:13:05 UTC (rev 25904)
@@ -1,10 +1,11 @@
-debathena-gdm-config (1.40) UNRELEASED; urgency=low
+debathena-gdm-config (1.40) unstable; urgency=low
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ * Undivert gdm2 diversions on upgrade to new-gdm (Trac: #1059)
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:38:36 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 09 Apr 2013 15:12:43 -0400
debathena-gdm-config (1.39) unstable; urgency=low
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2013-04-09 18:08:48 UTC (rev 25903)
+++ trunk/debathena/config/gdm-config/debian/rules 2013-04-09 19:13:05 UTC (rev 25904)
@@ -30,6 +30,10 @@
${GDM_CONFFILE}
DEB_DIVERT_FILES_debathena-gdm-config += \
/usr/share/gdm/BuiltInSessions/default.desktop.debathena
+else
+ DEB_UNDIVERT_FILES_debathena-gdm-config += \
+ /usr/share/gdm/BuiltInSessions/default.desktop.debathena \
+ ${GDM_CONFFILE}
endif
include /usr/share/cdbs/1/rules/debhelper.mk
