[svn] r5111 - in trunk/tools/dconf: . config

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-01-25 20:37:27 +0100 (Thu, 25 Jan 2007)
New Revision: 5111

Added:
   trunk/tools/dconf/config/dconf.conf
Removed:
   trunk/tools/dconf/config/custom.conf
Modified:
   trunk/tools/dconf/Makefile
   trunk/tools/dconf/config/debian.conf
   trunk/tools/dconf/config/redhat.conf
   trunk/tools/dconf/config/suse.conf
   trunk/tools/dconf/dconf
Log:
Cleanup of config-files and Makefile changes.

Modified: trunk/tools/dconf/Makefile
===================================================================
--- trunk/tools/dconf/Makefile	2007-01-25 19:18:57 UTC (rev 5110)
+++ trunk/tools/dconf/Makefile	2007-01-25 19:37:27 UTC (rev 5111)
@@ -22,18 +22,18 @@
 	install -Dp -m0755 dconf $(DESTDIR)$(bindir)/dconf
 	install -dp -m0755 $(DESTDIR)$(logdir)
 
+	make install -C docs
+
 	@echo "Also do: make install-<dist>   (with dist: debian|redhat|suse)"
 
-	make install -C docs
-
 install-redhat: install
-	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.d/redhat.conf ] && install -Dp -m0644 config/redhat.conf $(DESTDIR)$(sysconfdir)/dconf.d/redhat.conf
+	install -Dp -m0644 config/redhat.conf $(DESTDIR)$(sysconfdir)/dconf.d/redhat.conf
 
 install-debian: install
-	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.d/debian.conf ] && install -Dp -m0644 config/debian.conf $(DESTDIR)$(sysconfdir)/dconf.d/debian.conf
+	install -Dp -m0644 config/debian.conf $(DESTDIR)$(sysconfdir)/dconf.d/debian.conf
 
 install-suse:
-	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.d/suse.conf ] && install -Dp -m0644 config/suse.conf $(DESTDIR)$(sysconfdir)/dconf.d/suse.conf
+	install -Dp -m0644 config/suse.conf $(DESTDIR)$(sysconfdir)/dconf.d/suse.conf
 
 docs:
 	make -C docs all

Deleted: trunk/tools/dconf/config/custom.conf
===================================================================
--- trunk/tools/dconf/config/custom.conf	2007-01-25 19:18:57 UTC (rev 5110)
+++ trunk/tools/dconf/config/custom.conf	2007-01-25 19:37:27 UTC (rev 5111)
@@ -1,15 +0,0 @@
-### Customized configuration
-###
-### Please send general improvements to this file to:
-###	Dag Wieers <dag at wieers.com>
-
-[main]
-cron = weekly
-#mailto = root at localhost
-#smtp-server = localhost
-
-[custom]
-files =	
-	/etc/rc.d/rc.custom
-	/etc/profile.d/custom.sh
-        /etc/sysconfig/network/if-*.d/custom

Copied: trunk/tools/dconf/config/dconf.conf (from rev 5110, trunk/tools/dconf/config/custom.conf)
===================================================================
--- trunk/tools/dconf/config/dconf.conf	                        (rev 0)
+++ trunk/tools/dconf/config/dconf.conf	2007-01-25 19:37:27 UTC (rev 5111)
@@ -0,0 +1,20 @@
+### Customized configuration
+###
+### Please send general improvements to this file to:
+###	Dag Wieers <dag at wieers.com>
+
+### Main configuration
+[main]
+confdir = /etc/dconf.d
+logdir = /var/log/dconf
+
+cron = weekly
+#mailto = root at localhost
+#smtp-server = localhost
+
+### Custom sections go into this document or in /etc/dconf.d/
+[custom]
+files =
+	/etc/rc.d/rc.custom
+	/etc/profile.d/custom.sh
+	/etc/sysconfig/network/if-*.d/custom

Modified: trunk/tools/dconf/config/debian.conf
===================================================================
--- trunk/tools/dconf/config/debian.conf	2007-01-25 19:18:57 UTC (rev 5110)
+++ trunk/tools/dconf/config/debian.conf	2007-01-25 19:37:27 UTC (rev 5111)
@@ -1,12 +1,8 @@
 ### Changes to this file may get lost when upgrading dconf
-### Customizations should go into /etc/dconf-custom.conf
+### Customizations should go into /etc/dconf.conf or /etc/dconf.d
 
 ### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
 ### Initial debian version: Leo Eraly <leo at kangaroot.net>
-### Main configuration
-[main]
-logdir = /var/log/dconf
-confdir = /etc/dconf.d
 
 ### System information
 [apm]

Modified: trunk/tools/dconf/config/redhat.conf
===================================================================
--- trunk/tools/dconf/config/redhat.conf	2007-01-25 19:18:57 UTC (rev 5110)
+++ trunk/tools/dconf/config/redhat.conf	2007-01-25 19:37:27 UTC (rev 5111)
@@ -1,13 +1,8 @@
 ### Changes to this file may get lost when upgrading dconf
-### Customizations should go into /etc/dconf-custom.conf
+### Customizations should go into /etc/dconf.conf or /etc/dconf.d
 
 ### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
 
-### Main configuration
-[main]
-logdir = /var/log/dconf
-confdir = /etc/dconf.d
-
 ### System information
 [acpi]
 files =
@@ -181,7 +176,7 @@
 	/proc/net/bonding/bond0
 
 [packages]
-cmds =	rpm -qa --nodigest --nosignature | sort
+cmds =	rpm -qa --nodigest --nosignature --qf '%{name}-%{version}-%{release}.%{arch}\n' | sort
 
 [pam]
 files =

Modified: trunk/tools/dconf/config/suse.conf
===================================================================
--- trunk/tools/dconf/config/suse.conf	2007-01-25 19:18:57 UTC (rev 5110)
+++ trunk/tools/dconf/config/suse.conf	2007-01-25 19:37:27 UTC (rev 5111)
@@ -1,13 +1,8 @@
 ### Changes to this file may get lost when upgrading dconf
-### Customizations should go into /etc/dconf-custom.conf
+### Customizations should go into /etc/dconf.conf or /etc/dconf.d
 
 ### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
 
-### Main configuration
-[main]
-logdir = /var/log/dconf
-confdir = /etc/dconf.d
-
 ### System information
 [apm]
 files =	/etc/sysconfig/apmd

Modified: trunk/tools/dconf/dconf
===================================================================
--- trunk/tools/dconf/dconf	2007-01-25 19:18:57 UTC (rev 5110)
+++ trunk/tools/dconf/dconf	2007-01-25 19:37:27 UTC (rev 5111)
@@ -90,6 +90,8 @@
 	def read(self, configfile):
 		self.cfg = ConfigParser.ConfigParser()
 
+		info(2, 'Reading config file %s' % (configfile))
+
 		(s,b,p,q,f,o) = urlparse.urlparse(configfile)
 		if s in ('http', 'ftp', 'file'):
 			configfh = urllib.urlopen(configfile)