[debian-edu-commits] debian-edu/ 51/183: - Don't forget to add the preinst script to svn this time - use correct fieldnumber when sorting everywhere - updated docs: - partly rewritten desktop-profiles.7 for clarity - refer to correct fieldnumber everywhere - updated README (add note about kommander script not working with kde 3.4, refer to upstream page instead of kalyxo package for kiosktool as it disappeared) - updated TODO

Alexander Alemayhu ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:32 UTC 2014


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 0e59f344a2f259589f12722ddae496eb64acfd78
Author: Bart Cornelis <cobaco at linux.be>
Date:   Mon May 2 17:16:13 2005 +0000

    - Don't forget to add the preinst script to svn this time
    - use correct fieldnumber when sorting everywhere
    - updated docs:
      - partly rewritten desktop-profiles.7 for clarity
      - refer to correct fieldnumber everywhere
      - updated README (add note about kommander script not working with kde 3.4,
        refer to upstream page instead of kalyxo package for kiosktool as it
        disappeared)
    - updated TODO
---
 20desktop-profiles_activateDesktopProfiles |  2 +-
 README                                     | 23 ++++++++++-----
 TODO                                       | 17 ++++-------
 debian/changelog                           | 20 ++++++++++---
 debian/preinst                             | 12 ++++++++
 desktop-profiles.7                         | 47 ++++++++++++++++++------------
 list-desktop-profiles                      | 10 +++----
 list-desktop-profiles.1                    | 16 +++++-----
 8 files changed, 92 insertions(+), 55 deletions(-)

diff --git a/20desktop-profiles_activateDesktopProfiles b/20desktop-profiles_activateDesktopProfiles
index 1586fc6..7ad26d4 100644
--- a/20desktop-profiles_activateDesktopProfiles
+++ b/20desktop-profiles_activateDesktopProfiles
@@ -44,7 +44,7 @@ sort_profiles(){
       fi;
     done;
    #and sort them by preference 
-  ) | sort --reverse --general-numeric-sort --field-separator=";" --key 3 > $PROFILES;
+  ) | sort --reverse --general-numeric-sort --field-separator=";" --key 4 > $PROFILES;
 
   # read from file descriptor 3 (not using pipe, because then the variables being
   # changed are in a subshell, which means they're unchanged outside the while loop)
diff --git a/README b/README
index d3e5880..cc0e90b 100644
--- a/README
+++ b/README
@@ -3,19 +3,26 @@ GENERAL DESCRIPTION
 See the desktop-profiles(7) man page for a description of how this package 
 works, and what it does.
 
+KNOWN BUGS
+=-=-=-=-=-=
+The profile-manager.kmdr script is only guaranteed to work with the KDE 3.3
+kommander package, it's known to _not_ work with the KDE 3.4 package
+
 NOTE FOR DEBIAN-EDU USERS
 =-=-=-=-=-=-=-=-=-=-=-=-=
-Debian-edu users should make sure they define a profile for the common 
-debian-edu setup, you can do so by adding
- kde3-specific;/usr/share/debian-edu/common;0;;KDE;Common Debian-edu KDE setup
-on a line by itself in a .listing file (file should be in 
-/etc/desktop-profiles)
+Debian-edu users should make sure they have a .listing file with metadata for
+the profiles provided by debian-edu-config. This extra .listing file should  be
+placed in /etc/desktop-profiles and should be called debian-edu-config.listing,
+You can download the necessary .listing at
+http://developer.skolelinux.no/~cobaco/desktop-profiles/debian-edu-config.listing
 
 BUILDING KDE-PROFILES
 =-=-=-=-=-=-=-=-=-=-=
 There is a graphical tool called kiosk-tool available to aid in the creation 
 and maintenance of KDE profiles (regardless of wether they use kiosk 
-features). It's not currently available from the Debian mirrors, but a 
-version in .deb format is available from the kalyxo project's archives:
-see http://www.kalyxo.org/twiki/bin/view/Main/StagingArchive for more info.
+features). It's not currently available in .deb form, the upstream webpage is 
+http://extragear.kde.org/apps/kiosktool/ (1.0 version compiles cleanly with the
+usual './configure; make' invocation).
 
+There's an ITP filed (bug #267595), any progress on a deb package should be
+listed there.
diff --git a/TODO b/TODO
index 87e957d..3857d52 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,9 @@
-- Finish package:
-  - Are there any docs on the kiosk system of XFCE 4.2 available anywhere we can  	
-    point to? XFCE kiosk system possibilities are still very limited:
+- Find out why the profile-manager.kmdr script doesn't work with the KDE 3.4 kommander package
+- Find docs on the kiosk system of XFCE 4.2 available, sofar all I've found is
     -> panel: http://www.loculus.nl/xfce/documentation/docs-4.2/xfce4-panel.html#panel-kiosk
     -> xfce4-session: 
