committing changes in /etc made by "apt-get purge --yes gconf2-common"

Package changes:
-gconf2-common 3.2.6-7ubuntu2 all
-libgconf-2-4 3.2.6-7ubuntu2 amd64

diff --git a/.etckeeper b/.etckeeper
index 626b6941428f198fb899a17d19f73572de580528..f8c6484fd1872bc38540830267a5c3926073cd69 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -167,7 +167,6 @@ maybe chmod 0644 'X11/Xsession.d/55numlockx'
 maybe chmod 0644 'X11/Xsession.d/60x11-common_localhost'
 maybe chmod 0644 'X11/Xsession.d/60x11-common_xdg_path'
 maybe chmod 0644 'X11/Xsession.d/65compiz_profile-on-session'
-maybe chmod 0644 'X11/Xsession.d/70gconfd_path-on-session'
 maybe chmod 0644 'X11/Xsession.d/70im-config_launch'
 maybe chmod 0644 'X11/Xsession.d/75dbus_dbus-launch'
 maybe chmod 0644 'X11/Xsession.d/80xapp-gtk3-module'
@@ -1873,14 +1872,6 @@ maybe chmod 0600 'gadmin-samba/gadmin_samba_users'
 maybe chmod 0644 'gadmin-samba/settings.conf'
 maybe chmod 0644 'gai.conf'
 maybe chmod 0644 'gamemode.ini'
-maybe chmod 0755 'gconf'
-maybe chmod 0755 'gconf/2'
-maybe chmod 0644 'gconf/2/evoldap.conf'
-maybe chmod 0644 'gconf/2/path'
-maybe chmod 0755 'gconf/gconf.xml.defaults'
-maybe chmod 0644 'gconf/gconf.xml.defaults/%gconf-tree.xml'
-maybe chmod 0755 'gconf/gconf.xml.mandatory'
-maybe chmod 0644 'gconf/gconf.xml.mandatory/%gconf-tree.xml'
 maybe chmod 0755 'gdb'
 maybe chmod 0644 'gdb/gdbinit'
 maybe chmod 0755 'gdb/gdbinit.d'

diff --git a/X11/Xsession.d/70gconfd_path-on-session b/X11/Xsession.d/70gconfd_path-on-session
deleted file mode 100644 (file)
index d950bd8..0000000
--- a/X11/Xsession.d/70gconfd_path-on-session
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-# Add additional gconf path depending on selected desktop session
-
-GCONF_PREFIX="/usr/share/gconf"
-if [ -n "$DESKTOP_SESSION" ]; then
-  export MANDATORY_PATH="${GCONF_PREFIX}/${DESKTOP_SESSION}.mandatory.path"
-  export DEFAULTS_PATH="${GCONF_PREFIX}/${DESKTOP_SESSION}.default.path"
-fi
-

