[debian-edu-commits] debian-edu/ 96/183: Fixed up package scripts and lintian warning in man-page
Alexander Alemayhu
ccscanf-guest at moszumanska.debian.org
Wed Jun 11 16:48:37 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 154d4cbfb7049c087cf6d6397415b92410542ef8
Author: Bart Cornelis <cobaco at linux.be>
Date: Tue Oct 11 07:07:41 2005 +0000
Fixed up package scripts and lintian warning in man-page
---
debian/changelog | 32 +++++++++++++++++++-------------
debian/config | 35 ++++++++++++++++++++++++-----------
debian/copyright | 4 ++--
debian/postinst | 26 --------------------------
debian/preinst | 2 +-
desktop-profiles.7 | 33 +++++++++++++++++----------------
6 files changed, 63 insertions(+), 69 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a04820a..b5609e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,32 @@
-desktop-profiles (1.4.7) UNRELEASED; urgency=low
+desktop-profiles (1.4.7) unstable; urgency=low
* Added a conversion script (to be run manually by admin) that will:
- generate the metadata needed to manage all currently used configuration
- sources (including those added by the admin) through the mechanism
+ sources (including those added by the admin) through the mechanism
provided by this package
- - replace (unless you tell it not to) the global path file by one that
+ - replace (unless you tell it not to) the global path file by one that
assumes all configuration sources are managed through desktop-profiles
- - creates backup copies of everything it changes
+ - creates backup copies of everything it changes
* Removed the hook that allowed changing the global path file from within
- the postinst maintainer script, instead we now just tell the admin that
+ the postinst maintainer script, instead we now just tell the admin that
the global path file needs changing, and point him to the conversion
script (Closes: 309871, 311113)
- * Added French translation by Jean-Luc Coulon (f5ibh) and the French
- translation team (Closes: 312437)
- * Added Vietnamese translation send in by Clytie Siddall
- <clytie at riverland.net.au>, also corrected some spelling mistakes in the
- English strings that she noticed (Closes: 313510)
+ * Updated kommander gui-script to work with kommander from kde 3.4.X
* Change to debian-policy version 3.6.2
- * Adapted creation of profile-manager.pot so that translators don't have
- to do unnecesary work
+ * Translations:
+ - Added French translation by Jean-Luc Coulon (f5ibh) and the French
+ translation team (Closes: 312437, 332719)
+ - Added Vietnamese translation send in by Clytie Siddall, and
+ corrected some spelling mistakes in the English strings that she
+ noticed (Closes: 313510)
+ - Added Czech tranlsation by Miroslav Kure (Closes: 315828)
+ - Added Portuguese Translation by Miguel Figueiredo (Closes: 330380)
+ - Added Basque translation by pi <pi at beobide.net>
+ - Updated Dutch translation
+ - Adapted creation of profile-manager.pot so that translators don't have
+ to do unnecesary work
- -- Bart Cornelis (cobaco) <cobaco at linux.be> Wed, 3 Aug 2005 18:32:58 +0200
+ -- Bart Cornelis (cobaco) <cobaco at linux.be> Mon, 10 Oct 2005 23:02:20 +0200
desktop-profiles (1.4.6) unstable; urgency=high
diff --git a/debian/config b/debian/config
index 2c10822..493fdaa 100755
--- a/debian/config
+++ b/debian/config
@@ -3,19 +3,32 @@
# source debconf library
. /usr/share/debconf/confmodule
-# if gconf path file is present and doesn't include the generated path file
-# then ask the user whether to activate gnome profiles (defaults to no)
+# if gconf path file needs changes in order to activate the gnome profiles
+# then warn the user of that (critical-priority if changing from old variables
+# as not changing in that case potentially breaks gnome)
if (test -e /etc/gconf/2/path) ; then
- if ! ( (grep '/var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path > /dev/null) ||
- (grep '/var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/2/path > /dev/null) ); then
- db_input medium desktop-profiles/replace-gconf-system-wide-path-file || true;
- db_go || true;
- fi;
+ if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ||
+ (grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ); then
+ if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path 2>&1 > /dev/null ) ||
+ (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/2/path 2>&1 > /dev/null ) ); then
+ db_input medium desktop-profiles/replace-gconf-system-wide-path-file || true;
+ db_go || true;
+ else
+ db_input critical desktop-profiles/replace-old-vars || true;
+ db_go || true;
+ fi;
+ fi;
elif (test -e /etc/gconf/2/path) ; then
- if ! ( (grep '/var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/1/path > /dev/null) ||
- (grep '/var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/1/path > /dev/null) ); then
- db_input medium desktop-profiles/replace-gconf-system-wide-path-file || true;
- db_go || true;
+ if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ||
+ (grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ); then
+ if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/1/path 2>&1 > /dev/null ) ||
+ (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/1/path 2>&1 > /dev/null ) ); then
+ db_input medium desktop-profiles/replace-gconf-system-wide-path-file || true;
+ db_go || true;
+ else
+ db_input critical desktop-profiles/replace-old-vars || true;
+ db_go || true;
+ fi;
fi;
fi;
diff --git a/debian/copyright b/debian/copyright
index 25500d7..1f39d8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,8 +20,8 @@ License:
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/postinst b/debian/postinst
index 5c89dbe..544edef 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,30 +3,4 @@
# source debconf library
. /usr/share/debconf/confmodule
-##############################################################################
-# Popup note about need to change default global gconf path file so it allows
-# use of desktop-profiles, when current global path file doesn't
-##############################################################################
-if (test -e /etc/gconf/2/path) ; then
- if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ||
- (grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/2/path 2>&1 > /dev/null ) ); then
- if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/2/path 2>&1 > /dev/null ) ||
- (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/2/path 2>&1 > /dev/null ) ); then
- db_get desktop-profiles/replace-gconf-system-wide-path-file || true;
- else
- db_get desktop-profiles/replace-old-vars || true;
- fi;
- fi;
-elif (test -e /etc/gconf/1/path) ; then
- if ! ( (grep 'include *\$(ENV_MANDATORY_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ||
- (grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/1/path 2>&1 > /dev/null ) ); then
- if ! ( (grep 'include /var/cache/desktop-profiles/\$(USER)_mandatory.path' /etc/gconf/1/path 2>&1 > /dev/null ) ||
- (grep 'include /var/cache/desktop-profiles/\$(USER)_defaults.path' /etc/gconf/1/path 2>&1 > /dev/null ) ); then
- db_get desktop-profiles/replace-gconf-system-wide-path-file || true;
- else
- db_get desktop-profiles/replace-old-vars || true;
- fi;
- fi;
-fi;
-
#DEBHELPER#
diff --git a/debian/preinst b/debian/preinst
index 547e005..c3a18d7 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -14,7 +14,7 @@ fi;
# if we're upgrading from a version that didn't have the path2listing script
# ensure we don't loose the old defaults
if( (test "$1" = "upgrade") && (dpkg --compare-versions "$2" lt "1.4.6") ); then
- cat desktop-profiles.listing | grep ';GCONF;' > /etc/desktop-profiles/desktop-profiles_path2listing.listing
+ cat /etc/desktop-profiles/desktop-profiles.listing | grep ';GCONF;' > /etc/desktop-profiles/desktop-profiles_path2listing.listing
fi;
#DEBHELPER#
diff --git a/desktop-profiles.7 b/desktop-profiles.7
index d1fd3a1..776dca8 100644
--- a/desktop-profiles.7
+++ b/desktop-profiles.7
@@ -16,9 +16,9 @@ Each available profile has some metadata associated with it. On X startup an Xse
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
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
+.IP \(bu 3
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
+.IP \(bu 3
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).
@@ -38,24 +38,24 @@ Each non-empty line in a .listing file is either a comment line, or line contain
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
+.IP \(bu 3
.B 1st field
: Name of the profile, arbitrary, must be unique within each file, and may (but probably should not) be empty.
-.IP \(bu 4
+.IP \(bu 3
.B 2nd field
: The kind of profile, must be set, must be one of: KDE, XDG_CONFIG, XDG_DATA, GCONF, ROX, GNUSTEP, or UDE.
-.IP \(bu 4
+.IP \(bu 3
.B 3th field:
.IP
Location of the root of the profile directory tree, may contain more then 2 directory (in which case directies should be separated with spaces). Environment variables may be used when specifying root directories (e.g. $HOME/.extra_config).
.IP
Except for Gconf profiles, which use the this field to contain exactly one directive to be included in the generated path file (directives are either \'xml:(readonly|readwrite):<profile-root>\', or \'include <some-path-file>' ).
-.IP \(bu 4
+.IP \(bu 3
.B 4th field
: A Numeric precedence value for the profile, may be empty (which is treated as lowest possible precedence).
.IP
When 2 (or more) active profiles define a setup for the same thing, the value specified by the profile with the highest precedence value is used (UDE will onlyuse values from the highest ranked profile).
-.IP \(bu 4
+.IP \(bu 3
.B 5th field
: Space separated list of conditions that need to be met to activate the profiles (if more then 1 condition is specified all conditions need to be met to activate the profile).
.IP
@@ -70,14 +70,14 @@ There are 3 different kinds of requirements:
3) $(<command>) = <command> needs to exit succesfully ($?=0)
.IP
(Where <command> is an arbitrary shell command)
-.IP \(bu 4
+.IP \(bu 3
.B 6th field
: A description of what the profile is/does, may be empty.
.IP
Note that this basically boils down to a CSV-file using \';\' as separator and allowing shell-style comments.
.SH CREATING PROFILES
-.IP \(bu 4
+.IP \(bu 3
.B KDE
(through KDEDIRS):
.IP
@@ -86,7 +86,7 @@ Each profile directory is layed out according to the KDE file system hierarchy (
Config files in the different profiles are merged (in case of conflicting keys, the value of the highest precedence profile is used). For other files the highest precedence profile that contains the file supplies it.
.IP
Starting with kde 3.3. the kiosk framework can be used to lock settings down in the profiles, for all unlocked settings user-specified values are always used when available. (see http://www.kde.org/areas/sysadmin for more info on the kiosk-framework, and the format of the kde config files).
-.IP \(bu 4
+.IP \(bu 3
.B Freedesktop
(using XDG_CONFIG_DIRS and XDG_DATA_DIRS)
.IP
@@ -95,7 +95,7 @@ The 'Desktop base directory specification' defines the basic framework for using
The actual contents of the profiles is filled in by things conforming to other freedesktop standards (e.g. the 'menu specification'). A list of freedesktop standards (that are being worked on) can be found at http://freedesktop.org/Standards. Most of these standards are still under development and not (yet) widely supported. Eventually you can probably suspect support of at least KDE, GNOME, ROX, and XFCE.
.IP
XFCE (>=4.2) specific settings can also be found in Freedesktop profile dirs (see the next section for details).
-.IP \(bu 4
+.IP \(bu 3
.B XFCE
(using XDG_CONFIG_DIRS and XDG_DATA_DIRS)
.IP
@@ -104,7 +104,7 @@ Starting from XFCE version 4.2. XFCE will completely adopt the freedesktop 'Desk
If two profiles contain the same config file, the one from the profile with the highest precedence is used.
.IP
XFCE versions prior to 4.2. don't support multiple config sets.
-.IP \(bu 4
+.IP \(bu 3
.B ROX
(through CHOICESPATH):
.IP
@@ -113,13 +113,14 @@ Each profile directory has one subdirectory for each app for which it provides s
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
+.IP \(bu 3
.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, 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
+For more information on GNUSTEP domains see
+www.gnustep.org/resources/documentation/User/GNUstep/filesystem.html
+.IP \(bu 3
.B UDE
(through UDEdir):
.IP
@@ -130,7 +131,7 @@ UDE searches for configuration files in the following directories (first find is
2. $UDEdir/config (or in absence of $UDEdir in the install dir which is /usr/share/ude on debian)
.IP
3. If the configuration file is still not found, UWM takes the filename as it is (usually dereferencing any environment variables first)
-.IP \(bu 4
+.IP \(bu 3
.B GNOME
(using GConf 'Configuration Sources'):
.IP
--
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