+- Create example profiles (debian accessibility would seem useful)
 
-- Tools to build (cross-desktop) profiles? (if at all possible)
-  - background
-  - add something to desktop/panel/bookmarks/menu
-  
-- Find sponsor  
-  -> switch debian-edu-config + desktop-base to use desktop-profiles
-  -> talk to gconf-maintainers, to have gconf support this package (current
-     system-wide gconf path file needs replacing with the one from this package)
+After package enters Debian:    
+- switch debian-edu-config + desktop-base to use desktop-profiles
+- talk to gconf-maintainers, to have gconf support this package (current system-wide gconf path file needs replacing with the one from this package)
diff --git a/debian/changelog b/debian/changelog
index b6b5748..bee6885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,24 @@
-desktop-profiles (1.4-1+SVN) UNRELEASED; urgency=low
+desktop-profiles (1.4.1-1) unstable; urgency=low
 
   * Guillem Jover
     - Fixed typo and disambiguate path by quoting it in the English template.
     - Updated .po files.
-  * Bart Cornelis 
+  * Bart Cornelis
     - Updated Dutch translation
-
- -- Bart Cornelis (cobaco) <cobaco at linux.be>  Mon, 21 Feb 2005 19:17:52 +0100
+    - Updated documentation:
+      + list-desktop-profiles man page still refered to old order of fields
+      + desktop-profiles man page is partly rewritten to present things in a
+        clearer way
+      + README referred to no longer existing .deb package for kiosktool from
+        the kalyxo team, now points to the ITP. 
+      + Put a pre precanned .listing file for debian-edu users online, and      
+        referred to it in the README
+      + Document in README that profile-manager.kmdr script doesn't work with
+        the KDE 3.4. kommander package, only with the 3.3 one.
+    - Use correct fieldnumber for precedence when sorting (was still using the
+      old field number in places)
+
+ -- Bart Cornelis (cobaco) <cobaco at linux.be>  Mon,  2 May 2005 18:09:21 +0200
 
 desktop-profiles (1.4-1) unstable; urgency=low
 
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..1e4a573
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+set -e
+
+# if we're upgrading from a version using the old format
+if( (test "$1" = "upgrade") && (dpkg --compare-versions "$2" lt "1.4") ); then
+  #convert to the new format, saving the old just to be completely save
+  for FILE in `ls /etc/desktop-profiles/*.listing`; do
+    mv $FILE $FILE.oldformat;
+    cat $FILE.oldformat | sed -e 's/\(.*;\)\(.*;.*;.*;\)\(.*;\)\(.*\)/\1\3\2\4/g' > $FILE
+  done;  
+fi;  
diff --git a/desktop-profiles.7 b/desktop-profiles.7
index ac3d119..c10a4d6 100644
--- a/desktop-profiles.7
+++ b/desktop-profiles.7
@@ -1,4 +1,4 @@
-.TH DESKTOP-PROFILES 7 "October 19, 2004" "desktop-profiles"
+.TH DESKTOP-PROFILES 7 "May 02, 2005" "desktop-profiles"
 
 .SH NAME
 desktop-profiles \- introduction and overview
@@ -11,22 +11,33 @@ It currently supports Freedesktop, KDE, XFCE (>= 4.2), ROX, GNUSTEP and UDE out
 below).
 
 .SH HOW IT WORKS
