[23197] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r22858 - trunk/debathena/config/gdm-config/debian

daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 19:33:06 2008

Date: Sun, 6 Apr 2008 19:32:27 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062332.TAA02960@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: tabbott
Date: 2008-04-06 19:32:26 -0400 (Sun, 06 Apr 2008)
New Revision: 22858

Modified:
   trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
   trunk/debathena/config/gdm-config/debian/rules
Log:
Fix broken build with last debathena-gdm-config checkin.


Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install	2008-04-06 23:00:12 UTC (rev 22857)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.install	2008-04-06 23:32:26 UTC (rev 22858)
@@ -1,3 +1,2 @@
-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-04-06 23:00:12 UTC (rev 22857)
+++ trunk/debathena/config/gdm-config/debian/rules	2008-04-06 23:32:26 UTC (rev 22858)
@@ -2,6 +2,7 @@
 
 ifneq ($(wildcard /etc/gdm/gdm.conf-custom),)
     GDM_CONFFILE = /etc/gdm/gdm.conf-custom
+    DEB_DH_LINK_ARGS=/etc/gdm/gdm.conf-custom.debathena /etc/gdm/gdm.conf.debathena
 else
     GDM_CONFFILE = /etc/gdm/gdm.conf
 endif
@@ -10,10 +11,7 @@
 DEB_DIVERT_EXTENSION = .debathena
 DEB_REPLACE_FILES_debathena-gdm-config += \
 	${GDM_CONFFILE}.debathena
-
 DEB_TRANSFORM_SCRIPT_${GDM_CONFFILE} = transform_gdm.conf.debathena
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/replace-files.mk
 
-DEB_DH_LINK_ARGS=/etc/gdm/gdm.conf-custom.debathena /etc/gdm/gdm.conf.debathena


home help back first fref pref prev next nref lref last post