[debian-edu-commits] debian-edu/ 53/183: - Added wrapper script to ease starting of kommander gui script from commandline - changed menu file to use wrapper script for startup - Changed package description te better indicate who should be interested in this package - Added missing #DEBHELPER# to preinstall script - Document single quote bug in README - Completed Dutch translation fof gui script (now I just need to figure out how to actually get the script to use it)
Alexander Alemayhu
ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:33 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 d8dc0cffc54dc27867565b138929926845116f22
Author: Bart Cornelis <cobaco at linux.be>
Date: Mon May 9 15:42:04 2005 +0000
- Added wrapper script to ease starting of kommander gui script from commandline
- changed menu file to use wrapper script for startup
- Changed package description te better indicate who should be interested in
this package
- Added missing #DEBHELPER# to preinstall script
- Document single quote bug in README
- Completed Dutch translation fof gui script (now I just need to figure out how
to actually get the script to use it)
---
README | 9 ++++++--
TODO | 8 +++++--
debian/changelog | 11 ++++++---
debian/control | 9 ++++----
debian/menu | 2 +-
debian/preinst | 2 ++
debian/rules | 4 ++--
desktop-profiles.7 | 3 +--
list-desktop-profiles.1 | 6 ++---
po/nl.po | 60 ++++++++++++++++++++++++-------------------------
profile-manager | 46 +++++++++++++++++++++++++++++++++++++
profile-manager.1 | 29 ++++++++++++++++++++++++
profile-manager.kmdr | 26 +++++++++++++++------
13 files changed, 158 insertions(+), 57 deletions(-)
diff --git a/README b/README
index cc0e90b..7b436bd 100644
--- a/README
+++ b/README
@@ -5,8 +5,13 @@ 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
+- The profile-manager.kmdr script is only guaranteed to work with the KDE 3.3
+ kommander package, it's known to _not_ work (correctly) with the KDE 3.4
+ package (the convienence script warns of this, and exits)
+
+- The profile-manager.kmdr script doesn't work correctly if the profile
+ description contains a single quote, it doesn't show the details, and will
+ mess up the metadata file when changing it
NOTE FOR DEBIAN-EDU USERS
=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/TODO b/TODO
index 3857d52..0506bc2 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,12 @@
- 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)
+
+- figure out where to place l10n data in order to localize kommander script
+- make call for translation + add translations to 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)
+- talk to gconf-maintainers, to have gconf support this package
+ (current system-wide gconf path file needs replacing with the one from this package)
+- build usefull (example) profiles and point to them in docu (for accessibility?)
diff --git a/debian/changelog b/debian/changelog
index 5a02718..64b33d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-desktop-profiles (1.4.2-1) UNRELEASED; urgency=low
+desktop-profiles (1.4.2) unstable; urgency=low
- * Internationalized kommander gui script
+ * Added convenience script for starting the gui + man page for that
+ * i18n the kommander script (l10n to follow)
+ * Make lintian and linda run on the source package without errors
+ (binary package was clean already)
+ * Changed package description to give a clearer indication of who should be
+ interested in this package
- -- Bart Cornelis (cobaco) <cobaco at linux.be> Thu, 5 May 2005 12:13:04 +0200
+ -- Bart Cornelis (cobaco) <cobaco at linux.be> Sun, 8 May 2005 20:32:29 +0200
desktop-profiles (1.4.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2fd1069..7423f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: admin
Priority: optional
Maintainer: Bart Cornelis (cobaco) <cobaco at linux.be>
Build-Depends: debhelper (>= 4.0.0)
+Build-Depends-Indep: po-debconf
Standards-Version: 3.6.1
Package: desktop-profiles
Architecture: all
-Build-Depends-Indep: po-debconf
Depends: ${misc:Depends}
Suggests: kommander, gconf-editor, kiosktool, menu-xdg, hicolor-icon-theme, shared-mime-info
Enhances: kdebase, gconf, gconf2, libxfce4util-1 (>= 4.2), rox-filer, ude
@@ -18,10 +18,9 @@ Description: framework for setting up desktop profiles
combining the customizations provided by a number of profiles.
.
This package offers a standard cross-desktop way of managing the conditional
- activation of available profiles (e.g. activate profile X for all members of
- group Y). It also offers a way for the sysadmin to set up profile precedence
- (in case of conflicts, customizations from profiles with higher precedence
- take, er, precedence :)
+ activation of available profiles. As such it is useful to both administrators
+ (allowing different configurations for different sets of users) and CDD's
+ (who want to have a configuration customized for a certain target group).
.
This package currently supports setting up profiles for KDE, GNOME, ROX,
XFCE (>=4.2), GNUSTEP, UDE, and Freedesktop. Freedesktop profiles allow
diff --git a/debian/menu b/debian/menu
index 489cbdb..3e9bf82 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,4 +2,4 @@
needs="X11" \
section="Apps/System"\
title="profile-manager"\
- command="/usr/bin/kmdr-executor /usr/share/desktop-profiles/kommander-scripts/profile-manager.kmdr"
+ command="/usr/bin/profile-manager"
diff --git a/debian/preinst b/debian/preinst
index 1e4a573..c0b684a 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -10,3 +10,5 @@ if( (test "$1" = "upgrade") && (dpkg --compare-versions "$2" lt "1.4") ); then
cat $FILE.oldformat | sed -e 's/\(.*;\)\(.*;.*;.*;\)\(.*;\)\(.*\)/\1\3\2\4/g' > $FILE
done;
fi;
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index d8b7a71..b30fd31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,8 +35,8 @@ binary-indep: build install
dh_installdocs
dh_installmenu
dh_installexamples path
- dh_installman desktop-profiles.7 list-desktop-profiles.1 dh_installlisting.1
- dh_install dh_installlisting usr/bin
+ dh_installman desktop-profiles.7 list-desktop-profiles.1 dh_installlisting.1 profile-manager.1
+ dh_install dh_installlisting profile-manager usr/bin
dh_install listingmodule usr/share/desktop-profiles/
dh_install list-desktop-profiles usr/bin/
dh_install profile-manager.kmdr usr/share/desktop-profiles/kommander-scripts/
diff --git a/desktop-profiles.7 b/desktop-profiles.7
index c10a4d6..e2cb4cd 100644
--- a/desktop-profiles.7
+++ b/desktop-profiles.7
@@ -159,5 +159,4 @@ Each configuration source is structured like a simple hierarchical file system a
This manual page was written by Bart Cornelis <cobaco at skolelinux.no>.
.SH SEE ALSO
-list-desktop-profiles(1)
-dh_installlisting(1)
+list-desktop-profiles(1), profile-manager(1), dh_installlisting(1)
diff --git a/list-desktop-profiles.1 b/list-desktop-profiles.1
index 38a1db8..8aeccb9 100644
--- a/list-desktop-profiles.1
+++ b/list-desktop-profiles.1
@@ -7,7 +7,7 @@ list-desktop-profiles \- list known profiles that meet given criteria
list-desktop-profiles [OPTION]
.SH DESCRIPTION
-As the number of .listing files grows, trying to find out which profiles are present/meet certain criteria becomes increasingly unpleasant. This script remedies that allowing you to just list your criteria, and outputting all profiles meeting those criteria.
+As the number of .listing files holding metadata grows, trying to find out which profiles are present/meet certain criteria becomes increasingly unpleasant. This script remedies that allowing you to just list your criteria, and outputting all profiles meeting those criteria.
.PP
By default it will just output the lines from the .listing files for each (matching) profile, but you can specifying a formatstring to fancy up the output.
.PP
@@ -105,7 +105,7 @@ SORT_KEY
Can be used to specify the default sort-key (= field number). Defaults to 1
.SH FILES
-/etc/desktop-profiles/*.listing - Files containing the data about installed profiles
+/etc/desktop-profiles/*.listing - Files containing the metadata about installed profiles
.PP
/etc/default/desktop-profiles - File containing default settings for this script (by way of the environment variables above)
@@ -118,5 +118,5 @@ This manual page was written by Bart Cornelis <cobaco at skolelinux.no>.
.PP
.SH SEE ALSO
-desktop-profiles(7)
+desktop-profiles(7), profiles-manager(1)
diff --git a/po/nl.po b/po/nl.po
index 0428db4..5a4e7d8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: desktop-profiles\n"
"POT-Creation-Date: 2005-05-05 10:29+0200\n"
-"PO-Revision-Date: 2005-05-05 12:07+0100\n"
+"PO-Revision-Date: 2005-05-08 20:43+0100\n"
"Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "soort overeenkomt met"
#: _from_rc.cc:5
msgid "When checked only profiles whose 2nd (=kind) field matches the given regular expression are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens soort (2e veld) voldoet aan de gegeven reguliere expressie weergegeven"
#: _from_rc.cc:6
msgid "requirement matches"
@@ -40,7 +40,7 @@ msgstr "vereisten overeenkomen met"
#: _from_rc.cc:7
msgid "When checked only profiles whose 5th (=requirements) field matches the given regular expression are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens vereisten (5e veld) voldoen aan de gegeven reguliere expressie weergegeven"
#: _from_rc.cc:8
#: _from_rc.cc:36
@@ -49,7 +49,7 @@ msgstr "prioriteit"
#: _from_rc.cc:9
msgid "When checked only profiles whose precedence value satifies the given comparison are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens prioriteit (4e veld) voldoet aan de gegeven reguliere expressie weergegeven"
#: _from_rc.cc:10
msgid ">"
@@ -85,11 +85,11 @@ msgstr "Dit veld aanvaard nummers (negatief mag)"
#: _from_rc.cc:18
msgid "requirements are met for"
-msgstr ""
+msgstr ":vereisten worden tegemoetgekomen voor"
#: _from_rc.cc:19
msgid "When checked only profiles whose requirements are met for the selected user are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens vereisten voldaan worden voor de geselecteerde gebruiker weergegeven"
#: _from_rc.cc:20
msgid "list of user accounts on this system"
@@ -101,7 +101,7 @@ msgstr "naam overeenkomt met"
#: _from_rc.cc:22
msgid "When checked only profiles whose 1st (=name) field matches the given regular expression are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens naam (1e veld) voldoet aan de gegeven reguliere expressie weergegeven"
#: _from_rc.cc:23
msgid "description matches"
@@ -109,7 +109,7 @@ msgstr "beschrijving overeenkomt met "
#: _from_rc.cc:24
msgid "When checked only profiles whose 6th (=description) field matches the given regular expression are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens beschrijving (6e veld) voldoet aan de gegeven reguliere expressie weergegeven"
#: _from_rc.cc:25
msgid "location matches"
@@ -117,7 +117,7 @@ msgstr "locatie overeenkomt met"
#: _from_rc.cc:26
msgid "When checked only profiles whose 3th (=location) field matches the given regular expression are shown"
-msgstr ""
+msgstr "Wanneer aangevinkt worden enkel die profielen wiens locatie (3e veld) voldoet aan de gegeven reguliere expressie weergegeven"
#: _from_rc.cc:30
msgid "Sort profile list on"
@@ -126,7 +126,7 @@ msgstr "Profielen sorteren op"
#: _from_rc.cc:31
#: _from_rc.cc:38
msgid "Shown profiles are sorted on the contents of the selected field"
-msgstr ""
+msgstr "De getoonde profielen worden gesorteerd op het geselecteerde veld"
#: _from_rc.cc:32
msgid "description"
@@ -154,27 +154,27 @@ msgstr "Lijst van gevonden profielen"
#: _from_rc.cc:40
msgid "Profile Details"
-msgstr ""
+msgstr "Profieldetails"
#: _from_rc.cc:41
msgid "Name:"
-msgstr ""
+msgstr "Naam:"
#: _from_rc.cc:42
msgid "1st field (=name) of selected profile"
-msgstr ""
+msgstr "1e veld (=naam) van het geselecteerde profiel"
#: _from_rc.cc:43
msgid "Description:"
-msgstr ""
+msgstr "Beschrijving:"
#: _from_rc.cc:44
msgid "6th field (=description) of selected profile"
-msgstr ""
+msgstr "6e veld (=beschrijving) van het geselecteerde profiel"
#: _from_rc.cc:45
msgid "Kind:"
-msgstr ""
+msgstr "Soort:"
#: _from_rc.cc:46
msgid "XDG_CONFIG"
@@ -206,15 +206,15 @@ msgstr "UDE"
#: _from_rc.cc:53
msgid "2nd field (=kind) of selected profile"
-msgstr ""
+msgstr "2de veld (=soort) van het geselecteerde profiel"
#: _from_rc.cc:54
msgid "Precedence:"
-msgstr ""
+msgstr "Prioriteit:"
#: _from_rc.cc:55
msgid "4th field (=precedence value) of selected profile"
-msgstr ""
+msgstr "4e veld (=prioriteit) van het geselecteerde profiel"
#: _from_rc.cc:56
msgid "Location(s):"
@@ -222,7 +222,7 @@ msgstr "Locatie(s)"
#: _from_rc.cc:57
msgid "3th field of selected profile"
-msgstr ""
+msgstr "3e veld van het geselecteerde profiel"
#: _from_rc.cc:58
msgid "Activation requirements:"
@@ -230,7 +230,7 @@ msgstr "Vereisten voor activatie:"
#: _from_rc.cc:59
msgid "list of activation requirements (contained in the 5th field) of selected profile"
-msgstr ""
+msgstr "lijst met vereisten voor activatie (wordt opgenomen in het 5e veld) van het geselecteerde profiel"
#: _from_rc.cc:60
msgid "Remove selected"
@@ -238,40 +238,40 @@ msgstr "Geselecteerd vereiste verwijderen"
#: _from_rc.cc:61
msgid "Removes selected activation requirement from the list"
-msgstr ""
+msgstr "Geselecteerde vereiste uit de lijst verwijderen"
#: _from_rc.cc:62
msgid "New activation requirement:"
-msgstr ""
+msgstr "Nieuwe activatie-vereiste"
#: _from_rc.cc:63
msgid "When the user is"
-msgstr ""
+msgstr "Wanneer de gebruiker"
#: _from_rc.cc:64
msgid "a member of"
-msgstr ""
+msgstr "lid is van"
#: _from_rc.cc:65
msgid "not member of "
-msgstr ""
+msgstr "geen lid is van"
#: _from_rc.cc:66
msgid "Your choice here determines wether the new requirement concerns membership or non-membership"
-msgstr ""
+msgstr "Uw keuze hier geeft aan of de nieuwe vereiste het lid zijn van of net het niet lid zijn van betreft"
#: _from_rc.cc:67
msgid "Choose the group for which (non-)membership is needed to activate this profile"
-msgstr ""
+msgstr "Kies de groep waarvoor (niet) lid zijn nodig is om dit profiel te activeren"
#: _from_rc.cc:68
#: _from_rc.cc:73
msgid "Add"
-msgstr ""
+msgstr "Toevoegen"
#: _from_rc.cc:69
msgid "Only activate profile for users that are (not) a member of the selected group"
-msgstr ""
+msgstr "Profiel enkel activeren voor gebruikers die (geen) lid zin van de geselecteerde groep"
#: _from_rc.cc:70
msgid "When"
diff --git a/profile-manager b/profile-manager
new file mode 100755
index 0000000..9643ddc
--- /dev/null
+++ b/profile-manager
@@ -0,0 +1,46 @@
+#! /bin/sh
+# Convenience script to start kommander gui-script from the commandline
+#
+# (c) 2005 Bart Cornelis <cobaco AT skolelinux no>
+###############################################################################
+
+display_message() {
+ # if we're in a GUI environment, and kdialog is available pop up an error box
+ if (test x != "$DISPLAY"x) && (test -x `which kdialog`) && (which kdialog > /dev/null); then
+ kdialog --error "$1";
+ # else just output warning
+ else
+ echo "$1";
+ fi;
+}
+
+# test if interpreter for gui-script is available
+if ! (which kmdr-executor > /dev/null); then
+ display_message "No kmdr-executor present in path -> exiting\n.";
+ exit;
+else
+ kmdrBinary=`which kmdr-executor`;
+fi;
+
+
+# check if executable
+if !(test -x $kmdrBinary); then
+ display_message "$kmdrBinary is not executable -> exiting":
+ exit;
+else
+ kmdrVersion="`$kmdrBinary --version | grep "^Kommander Executor:" | sed "s/^.*: *\(.*\)/\1/"`";
+fi;
+
+# if profile-manager kommander script is readable
+if !(test -r /usr/share/desktop-profiles/kommander-scripts/profile-manager.kmdr); then
+ display_message "/usr/share/desktop-profiles/kommander-sripts/profile-manager.kmdr is missing or unreadable! -> exiting";
+ exit;
+fi;
+
+# Check version and run
+if (test $kmdrVersion = 1.0) || (echo $kmdrVersion | grep "^0."); then
+ $kmdrBinary /usr/share/desktop-profiles/kommander-scripts/profile-manager.kmdr;
+# kommander with new parser -> known not to work with current script
+else
+ display_message "This script does not yet work with the version of kommander you have installed.\nYou want to try the kommander packager 1:3.3.2";
+fi;
diff --git a/profile-manager.1 b/profile-manager.1
new file mode 100644
index 0000000..fd9db54
--- /dev/null
+++ b/profile-manager.1
@@ -0,0 +1,29 @@
+.TH PROFILE-MANAGER 1 "May 07, 2005" "desktop-profiles"
+
+.SH NAME
+profile-manager \- script that starts the gui for configuring profile metadata
+
+.SH SYNOPSIS
+profile-manager
+
+.SH DESCRIPTION
+This script is a convenience script that will attempt to start the kommander gui script for configuring the profile metadata. It will check if the kommander application is installed, if kommander is of a version that's not known to break things, and if the profile-manager.kmdr script is still present. If any of the checks fail, it will display a message saying why the gui couldn't be started.
+
+.SH OPTIONS
+.PP
+There are no options
+
+.SH FILES
+/etc/desktop-profiles/*.listing - Files containing the metadata about installed profiles
+
+.SH BUGS
+The gui currently barks at profile metadata containing a single quote in the description.
+.PP
+The gui is currently known to not work with the kommander version of kde 3.4 (the 3.3. works fine).
+
+.SH AUTHOR
+This manual page was written by Bart Cornelis <cobaco at skolelinux.no>.
+.PP
+
+.SH SEE ALSO
+desktop-profiles(7), list-desktop-profiles(1)
diff --git a/profile-manager.kmdr b/profile-manager.kmdr
index 0065555..c2ec2c0 100644
--- a/profile-manager.kmdr
+++ b/profile-manager.kmdr
@@ -243,7 +243,7 @@ fi
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>When checked only profiles whose 2nd (=kind) field matches the given regular expression are shown</string>
+ <string>When checked only profiles whose 5th (=kind) field matches the given regular expression are shown</string>
</property>
</widget>
<spacer>
@@ -299,7 +299,7 @@ fi
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>When checked only profiles whose 5th (=requirements) field matches the given regular expression are shown</string>
+ <string>When checked only profiles whose 4th (=requirements) field matches the given regular expression are shown</string>
</property>
</widget>
<widget class="QLayoutWidget">
@@ -362,6 +362,9 @@ fi
<property name="toolTip" stdset="0">
<string>When checked only profiles whose precedence value satifies the given comparison are shown</string>
</property>
+ <property name="whatsThis" stdset="0">
+ <string></string>
+ </property>
</widget>
<widget class="ComboBox">
<item>
@@ -431,6 +434,9 @@ fi
<property name="name">
<cstring>kindRegexp</cstring>
</property>
+ <property name="text">
+ <string></string>
+ </property>
<property name="associations" stdset="0">
<stringlist>
<string>@widgetText</string>
@@ -457,6 +463,12 @@ fi
<property name="name">
<cstring>precedenceRegexp</cstring>
</property>
+ <property name="text">
+ <string></string>
+ </property>
+ <property name="inputMask">
+ <string></string>
+ </property>
<property name="associations" stdset="0">
<stringlist>
<string>@widgetText</string>
@@ -746,7 +758,7 @@ fi
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>When checked only profiles whose 3th (=location) field matches the given regular expression are shown</string>
+ <string>When checked only profiles whose 2nd (=location) field matches the given regular expression are shown</string>
</property>
</widget>
<spacer>
@@ -1190,7 +1202,7 @@ fi
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>2nd field (=kind) of selected profile</string>
+ <string>5th field (=kind) of selected profile</string>
</property>
</widget>
</hbox>
@@ -1233,7 +1245,7 @@ fi
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>4th field (=precedence value) of selected profile</string>
+ <string>3th field (=precedence value) of selected profile</string>
</property>
</widget>
</hbox>
@@ -1278,7 +1290,7 @@ fi
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>3th field of selected profile</string>
+ <string>2nd field of selected profile</string>
</property>
</widget>
</hbox>
@@ -1371,7 +1383,7 @@ for_each_requirement "$REQS" 'echo'
</stringlist>
</property>
<property name="toolTip" stdset="0">
- <string>list of activation requirements (contained in the 5th field) of selected profile</string>
+ <string>list of activation requirements (contained in the 4th field) of selected profile</string>
</property>
</widget>
<widget class="ExecButton">
--
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