-All available profiles are described in .listing files placed in /etc/desktop-profiles. These files contain basic information about the profiles such as the name of the profile, where to access the profile, and which criteria need to be met to activate the profile (see 
-.B "FORMAT OF .listing FILES"
-below), listing files installed by packages should be named <packagename>.listing, or <packagename>_<something>.listing (there's a debhelper script to easy that :)
+Each available profile has some metadata associated with it. On X startup an Xsession.d script is run that looks through the metadata for all profiles and activates profiles based on that. 
 .PP
-On X startup an Xsession.d script is run that activates all profiles for which the criteria are met in order of precedence.
+Specifically each profile is associated with a set of requirements, and a precedence value. On X startup the Xsession.d script will check for each profile whether the requirements are met, and then activate all those profiles whose requirements are met in order of precedence.
 .PP
-For KDE, Freedesktop, XFCE (>= 4.2), ROX, GNUSTEP and UDE activating profiles is done by setting environment variables: KDEDIRS for KDE, XDG_CONFIG_DIRS and XDG_DATA_DIRS for both Freedesktop and XFCE, CHOICESPATH for ROX, GNUSTEP_PATHLIST for GNUSTEP (usually initialized from the various GNUSTEP_*_ROOT variables) and UDEdir for UDE. With the exception of UDEdirm, which takes a single directory, each of these variables takes a precedence ordered list of root-directories (of activated profiles).
-.PP
-For GConf profiles two user-specific path files are generated. One containing the activated mandatory "configuration sources", one containing the default "configuration sources" that are activated. To actually activate the profiles the system-wide path file (/etc/gconf/<gconf-version>/path) needs to be replaced with one including the generated path file (e.g. /usr/share/doc/desktop-profiles/examples/path ; which will give the same behaviour as the default gconf setup using profiles).
-.PP
-Thus for Freedesktop, KDE, GNOME, XFCE (>= 4.2), GNUSTEP and ROX any number of profiles can be activated. Whereas UDE only supports 1 active profiles at the time.
-.PP
-NOTE: Environment variables are only set if they're value is different from the default value, and user-specific path files are only generated if the systemwide gconf path file will include them.
+Exactly how a profile is activated depends on the profile kind (you don't need to know this in order to use this package):
+.IP \(bu 4
+For KDE, Freedesktop, XFCE (>= 4.2), ROX, GNUSTEP and UDE activating profiles is done by setting environment variables: KDEDIRS for KDE, XDG_CONFIG_DIRS and XDG_DATA_DIRS for both Freedesktop and XFCE, CHOICESPATH for ROX, GNUSTEP_PATHLIST for GNUSTEP (usually initialized from the various GNUSTEP_*_ROOT variables) and UDEdir for UDE. With the exception of UDEdir, which takes a single directory, each of these variables takes a precedence ordered list of root-directories (of activated profiles).
+.IP \(bu 4
+For GConf profiles two user-specific path files are generated. One containing the activated mandatory "configuration sources", one containing the default "configuration sources" that are activated. 
+.IP 
+As the default system-wide path file (/etc/gconf/<gconf-version>/path) currently doesn't include the generated path files you'll need to replace it with one that does (/usr/share/doc/desktop-profiles/examples/path is a path file which will give the same behaviour as the default gconf setup as long as no additional profiles are present).
+.IP NOTE:
+Environment variables will only be set if their value is different from the default value, and user-specific path files are only generated if the systemwide gconf path file will include them. This to avoid unnecessary clutter.
+.IP NOTE:
+The above means that for Freedesktop, KDE, GNOME, XFCE (>= 4.2), GNUSTEP and ROX any number of profiles can be activated at the same time. Whereas UDE can only activate 1 profiles at the time.
+
+.SH WHERE TO FIND THE PROFILE METADATA
+The metadata is specified in .listing files that are placed in the /etc/desktop-profiles directory. The format of those files is specified in the 'FORMAT OF .listing FILES'-section below.
+.IP NOTE:
+In order to ensure that packages containing .listing files don't run in to each other, packages should install such files as <packagename>.listing, or <packagename>_<something>.listing (there's a debhelper script provided to help with that :)
 
 .SH FORMAT OF .listing FILES
-Empty lines and lines starting with \'#\' (i.e. comment lines) are ignored. All other must be made up of the following 6 fields (separated by \';\'):
+Each non-empty line in a .listing file is either a comment line, or line containing profile metadata.
+.PP
+Comment lines start with \'#\' and are purely for human consumption, like empty lines they are ingored completely by the Xsession.d script.
+.PP
+Lines containing profile metadata are made up of 6 fields separated by a semi-colon (\';\'). Where the meaning of the fields is as follows:
 .IP \(bu 4
 .B 1st field
 : Name of the profile, arbitrary, must be unique within each file, and may (but probably should not) be empty.
@@ -98,14 +109,14 @@ XFCE versions prior to 4.2. don't support multiple config sets.
 (through CHOICESPATH):
 .IP
 Each profile directory has one subdirectory for each app for which it provides settings. When a configuration value is needed the profile directorys are searched in order, first profile that contains the file supplies it.
-.IP     
-NOTE: Programs _may_ merge the files the different profiles. If the merging encounters conflicting values the one from the highest order profile is used. 
+.IP NOTE:
+Programs _may_ merge the files the different profiles. If the merging encounters conflicting values the one from the highest order profile is used. 
 .IP   
 See http://rox.sourceforge.net/choices.html for a more detailed description.
 .IP \(bu 4
-.B GNUSTEP
+.B GNUSTEP (through GNUSTEP_PATHLIST)
 .IP
-Profiles in GNUSTEP parlance are called domains, and by default GNUSTEP will look in 4 domains (the location of which is indicated by the GNUSTEP_USER_ROOT, GNUSTEP_LOCAL_ROOT, GNUSTEP_NETWORK_ROOT, and GNUSTEP_SYSTEM_ROOT variables). Though it is possible to specify extra domains to use through the GNUSTEP_PATHLIST variable.
+Profiles in GNUSTEP parlance are called domains, and by default GNUSTEP will look in 4 domains (the location of which is indicated by the GNUSTEP_USER_ROOT, GNUSTEP_LOCAL_ROOT, GNUSTEP_NETWORK_ROOT, and GNUSTEP_SYSTEM_ROOT variables). Though it is possible to specify extra domains to use through the GNUSTEP_PATHLIST variable, it isn't often done as configuration files are currently only searched for in the user domain.
 .IP
 For more information on GNUSTEP domains see http://www.gnustep.org/resources/documentation/User/GNUstep/filesystem.html
 .IP \(bu 4
@@ -138,7 +149,7 @@ Each configuration source is structured like a simple hierarchical file system a
 -> See the GNOME administration manual for a detailed explanation
 
 .SH FILES
-/etc/desktop-profiles/default.listing - Details the default settings for the various environments. These should be used as fallback in most cases.
+/etc/desktop-profiles/desktop-profiles.listing - Details the default settings for the various environments. By default the system-wide settings provided by the packager are given no precedence, which means they will be loaded after all profiles with a precedence specified (which should be true for all profiles you create).
 .PP
 /etc/X11/Xsession.d/20desktop-profiles_activateDesktopProfiles - Xsesssion.d script that activates the profiles
 .PP
diff --git a/list-desktop-profiles b/list-desktop-profiles
index 5222dc1..36af16c 100644
--- a/list-desktop-profiles
+++ b/list-desktop-profiles
@@ -97,14 +97,14 @@ while test $# -ge 1; do
 	-s | --sort-key)
 	  case $2 in
 	    NAME | name) SORT_KEY=1 ;;
-	    LOCATION | location) SORT_KEY=2 ;;
-	    REQUIREMENTS | requirements) SORT_KEY=4 ;;
-	    KIND | kind) SORT_KEY=5 ;;
-	    DESCRIPTION | description) SORT_KEY=6 ;;
+	    KIND | kind) SORT_KEY=2 ;;
+	    LOCATION | location) SORT_KEY=3 ;;
 	    PRECEDENCE| precedence) 
