[pkg-fso-commits] [SCM] openmoko-files-nonfree, various not DFSG-free files for the Openmoko devices branch, master, updated. debian/20080911-2-5-ga50e06e

[Luca Capello]

The following commit has been merged in the master branch:
commit d803a8a179f9d75ac79c4aee08f2a898a806947d
Author: Luca Capello <luca at pca.it>
Date:   Fri Oct 31 16:47:05 2008 +0100

    debian/fso-sounds-openmoko-nonfree.*: /usr/share/fso-sounds-rules

diff --git a/debian/changelog b/debian/changelog
index a5ac2f3..41faff9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openmoko-files-nonfree (20080911-4) UNRELEASED; urgency=low
+
+  * debian/fso-sounds-openmoko-nonfree.install:
+    + install the phone file in /usr/share/fso-sounds-rules.
+  * debian/fso-sounds-openmoko-nonfree.postinst:
+    + correct path for the installed phone file.
+  * debian/fso-sounds-openmoko-nonfree.prerm
+    + correct path for the installed phone file.
+
+ --
+
 openmoko-files-nonfree (20080911-3) pkg-fso; urgency=low
 
   * debian/control:
diff --git a/debian/fso-sounds-openmoko-nonfree.install b/debian/fso-sounds-openmoko-nonfree.install
index aa40762..e96b2d6 100644
--- a/debian/fso-sounds-openmoko-nonfree.install
+++ b/debian/fso-sounds-openmoko-nonfree.install
@@ -1,2 +1,2 @@
-debian/openmoko-nonfree.yaml /etc/freesmartphone/opreferences/conf/phone
+debian/openmoko-nonfree.yaml /usr/share/fso-sounds-rules
 debian/sounds/* /usr/share/sounds
diff --git a/debian/fso-sounds-openmoko-nonfree.postinst b/debian/fso-sounds-openmoko-nonfree.postinst
index c2ba76c..7f26259 100644
--- a/debian/fso-sounds-openmoko-nonfree.postinst
+++ b/debian/fso-sounds-openmoko-nonfree.postinst
@@ -8,6 +8,6 @@ if [ "$1" = "configure" ]; then
 	--install \
 	/etc/freesmartphone/opreferences/conf/phone/default.yaml \
 	fso-frameworkd-default-sounds.yaml \
-	/etc/freesmartphone/opreferences/conf/phone/openmoko-nonfree.yaml \
+	/usr/share/fso-sounds-rules/openmoko-nonfree.yaml \
 	20
 fi
diff --git a/debian/fso-sounds-openmoko-nonfree.prerm b/debian/fso-sounds-openmoko-nonfree.prerm
index da77dec..22f70a2 100644
--- a/debian/fso-sounds-openmoko-nonfree.prerm
+++ b/debian/fso-sounds-openmoko-nonfree.prerm
@@ -7,5 +7,5 @@ if [ "$1" = "remove" ]; then
     update-alternatives \
 	--remove \
 	fso-frameworkd-default-sounds.yaml \
-	/etc/freesmartphone/opreferences/conf/phone/openmoko-nonfree.yaml
+	/usr/share/fso-sounds-rules/openmoko-nonfree.yaml
 fi

-- 
openmoko-files-nonfree, various not DFSG-free files for the Openmoko devices