[23189] in Source-Commits
/svn/athena r22850 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 18:41:54 2008
Date: Sun, 6 Apr 2008 18:41:40 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062241.SAA01389@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 18:41:40 -0400 (Sun, 06 Apr 2008)
New Revision: 22850
Added:
trunk/debathena/config/gdm-config/debian/transform_gdm.conf.debathena
Modified:
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/control
trunk/debathena/config/gdm-config/debian/control.in
trunk/debathena/config/gdm-config/debian/rules
Log:
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2008-04-06 22:37:00 UTC (rev 22849)
+++ trunk/debathena/config/gdm-config/debian/changelog 2008-04-06 22:41:40 UTC (rev 22850)
@@ -1,3 +1,9 @@
+debathena-gdm-config (1.2) unstable; urgency=low
+
+ * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 18:25:01 -0400
+
debathena-gdm-config (1.1) unstable; urgency=low
* New version using graphical theme.
Modified: trunk/debathena/config/gdm-config/debian/control
===================================================================
--- trunk/debathena/config/gdm-config/debian/control 2008-04-06 22:37:00 UTC (rev 22849)
+++ trunk/debathena/config/gdm-config/debian/control 2008-04-06 22:41:40 UTC (rev 22850)
@@ -2,12 +2,14 @@
Section: debathena-config/gnome
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common, debathena-config-build-common (>= 3.5~), gdm
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, gdm
Standards-Version: 3.7.2
Package: debathena-gdm-config
Architecture: all
Depends: gdm, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: GDM configuration for Debian-Athena
This packages configures gdm to use the Debathena logo, store
xauthority files in /tmp, and welcome the user to Debian-Athena.
Modified: trunk/debathena/config/gdm-config/debian/control.in
===================================================================
--- trunk/debathena/config/gdm-config/debian/control.in 2008-04-06 22:37:00 UTC (rev 22849)
+++ trunk/debathena/config/gdm-config/debian/control.in 2008-04-06 22:41:40 UTC (rev 22850)
@@ -8,6 +8,8 @@
Package: debathena-gdm-config
Architecture: all
Depends: gdm, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: GDM configuration for Debian-Athena
This packages configures gdm to use the Debathena logo, store
xauthority files in /tmp, and welcome the user to Debian-Athena.
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2008-04-06 22:37:00 UTC (rev 22849)
+++ trunk/debathena/config/gdm-config/debian/rules 2008-04-06 22:41:40 UTC (rev 22850)
@@ -7,20 +7,13 @@
endif
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-gdm-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_REPLACE_FILES_debathena-gdm-config += \
${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
-DEB_DH_LINK_ARGS=/etc/gdm/gdm.conf-custom.debathena /etc/gdm/gdm.conf.debathena
+DEB_TRANSFORM_SCRIPT_${GDM_CONFFILE} = transform_gdm.conf.debathena
-common-build-indep:: debian/gdm.conf-custom.debathena
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
-debian/gdm.conf-custom.debathena: $(call debathena_check_conffiles,${GDM_CONFFILE})
- perl -0pe ' \
- s/(\[daemon\]\n)/\1UserAuthDir=\/tmp\n/ and \
- s/(\[greeter\]\n)/\1GraphicalTheme=debathena\n/ or die;' $< > $@
-
-clean::
- rm -f debian/gdm.conf-custom.debathena
+DEB_DH_LINK_ARGS=/etc/gdm/gdm.conf-custom.debathena /etc/gdm/gdm.conf.debathena
Added: trunk/debathena/config/gdm-config/debian/transform_gdm.conf.debathena
