[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.8.4.9-20090130-3-5-g639e0eb

[Luca Capello]

The following commit has been merged in the debian branch:
commit 639e0eb7fc99be2dcba8c6f9f2decacd4ce8664d
Author: Luca Capello <luca at pca.it>
Date:   Fri May 15 23:20:04 2009 +0200

    debian/*: use freesmartphone.org instead of the FSO acronym

diff --git a/debian/README.Debian b/debian/README.Debian
index 802a62d..98ae19a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,14 +1,14 @@
 fso-frameworkd for Debian
 -------------------------
 
-Debian ships a device-agnostic FSO frameworkd.  For this reason,
-fso-frameworkd alone will not even start, because it is missing the
-configuration files.
-
-Strictly speaking, to start, FSO frameworkd needs only the main
-configuration file, namely /etc/frameworkd.conf (of which an example
-is in /usr/share/doc/fso-frameworkd/examples/frameworkd.conf).
-However, to fully use FSO-frameworkd, please install the appropriate
+Debian ships a device-agnostic freesmartphone.org frameworkd.  For
+this reason, fso-frameworkd alone will not even start, because it is
+missing the configuration files.
+
+Strictly speaking, to start, freesmartphone.org frameworkd needs only
+the main configuration file, namely /etc/frameworkd.conf (of which an
+example is in /usr/share/doc/fso-frameworkd/examples/frameworkd.conf).
+However, to fully use fso-frameworkd, please install the appropriate
 fso-config-* and fso-sounds-* packages.
 
 
@@ -33,14 +33,14 @@ be placed in /usr/share/sounds.  Each package shipping these two
 sounds must provide the virtual package fso-sounds and its name must
 be in the form fso-sounds-$ORIGIN.
 
-The default upstream FSO frameworkd profile lists these sounds in
-/etc/freesmartphone/opreferences/conf/phone/default.yaml.  However, to
-allow an easier customization, each fso-sounds-* package should
-provide a phone file named after the $ORIGIN part of the package name,
-to be installed into /usr/share/fso-sounds-rules.  This file should
-then be registered as an alternative for the upstream default file
-through update-alternatives.  The fso-sounds-none package can be used
-as an example.
+The default upstream freesmartphone.org frameworkd profile lists these
+sounds in /etc/freesmartphone/opreferences/conf/phone/default.yaml.
+However, to allow an easier customization, each fso-sounds-* package
+should provide a phone file named after the $ORIGIN part of the
+package name, to be installed into /usr/share/fso-sounds-rules.  This
+file should then be registered as an alternative for the upstream
+default file through update-alternatives.  The fso-sounds-none package
+can be used as an example.
 
 If you want to know a list of all availables fso-sounds-* package,
 please use `apt-cache showpkg fso-sounds`, section "Reverse Provides".
@@ -77,4 +77,4 @@ Please follow these commands:
 Check the update-alternatives manpage for further information about
 how to manage the different alternatives.
 
- -- Luca Capello <luca at pca.it>, Mon,  3 Nov 2008 23:57:36 +0100
+ -- Luca Capello <luca at pca.it>, Fri, 15 May 2009 23:16:05 +0200
diff --git a/debian/changelog b/debian/changelog
index f52d723..cd3b918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ fso-frameworkd (0.8.4.9-20090130-4) UNRELEASED; urgency=low
       fso-config-general binary package.
     + correct typos in Description:.
     + fix capitalization for freesmartphone.org.
+    + use freesmartphone.org instead of the FSO acronym.
   * debian/fso-sounds-none.README.Debian:
     + suggest fso-frameworkd documentation to use the ringtones.
+  * debian/patches/06_persist-in-var-lib.patch:
+    + use freesmartphone.org instead of the FSO acronym.
+  * debian/README.Debian:
+    + use freesmartphone.org instead of the FSO acronym.
 
  --
 
diff --git a/debian/control b/debian/control
index 9033013..27d5391 100644
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, fso-frameworkd (>= 0.2.0-git2008090
 Conflicts: fso-config, fso-frameworkd (<< 0.2.0-git20080909-7)
 Replaces: fso-config
 Provides: fso-config
-Description: general configuration files for FSO frameworkd
- This packages provides the FSO frameworkd configuration file.  It
- also depends on the default fso-sounds package.
+Description: general configuration files for the freesmartphone.org frameworkd
+ This packages provides the freesmartphone.org frameworkd configuration
+ files.  It also depends on the default fso-sounds package.
  .
  This package is part of the freesmartphone.org software stack and is targeted
  for smartphones.
diff --git a/debian/patches/06_persist-in-var-lib.patch b/debian/patches/06_persist-in-var-lib.patch
index 9bffe51..67c7db2 100644
--- a/debian/patches/06_persist-in-var-lib.patch
+++ b/debian/patches/06_persist-in-var-lib.patch
@@ -1,4 +1,4 @@
-As a proper FSO distro, we want persistent data in /var/lib/
+As a proper freesmartphone.org distro, we want persistent data in /var/lib/
 Index: frameworkd/framework/persist.py
 ===================================================================
 --- frameworkd.orig/framework/persist.py	2009-02-02 20:10:50.000000000 +0100

-- 
FSO frameworkd Debian packaging