[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, gismo-debian-split-config, updated. debian/0.2.0-git20080909-6-13-g50d82ae

[Luca Capello]

The following commit has been merged in the gismo-debian-split-config branch:
commit 50d82ae77677ee4abb38635b52adfaebb599cc97
Author: Luca Capello <luca at pca.it>
Date:   Wed Oct 29 02:05:04 2008 +0100

    do not install YAML config files, now provided by fso-config

diff --git a/debian/changelog b/debian/changelog
index 426e16d..dcf787c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,9 +19,9 @@ fso-frameworkd (0.2.0-git20080909-7) UNRELEASED; urgency=low
     - do not install the sound files, they are now provided by the
       fso-sounds virtual package.
   * debian/fso-frameworkd.preinst:
-    + backup the old /etc/frameworkd.conf and udev rules files if
-      they have been modified, since they are now provided by the
-      fso-config virtual package.
+    + backup the old configuration rules files if they have been
+      modified, since they are now provided by the fso-config
+      virtual package.
   * debian/NEWS: new file.
   * debian/README.Debian:
     + explain the need for /etc/frameworkd.conf.
diff --git a/debian/fso-frameworkd.install b/debian/fso-frameworkd.install
index 85b8a20..e086de5 100644
--- a/debian/fso-frameworkd.install
+++ b/debian/fso-frameworkd.install
@@ -1,5 +1,6 @@
 usr/share/doc/fso-frameworkd/examples
 usr/bin
 usr/lib
-etc
+etc/dbus-1
+etc/freesmartphone/opreferences/schema
 conf/example/frameworkd.conf /usr/share/doc/fso-frameworkd/examples
diff --git a/debian/fso-frameworkd.preinst b/debian/fso-frameworkd.preinst
index 57765ed..7bc9862 100644
--- a/debian/fso-frameworkd.preinst
+++ b/debian/fso-frameworkd.preinst
@@ -22,12 +22,18 @@ rm_conffile() {
 }
 case "$1" in
     install|upgrade)
-	if dpkg --compare-versions "$2" le "0.2.0-git20080909-6"; then
-            rm_conffile fso-frameworkd "/etc/frameworkd.conf"
-            rm_conffile fso-frameworkd "/etc/udev/rules.d/55-freerunner.rules"
-	fi
-	;;
+        if dpkg --compare-versions "$2" le "0.2.0-git20080909-6"; then
+            for I in /etc/frameworkd.conf \
+                     /etc/freesmartphone/oevents/rules.yaml \
+                     /etc/freesmartphone/opreferences/conf/phone/default.yaml \
+                     /etc/freesmartphone/opreferences/conf/phone/silent.yaml \
+                     /etc/freesmartphone/opreferences/conf/profiles/default.yaml \
+                     /etc/udev/rules.d/55-freerunner.rules; do
+                rm_conffile fso-frameworkd "$I"
+            done
+        fi
+        ;;
     *)
-	;;
+        ;;
 esac
 ### end of http://wiki.debian.org/DpkgConffileHandling ###

-- 
FSO frameworkd Debian packaging