[debian-edu-commits] debian-edu/ 46/183: - Make dh_installlisting add depends desktop-profiles >= 1.3, if the installed listings contain a GNUSTEP profile - Small cosmetic changes (a couple of typo's, some more comments where they make sense, ...)
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 13289c27021c74868ea254b6298c46131af00da5
Author: Bart Cornelis <cobaco at linux.be>
Date: Tue Feb 1 17:26:52 2005 +0000
- Make dh_installlisting add depends desktop-profiles >= 1.3, if the installed
listings contain a GNUSTEP profile
- Small cosmetic changes (a couple of typo's, some more comments where they
make sense, ...)
---
20desktop-profiles_activateDesktopProfiles | 15 ++++++++++-----
debian/changelog | 2 +-
debian/control | 11 ++++++-----
debian/copyright | 2 +-
desktop-profiles.7 | 2 ++
dh_installlisting | 16 ++++++++++++++--
listingmodule | 2 +-
7 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/20desktop-profiles_activateDesktopProfiles b/20desktop-profiles_activateDesktopProfiles
index bffa424..bf645d1 100644
--- a/20desktop-profiles_activateDesktopProfiles
+++ b/20desktop-profiles_activateDesktopProfiles
@@ -6,6 +6,11 @@
#
# See the desktop-profiles(7) man page for an overview of how this works
#
+# Code in this file has a couple of debian-specific parts:
+# - use of the errormsg function defined by Debian's Xsession script
+# - use of tempfile from debian-utils
+# - hardcoded default values for the different GNUSTEP_*_ROOT env variables
+#
# (c) 2004-2005 Bart Cornelis <cobaco AT skolelinux no>
###############################################################################
@@ -40,10 +45,9 @@ sort_profiles(){
done;
#and sort them by preference
) | sort --reverse --general-numeric-sort --field-separator=";" --key 3 > $PROFILES;
- rm $PROFILES;
- # read from file descriptor 3 (not using pipe, because then variables being
- # changed are in a subshell, and thus unchanged outside the while loop)
+ # 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)
while read PROFILE <&3; do
# sort per profile kind
KIND=`echo "$PROFILE" | cut --fields 5 --delimiter ";"`;
@@ -64,8 +68,9 @@ sort_profiles(){
fi;
done;
- # close filedescriptor
+ # close filedescriptor,and delete tempfile
exec 3>&- ;
+ rm $PROFILES;
}
##########################################################
@@ -124,7 +129,7 @@ activate_UDE () {
}
activate_GNUSTEP () {
- # default values as set in /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh
+ # default values as set in /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh (On Debian)
export GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:-`/usr/lib/GNUstep/System/Library/Makefiles/user_home user`};
export GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:-/usr/local/lib/GNUstep/Local};
export GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:-/usr/local/lib/GNUstep/Network};
diff --git a/debian/changelog b/debian/changelog
index 7d458b1..84f8c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,5 +44,5 @@ desktop-profiles (1.0-1) unstable; urgency=low
* Initial Release.
- -- Bart Cornelis <cobaco at linux.be> Tue, 12 Oct 2004 20:42:38 +0200
+ -- Bart Cornelis (cobaco) <cobaco at linux.be> Tue, 12 Oct 2004 20:42:38 +0200
diff --git a/debian/control b/debian/control
index 85c5f1d..2fd1069 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Package: desktop-profiles
Architecture: all
Build-Depends-Indep: po-debconf
Depends: ${misc:Depends}
-Suggests: kommander, menu-xdg, hicolor-icon-theme, shared-mime-info, gconf-editor
-Enhances: kdebase, gconf, gconf2, rox-filer, libxfce4util-1 (>= 4.2)
+Suggests: kommander, gconf-editor, kiosktool, menu-xdg, hicolor-icon-theme, shared-mime-info
+Enhances: kdebase, gconf, gconf2, libxfce4util-1 (>= 4.2), rox-filer, ude
Description: framework for setting up desktop profiles
The different Desktop environments in Debian all offer the possibillity of
customizing them through the use of profiles (sets of configuration and/or
@@ -24,6 +24,7 @@ Description: framework for setting up desktop profiles
take, er, precedence :)
.
This package currently supports setting up profiles for KDE, GNOME, ROX,
- XFCE (>=4.2), GNUSTEP, UDE, and Freedesktop. The first four allow you to
- customize the respective desktop environment, while freedesktop profiles
- offer (a growing amount of) cross-desktop settings.
+ XFCE (>=4.2), GNUSTEP, UDE, and Freedesktop. Freedesktop profiles allow
+ you to do a (growing amount of) cross-desktop customization, while the
+ other profile kinds allow you to customize the respective desktop environments
+ to various degrees.
diff --git a/debian/copyright b/debian/copyright
index 53cac1d..25500d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source for this package is in the src/desktop-profiles dir of the
debian-edu svn on alioth.debian.org
Copyright:
- (c) 2004-2005 Bart Cornelis cobaco at linux.be
+ (c) 2004-2005 Bart Cornelis cobaco at skolelinux.no
License:
diff --git a/desktop-profiles.7 b/desktop-profiles.7
index 909e21c..cc2eaf7 100644
--- a/desktop-profiles.7
+++ b/desktop-profiles.7
@@ -62,6 +62,8 @@ There are 3 different kinds of requirements:
.IP \(bu 4
.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
diff --git a/dh_installlisting b/dh_installlisting
index e32a085..2c82cd1 100755
--- a/dh_installlisting
+++ b/dh_installlisting
@@ -39,6 +39,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# Add the debian/listing (or debian/$package.listing) if present
my $debDirListing=pkgfile($package,"listing");
my @listings=$debDirListing;
+ my $containsGNUSTEP='false';
# Add further listing files given as arguments if present
if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
@@ -63,12 +64,23 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
} else {
doit("install","-p","-m644",$file,"$tmp/etc/desktop-profiles/$package.listing");
}
+
+ #if we hadn't encountered a listing containing GNUSTEP profiles yet check for them now
+ if ($containsGNUSTEP eq 'false') {
+ if (`grep -v -e "^[[:space:]]*#" -e "^[[:space:]]*\$" debian/listing | cut -f 5 -d ';' | grep GNUSTEP` ne '') {
+ $containsGNUSTEP='true';
+ }
+ }
}
}
# Add desktop-profiles to the dependencies if necesary
if ($package ne 'desktop-profiles') {
- addsubstvar($package, "misc:Depends", "desktop-profiles (>= 1.2)");
+ if ($containsGNUSTEP ne 'false') {# GNUSTEP profiles were only supported starting version 1.3.
+ addsubstvar($package, "misc:Depends", "desktop-profiles (>= 1.3)");
+ } else {#if listing contains no GNUSTEP profiles
+ addsubstvar($package, "misc:Depends", "desktop-profiles (>= 1.2)");
+ }
}
}
@@ -79,6 +91,6 @@ L<desktop-profiles(7)>
=head1 AUTHOR
-Bart Cornelis (cobaco) <cobaco at linux.be>
+Bart Cornelis (cobaco) <cobaco at skolelinux.no>
=cut
diff --git a/listingmodule b/listingmodule
index df74c76..63882c0 100644
--- a/listingmodule
+++ b/listingmodule
@@ -196,7 +196,7 @@ list_listings () {
# In absence of any set variables it will just output all available profiles
# sorted by name.
#
-# The lisst-desktop-profile script from the desktop-profiles package offers an
+# The list-desktop-profile script from the desktop-profiles package offers an
# example of how to use this function.
###############################################################################
filter_listings () {
--
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