-	      SORT_KEY=3 
+	      SORT_KEY=4 
 	      SORT_ARGS='--general-numeric-sort --reverse';
 	    ;;
+	    REQUIREMENTS | requirements) SORT_KEY=5 ;;
+	    DESCRIPTION | description) SORT_KEY=6 ;;
          
 	    *)
 	      print_help;
diff --git a/list-desktop-profiles.1 b/list-desktop-profiles.1
index 2ee537a..38a1db8 100644
--- a/list-desktop-profiles.1
+++ b/list-desktop-profiles.1
@@ -19,24 +19,24 @@ By default it will just output the lines from the .listing files for each (match
 Limit shown profiles to those for which the name (1st) field of the profile description needs matches the given regular expression.
 
 .PP
--l <regexp>, --location <regexp> 
+-k <regexp>, --kind <regexp> 
 .IP
-Limit shown profiles to those for which the location (2nd) field of the profile description needs matches the given regular expression.
+Limit shown profiles to those for which the kind (2nd) field of the profile description needs matches the given regular expression.
 
 .PP
--p <comparison>,- -precedence <comparison>
+-l <regexp>, --location <regexp> 
 .IP
-Limit shown profiles to those for which the precedence (3th) field of the profile description succeeds the given comparison. In the comparison you can Use 'gt' for 'greater then', 'lt' for 'less then', 'ge' for 'greater then or equal to', 'le' for 'less then or equal to', 'eq' for 'equal to', and 'ne' for 'not equal to'. (NOTE: empty precedence-field, is lowest possible precedence)
+Limit shown profiles to those for which the location (3th) field of the profile description needs matches the given regular expression.
 
 .PP
--r <regexp>, --requirement <regexp>
+-p <comparison>,- -precedence <comparison>
 .IP
-Limit shown profiles to those for which the requirements (4th) field of the profile description needs matches the given regular expression.
+Limit shown profiles to those for which the precedence (4th) field of the profile description succeeds the given comparison. In the comparison you can Use 'gt' for 'greater then', 'lt' for 'less then', 'ge' for 'greater then or equal to', 'le' for 'less then or equal to', 'eq' for 'equal to', and 'ne' for 'not equal to'. (NOTE: empty precedence-field, is lowest possible precedence)
 
 .PP
--k <regexp>, --kind <regexp> 
+-r <regexp>, --requirement <regexp>
 .IP
-Limit shown profiles to those for which the kind (5th) field of the profile description needs matches the given regular expression.
+Limit shown profiles to those for which the requirements (5th) field of the profile description needs matches the given regular expression.
 
 .PP
 -c <regexp>, --comment <regexp>,- -description <regexp>

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



More information about the debian-edu-commits mailing list