[23202] in Source-Commits
/svn/athena r22863 - trunk/debathena/config/gconf2-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 20:25:11 2008
Date: Sun, 6 Apr 2008 20:24:57 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070024.UAA03544@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 20:24:57 -0400 (Sun, 06 Apr 2008)
New Revision: 22863
Modified:
trunk/debathena/config/gconf2-config/debian/changelog
trunk/debathena/config/gconf2-config/debian/control.in
trunk/debathena/config/gconf2-config/debian/rules
Log:
Modified: trunk/debathena/config/gconf2-config/debian/changelog
===================================================================
--- trunk/debathena/config/gconf2-config/debian/changelog 2008-04-07 00:20:36 UTC (rev 22862)
+++ trunk/debathena/config/gconf2-config/debian/changelog 2008-04-07 00:24:57 UTC (rev 22863)
@@ -1,3 +1,10 @@
+debathena-gconf2-config (1.1) unstable; urgency=low
+
+ * Changed rules and control files to use new config-package-dev interface.
+ Extracted some transform code to transform_path.debathena
+
+ -- Michael Y McCanna <acrefoot@mit.edu> Sun, 6 Apr 2008 18:04:17 -0400
+
debathena-gconf2-config (1.0) unstable; urgency=low
* Initial release.
Modified: trunk/debathena/config/gconf2-config/debian/control.in
===================================================================
--- trunk/debathena/config/gconf2-config/debian/control.in 2008-04-07 00:20:36 UTC (rev 22862)
+++ trunk/debathena/config/gconf2-config/debian/control.in 2008-04-07 00:24:57 UTC (rev 22863)
@@ -8,6 +8,8 @@
Package: debathena-gconf2-config
Architecture: all
Depends: gconf2, debathena-pam-config
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: gconf configuration for Debian-Athena
This package configures gconf2 to use ~/.gconf.debathena-DIST rather than
~/.gconf if your homedirectory is in AFS. In order to do the dynamic
Modified: trunk/debathena/config/gconf2-config/debian/rules
===================================================================
--- trunk/debathena/config/gconf2-config/debian/rules 2008-04-07 00:20:36 UTC (rev 22862)
+++ trunk/debathena/config/gconf2-config/debian/rules 2008-04-07 00:24:57 UTC (rev 22863)
@@ -1,25 +1,22 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-gconf2-config += \
- /etc/gconf/2/path.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
-
-GCONF_FILES = debian/gconf.afs debian/gconf.local debian/gconf.
-
-common-build-indep:: debian/path.debathena $(GCONF_FILES)
-
+DEB_DIVERT_EXTENSION = .debathena
ifneq ($(wildcard /usr/share/gconf/default.path),)
GCONF2_PATH = /usr/share/gconf/default.path
+ DEB_CHECK_FILES_SOURCE_/etc/gconf/2/path = $(GCONF2_PATH)
else
- GCONF2_PATH = $(call debathena_check_conffiles,/etc/gconf/2/path)
+ GCONF2_PATH = /etc/gconf/2/path
endif
+DEB_REPLACE_FILES_debathena-gconf2-config += \
+ /etc/gconf/2/path.debathena
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/replace_files.mk
-debian/path.debathena: $(GCONF2_PATH)
- perl -0pe 's/^(xml:readwrite:\$$\(HOME\)\/\.gconf)$$/include "\/usr\/share\/debathena-gconf2-config\/gconf.\$$(ENV_DEBATHENA_HOME_TYPE)"/m or die;' $< > $@
+GCONF_FILES = debian/gconf.afs debian/gconf.local debian/gconf.
+common-build-indep:: $(GCONF_FILES)
+
DISTRO = $(shell lsb_release --short --id)
SUFFIX = $(SUFFIX-$(DISTRO))
SUFFIX-Debian = -debathena
@@ -39,4 +36,4 @@
ln -sf gconf.local $@
clean::
- rm -f debian/path.debathena $(GCONF_FILES)
+ rm -f $(GCONF_FILES)