diff --git a/gconf/2/evoldap.conf b/gconf/2/evoldap.conf
deleted file mode 100644 (file)
index 41b2950..0000000
--- a/gconf/2/evoldap.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-<evoldap>
-  <server>
-    <host></host> <!-- e.g. ldap.blaa.com -->
-    <port></port> <!-- defaults to 389 -->
-    <base_dn></base_dn> <!-- e.g. ou=people,dc=blaa,dc=com -->
-  </server>
-
-  <!--
-     The values of the following keys:
-       - /apps/evolution/mail/accounts
-       - /apps/evolution/addressbook/sources
-       - /apps/evolution/calendar/sources
-       - /apps/evolution/tasks/sources
-     will be constructed by applying each LDAP entry which matches
-     the "filter" attribute on the <template> tag to the template
-     template corresponding to the key.
-
-     If the filter returns multiple values, the value of the GConf
-     key will be a multiple element list.
-
-     Valid variables:
-       1) $(USER) - the username
-       2) $(EVOLUTION_UID) - mystical magical per-account UID string
-       3) $(LDAP_ATTR_foo) - the value of the "foo" attribute on the
-                             LDAP entry which matches the filter
-    -->
-
-  <template filter="(&amp;(uid=$(USER))(objectClass=inetOrgPerson)(objectClass=evolutionMailAccount)(objectClass=evolutionAddressbookSource)(objectClass=evolutionCalendarSource)(objectClass=evolutionTasksSource))">
-
-    <!-- /apps/evolution/mail/accounts -->
-    <account_template>
-      <account name="$(LDAP_ATTR_mail)" uid="$(EVOLUTION_UID)" enabled="true">
-        <identity>
-          <name>$(LDAP_ATTR_cn)</name>
-          <addr-spec>$(LDAP_ATTR_mail)</addr-spec>
-          <reply-to></reply-to>
-          <organization></organization>
-          <signature uid=""/>
-        </identity>
-        <source save-passwd="false" keep-on-server="false" auto-check="false" auto-check-timeout="10">
-          <url>$(LDAP_ATTR_evolutionMailSourceURI)</url>
-        </source>
-        <transport save-passwd="false">
-          <url>$(LDAP_ATTR_evolutionMailTransportURI)</url>
-        </transport>
-        <drafts-folder></drafts-folder>
-        <sent-folder></sent-folder>
-        <auto-cc always="false">
-          <recipients></recipients>
-        </auto-cc>
-        <auto-bcc always="false">
-          <recipients></recipients>
-        </auto-bcc>
-        <pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false">
-          <key-id></key-id>
-        </pgp>
-        <smime sign-default="false" encrypt-default="false" encrypt-to-self="false">
-          <sign-key-id></sign-key-id>
-          <encrypt-key-id></encrypt-key-id>
-        </smime>
-      </account>
-    </account_template>
-
-    <!-- /apps/evolution/addressbook/sources -->
-    <addressbook_template>
-      <group uid="$(EVOLUTION_UID)" name="Addressbook" base_uri="" readonly="no">
-        <source uid="$(EVOLUTION_UID)" name="Addressbook" relative_uri="" uri="$(LDAP_ATTR_evolutionAddressbookURI)"/>
-      </group>
-    </addressbook_template>
-
-    <!-- /apps/evolution/calendar/sources -->
-    <calendar_template> 
-      <group uid="$(EVOLUTION_UID)" name="Calendar" base_uri="" readonly="no">
-        <source uid="$(EVOLUTION_UID)" name="Calendar" relative_uri="" uri="$(LDAP_ATTR_evolutionCalendarURI)"/>
-      </group>p
-    </calendar_template>
-
-   <!-- /apps/evolution/tasks/sources -->
-   <tasks_template>
-      <group uid="$(EVOLUTION_UID)" name="Tasks" base_uri="" readonly="no">
-        <source uid="$(EVOLUTION_UID)" name="Tasks" relative_uri="" uri="$(LDAP_ATTR_evolutionTasksURI)"/>
-      </group>
-    </tasks_template>
-
-  </template>
-
-</evoldap>

diff --git a/gconf/2/path b/gconf/2/path
deleted file mode 100644 (file)
index dba39bd..0000000
--- a/gconf/2/path
+++ /dev/null
@@ -1,55 +0,0 @@
-######################
-# 1. Forced settings #
-######################
-
-# Settings forced by the local administrator
-xml:readonly:/etc/gconf/gconf.xml.mandatory
-
-# Other forced sources imagined by the local administrator
-include /etc/gconf/2/local-mandatory.path
-
-# Settings forced by Debian packages
-xml:readonly:/var/lib/gconf/debian.mandatory
-
-
-#######################
-# 2. User Preferences #
-#######################
-
-# mandatory path for sabayon
-include "$(HOME)/.gconf.path.mandatory"
-
-# mandatory path for desktop-profiles
-include $(ENV_MANDATORY_PATH)
-
-# Other sources imagined by the user
-include "$(HOME)/.gconf.path"
-
-# The default storage location, ~/.gconf
-# This should be the only readwrite source
-xml:readwrite:$(HOME)/.gconf
-
-# default path for sabayon
-include "$(HOME)/.gconf.path.defaults"
-
-# default path for desktop-profiles
-include $(ENV_DEFAULTS_PATH)
-
-
-######################
-# 3. System defaults #
-######################
-
-# Other default sources imagined by the local administrator
-include /etc/gconf/2/local-defaults.path
-
-# System administrator's defaults. This source also serves as a legacy
-# source for packages not using a recent dh_gconf, or for applications
-# installed by hand.
-xml:readonly:/etc/gconf/gconf.xml.defaults
-
-# Debian branding, including CDD or packaged branding
-xml:readonly:/var/lib/gconf/debian.defaults
-
-# Upstream application defaults
-xml:readonly:/var/lib/gconf/defaults

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/gconf/gconf.xml.mandatory/%gconf-tree.xml b/gconf/gconf.xml.mandatory/%gconf-tree.xml
deleted file mode 100644 (file)
index e69de29..0000000