From 8064dfccf3da168dc0e0d88d0e113b3c99020ce7 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sun, 7 Mar 2010 14:34:31 +0100
Subject: [PATCH] Move pcmanfm conf in correct place Remove useless cp in
 start*

---
 debian/changelog                           |  1 -
 etc/xdg/{lubuntu => }/pcmanfm/lubuntu.conf |  0
 usr/bin/startlubuntu                       | 12 ------------
 usr/bin/startlubuntu-netbook               | 12 ------------
 4 files changed, 25 deletions(-)
 rename etc/xdg/{lubuntu => }/pcmanfm/lubuntu.conf (100%)

diff --git a/debian/changelog b/debian/changelog
index 969e872..188575b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low
   * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0)
   * autostart: 
    - Use new pcmanfm --desktop command to start pcmanfm with desktop management
-   - Ensure configuration files for libfm and pcmanfm2.
   * Use pcmanfm2.desktop in lxpanel panel settings.
   * usr/bin/start* : 
    - Install a custom preferences file for Chromium.
diff --git a/etc/xdg/lubuntu/pcmanfm/lubuntu.conf b/etc/xdg/pcmanfm/lubuntu.conf
similarity index 100%
rename from etc/xdg/lubuntu/pcmanfm/lubuntu.conf
rename to etc/xdg/pcmanfm/lubuntu.conf
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index cf77377..b8473a4 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -29,18 +29,6 @@ if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then
     cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu"
 fi
 
-if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
-    mkdir -p "$PCMANFM_CONF_DIR"
-    cp /etc/xdg/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
-fi
-
-# Ensure the existance of pcmanfm config file
-LIBFM_CONF_DIR="$XDG_CONFIG_HOME/libfm"
-if [ ! -f "$LIBFM_CONF_DIR/libfm.conf" ]; then
-    mkdir -p "$LIBFM_CONF_DIR"
-    cp /etc/xdg/lubuntu/libfm/libfm.conf "$LIBFM_CONF_DIR/libfm.conf"
-fi
-
 # Ensure the existance of openbox config file
 OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
 if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then
diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook
index f1bf9c3..b3c48fb 100644
--- a/usr/bin/startlubuntu-netbook
+++ b/usr/bin/startlubuntu-netbook
@@ -29,18 +29,6 @@ if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then
     cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu"
 fi
 
-if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
-    mkdir -p "$PCMANFM_CONF_DIR"
-    cp /usr/share/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
-fi
-
-# Ensure the existance of pcmanfm config file
-LIBFM_CONF_DIR="$XDG_CONFIG_HOME/libfm"
-if [ ! -f "$LIBFM_CONF_DIR/libfm.conf" ]; then
-    mkdir -p "$LIBFM_CONF_DIR"
-    cp /etc/xdg/lubuntu/libfm/libfm.conf "$LIBFM_CONF_DIR/libfm.conf"
-fi
-
 # Ensure the existance of openbox config file
 OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
 if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then