[Cdd-commits] r1195 - in cdd/trunk/blends: . share/blends/unixgroups
CDD Subversion Commit
noreply at alioth.debian.org
Sun Nov 2 16:10:33 UTC 2008
Author: tille
Date: Sun Nov 2 16:10:33 2008
New Revision: 1195
Added:
cdd/trunk/blends/blend-role
- copied, changed from r1194, cdd/trunk/blends/dis-role
cdd/trunk/blends/blend-role.8
- copied, changed from r1194, cdd/trunk/blends/dis-role.8
cdd/trunk/blends/share/blends/unixgroups/blend-actions
- copied unchanged from r1142, cdd/trunk/blends/share/blends/unixgroups/dis-actions
Removed:
cdd/trunk/blends/dis-role
cdd/trunk/blends/dis-role.8
cdd/trunk/blends/share/blends/unixgroups/dis-actions
Modified:
cdd/trunk/blends/BUGS
cdd/trunk/blends/Changelog
cdd/trunk/blends/README.BLENDS
cdd/trunk/blends/TODO
Log:
Continue renaming
Modified: cdd/trunk/blends/BUGS
==============================================================================
--- cdd/trunk/blends/BUGS (original)
+++ cdd/trunk/blends/BUGS Sun Nov 2 16:10:33 2008
@@ -1,5 +1,5 @@
List of known bugs:
-------------------
-dis-gen-control does not regard virtual package syntax ('|') and
+blend-gen-control does not regard virtual package syntax ('|') and
versioned depends.
Modified: cdd/trunk/blends/Changelog
==============================================================================
--- cdd/trunk/blends/Changelog (original)
+++ cdd/trunk/blends/Changelog Sun Nov 2 16:10:33 2008
@@ -1,6 +1,7 @@
-dis 0.6
--------
- - Renaming to DIS = Debian Integrated Solutions
+blends 0.6
+----------
+ - Renaming to blends as shortcut for the new name of the concept
+ "Debian Pure Blends"
cdd 0.5
-------
Modified: cdd/trunk/blends/README.BLENDS
==============================================================================
--- cdd/trunk/blends/README.BLENDS (original)
+++ cdd/trunk/blends/README.BLENDS Sun Nov 2 16:10:33 2008
@@ -1,33 +1,33 @@
-This README file explains how to use dis-* scripts.
+This README file explains how to use blend-* scripts.
File system:
-- /etc/dis/<DIS>
- Each DIS should create this directory, containing all the infos needed
- by dis-* scripts and by the DIS itself.
+- /etc/blends/<Blend>
+ Each Blend should create this directory, containing all the infos needed
+ by blends-* scripts and by the Blend itself.
- In this way it's clear for users to realize that DIS is using
- dis framework
+ In this way it's clear for users to realize that Blend is using
+ Debian Pure Blends framework
-- /etc/dis/dis.conf
- Main configuration file of dis-* scripts.
+- /etc/blends/blends.conf
+ Main configuration file of blend-* scripts.
- DISs should be aware of it, but not modify it.
+ Blends should be aware of it, but not modify it.
-- /etc/dis/<DIS>/<DIS>.conf
- A configuration file, in /bin/sh syntax, in which each DIS can
- override /etc/dis/dis.conf
+- /etc/blends/<Blend>/<Blend>.conf
+ A configuration file, in /bin/sh syntax, in which each Blend can
+ override /etc/blends/blends.conf
- DISHes with particular needing, for example a particular backend, should
+ Blends with particular needing, for example a particular backend, should
set variables here.
- In this way a default set of parameters is provided by dis.conf and a
- specific set for each DIS instance in <DIS>/<DIS>.conf
+ In this way a default set of parameters is provided by blends.conf and a
+ specific set for each Blend instance in <Blend>/<Blend>.conf
-- /usr/share/dis/
- Where common functions for script are stored.
+- /usr/share/blends/
+ Where common functions for the scripts are stored.
There will be a directory for each backend and a common set of
function that should be mandatory for each registred backend.
-- /etc/dis/<DIS>/menu/<ROLE>/
+- /etc/blends/<Blend>/menu/<ROLE>/
Users' menus for each registered role.
- If <ROLE> directory is not present, all files in /etc/dis/<DIS>/menu/
- are considered to be valid Debian menu entries for any Roles in DIS.
+ If <ROLE> directory is not present, all files in /etc/blends/<Blend>/menu/
+ are considered to be valid Debian menu entries for any ROLE in Blend.
Modified: cdd/trunk/blends/TODO
==============================================================================
--- cdd/trunk/blends/TODO (original)
+++ cdd/trunk/blends/TODO Sun Nov 2 16:10:33 2008
@@ -2,10 +2,10 @@
It would be a good idea to parse /etc/apt/sources.list for the Debian-Mirror
which is used on the building box instead of using ftp.debian.org
-dis-gen-control
+blend-gen-control
should handle versioned dependencies
-dis-install-helper
+blend-install-helper
This script is currently more or less a hack.
It might be reasonable to modularize this script.
Copied: cdd/trunk/blends/blend-role (from r1194, cdd/trunk/blends/dis-role)
==============================================================================
--- cdd/trunk/blends/dis-role (original)
+++ cdd/trunk/blends/blend-role Sun Nov 2 16:10:33 2008
@@ -3,22 +3,20 @@
# $Id$
usage () {
- echo "Usage: `basename $0` <action> <DIS> [<role>]"
+ echo "Usage: `basename $0` <action> <Blend> [<role>]"
echo "action: add|del"
- echo "DIS: `getDISList|tr ' ' '|'`"
- echo "role: `getDISList|tr ' ' '|'` (default: DIS name)"
+ echo "Blend: `getBlendList|tr ' ' '|'`"
+ echo "role: `getBlendList|tr ' ' '|'` (default: Blend name)"
}
-# the base dir for DIS conffiles, where script expects to find dirs named like
-# each registered DISs
-CONFBASE=${CONFBASE:-/etc/dis}
+# the base dir for Blend conffiles, where script expects to find dirs named like
+# each registered Blend
+CONFBASE=${CONFBASE:-/etc/blends}
-# should be /usr/lib/dis/*, file should be named differently
-. ${CONFBASE}/dis.conf
+. ${CONFBASE}/blends.conf
-
-# Check consistency of passed argouments
+# Check consistency of passed arguments
if [ $# -eq 0 ]; then
usage
exit 67 # EX_USAGE
@@ -30,7 +28,7 @@
exit 67 # EX_USAGE
fi
if [ -z "$2" ] ; then
- echo "Missing DIS name."
+ echo "Missing Blend name."
echo
usage
exit 67 # EX_USAGE
@@ -38,40 +36,40 @@
ACTION=`toLower $1`
-DIS=$2
-ROLE=${3:-${DIS}}
+BLEND=$2
+ROLE=${3:-${BLEND}}
-# Now that we know the selected DIS, we can check if there is a local
+# Now that we know the selected Blend, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
-test -n "${DIS}" -a -f ${CONFBASE}/${DIS}/${DIS}.conf &&
- . ${CONFBASE}/${DIS}/${DIS}.conf
+test -n "${BLEND}" -a -f ${CONFBASE}/${BLEND}/${BLEND}.conf &&
+ . ${CONFBASE}/${BLEND}/${BLEND}.conf
if [ -n "${DBBACKEND}" ]; then
set -e
- checkDIS ${DIS} || disFail $? "Debian Integrated Solution ${DIS} does not exist"
+ checkBlend ${BLEND} || blendFail $? "Debian Pure Blend ${BLEND} does not exist"
if [ "${ACTION}" = "add" ]; then
- checkDIS ${DIS} || disFail $? "DIS ${DIS} does not exist"
- checkRole ${ROLE} && disFail $? "Role ${ROLE} currently exist"
- checkRoleInDIS ${DIS} ${ROLE} || \
- disFail $? "DIS (${DIS}) and Role (${ROLE}) are not correct or incompatible with the selected backend"
+ checkBlend ${BLEND} || blendFail $? "Blend ${BLEND} does not exist"
+ checkRole ${ROLE} && blendFail $? "Role ${ROLE} currently exist"
+ checkRoleInBlend ${BLEND} ${ROLE} || \
+ blendFail $? "Blend (${BLEND}) and Role (${ROLE}) are not correct or incompatible with the selected backend"
- addRole ${DIS} ${ROLE} || \
- disFail $? "Failed to add role ${ROLE}"
+ addRole ${BLEND} ${ROLE} || \
+ blendFail $? "Failed to add role ${ROLE}"
elif [ "${ACTION}" = "del" ]; then
- checkDIS ${DIS} || disFail $? "DIS ${DIS} doesn't exist"
- checkRole ${ROLE} || disFail $? "Role ${ROLE} doesn't exist"
- checkRoleInDIS ${DIS} ${ROLE} || \
- disFail $? "DIS (${DIS} and Role (${ROLE}) are not correct"
-
- delRole ${DIS} ${ROLE} || \
- disFail $? "Failed to remove role ${ROLE}"
- disLog Role ${ROLE} successfully registered in DIS ${DIS}
+ checkBlend ${BLEND} || blendFail $? "Blend ${BLEND} doesn't exist"
+ checkRole ${ROLE} || blendFail $? "Role ${ROLE} doesn't exist"
+ checkRoleInBlend ${BLEND} ${ROLE} || \
+ blendFail $? "Blend (${BLEND} and Role (${ROLE}) are not correct"
+
+ delRole ${BLEND} ${ROLE} || \
+ blendFail $? "Failed to remove role ${ROLE}"
+ blendLog Role ${ROLE} successfully registered in Blend ${BLEND}
fi
set +e
else
# EX_USAGE
- disFail 67 "You chose to not use Roles"
+ blendFail 67 "You chose to not use Roles"
fi
Copied: cdd/trunk/blends/blend-role.8 (from r1194, cdd/trunk/blends/dis-role.8)
==============================================================================
--- cdd/trunk/blends/dis-role.8 (original)
+++ cdd/trunk/blends/blend-role.8 Sun Nov 2 16:10:33 2008
@@ -1,13 +1,13 @@
-.TH dis-user 8 "2008/08/17" "" "Debian Integrated Solutions"
+.TH blend-user 8 "2008/11/02" "" "Debian Pure Blends"
.SH NAME
-.B dis-role
-\- add/remove roles in registered Debian Integrated Solution
+.B blend-role
+\- add/remove roles in registered Debian Pure Blend
.SH SYNOPSIS
-.B dis-user
+.B blend-user
.B add|del
<
-.B DIS
+.B Blend
>
[<
.B Role
@@ -17,26 +17,26 @@
Add/remove (register/unregister)
.B Role
for the specified
-.B DIS
+.B Blend
If
.B Role
is not specified, it's assumed to be named like
-.B DIS
+.B Blend
.SH OPTIONS
.TP
-.B DIS
-- a registered Debian Integrated Solution in /etc/dis, of example one of
-.I med
+.B Blend
+- a registered Debian Pure Blend in /etc/blends, of example one of
+.I edu
,
-.I junior
+.I gis
,
-.I desktop
+.I junior
,
-.I edu
+.I med
or
-.I demudi
+.I science
.SH AUTHOR
Andreas Tille <tille at debian.org>
More information about the Cdd-commits
mailing list