[debian-edu-commits] debian-edu/ 05/183: Added support using ROX with profiles

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit 3e3dc1c65ebcc81948d397ae9648e134a1e29895
Author: Bart Cornelis <cobaco at linux.be>
Date:   Thu Oct 14 16:27:00 2004 +0000

    Added support using ROX with profiles
---
 20activateDesktopProfiles |  9 +++++++++
 README                    |  5 +++++
 debian/control            |  9 ++++-----
 default.listing           | 14 ++++++++++----
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/20activateDesktopProfiles b/20activateDesktopProfiles
index 664104f..ac39008 100644
--- a/20activateDesktopProfiles
+++ b/20activateDesktopProfiles
@@ -163,3 +163,12 @@ if (test "$XDG_DATA_DIRS"x != x) &&
    (test "$XDG_DATA_DIRS" != "`cat $PROFILE_DIR/default.listing | grep "^default-xdg_data_dirs" | cut --fields 2 --delimiter ";"`"); then
   export XDG_DATA_DIRS;
 fi;
+
+CHOICESPATH==`getProfiles ROX | sed -e "s/^ *//" -e "s/ *$//" -e "s/ /:/g"`
+if (test "$CHOICESPATH"x != x) &&
+   (test "$CHOICESPATH" != "`cat $CHOICESPATH/default.listing | grep "^default-choicespath" | cut --fields 2 --delimiter ";"`"); then
+  # Rox doesn't have a seperate variable for the user settings, they need to be added here
+  # -> add default location for ROX user settings 
+  CHOICESPATH=${HOME}/Choices:$CHOICESPATH
+  export CHOICESPATH;
+fi;
diff --git a/README b/README
index 473ccf2..6869640 100644
--- a/README
+++ b/README
@@ -70,6 +70,11 @@ provides a way to do just that.
   - basedir spec
   - specs that build on that
   
+  4.3. CHOICESPATH:
+  =================
+  - used by ROX desktop
+  - user settings -> place / allow
+
 5. FURTHER INFO:
 ================
 - About KDEDIRS, and the hierarchy of files in such a directory can be found
diff --git a/debian/control b/debian/control
index fadafd7..c2ad916 100644
--- a/debian/control
+++ b/debian/control
@@ -8,17 +8,16 @@ Standards-Version: 3.6.1
 Package: desktop-profiles
 Architecture: all
 Suggests: hicolor-icon-theme, shared-mime-info
-Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Framework for setting up desktop profiles
- Both KDE and freedesktop provide a way to add profiles by setting certain
- environment variables (KDEDIRS, XDG_CONFIG_DIRS, and XDG_DATA_DIRS). This
- package provides a standard way to set those variables.
+ KDE, ROX, and freedesktop all provide a way to add profiles by setting certain
+ environment variables (KDEDIRS, CHOICESPATH, XDG_CONFIG_DIRS + XDG_DATA_DIRS).
+ This package provides a standard way to set those variables.
  .
  Profiles are activated based on group membership and/or the succesfull 
  completion of arbitrary shell-command(s). Adding a new profile is as simple as
  dropping a file in /etc/desktop-profiles.
  .
- Through KDEDIRS you can customize KDE completely. XDG_CONFIG_DIRS and 
+ Through KDEDIRS, and CHOICESPATH you can customize KDE completely. XDG_CONFIG_DIRS and 
  XDG_DATA_DIRS allow you to setup stuff according to the various freedesktop
  standards (see http://freedesktop.org/Standards) for all desktops that support
  them (KDE, GNOME, ROX, and XFCE in varying degrees).
diff --git a/default.listing b/default.listing
index d4a46cd..9490796 100644
--- a/default.listing
+++ b/default.listing
@@ -1,9 +1,15 @@
 # Add profiles for the system-wide settings:
-# - XDG_CONFIG_DIRS and XDG_DATA_DIRS have a default value specified in the
-#   'XDG Base Directory Specification'
 # - KDEDIRS defauls to the prefix used on compilation, which is '/usr' on a
 #   Debian system
-##################################################################################
+# - XDG_CONFIG_DIRS and XDG_DATA_DIRS have a default value specified in the
+#   'XDG Base Directory Specification'
+# - CHOICESPATH (the ROX variable) defaults to 
+#   ${HOME}/Choices:/usr/local/share/Choices:/usr/share/Choices
+#   -> we don't add the first dir with the user-settings here, the dir with the
+#      userspecific settings is added as the first dir in CHOICESPATH first by
+#      the Xsession.d script
+################################################################################
 kde-prefix;/usr;;;KDE;System-wide kde stuff on Debian
 default-xdg_config_dirs;/etc/xdg;;;XDG_CONFIG;Default config location defined by XDG Base Directory Specification
-default-xdg_data_dirs;/usr/local/share:/usr/share;;;XDG_DATA;Default data locations defined by XDG Base Directory Specification
+default-xdg_data_dirs;/usr/local/share /usr/share;;;XDG_DATA;Default data locations defined by XDG Base Directory Specification
+default-choicespath;/usr/local/share/Choices /usr/share/Choices;;;ROX;Default locations for non-user settings of ROX programs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git