[Cdd-commits] r1142 - in cdd/trunk: blends/etc/blends blends/etc/dis blends/examples blends/examples/config blends/examples/debian blends/examples/install blends/examples/install/task1 blends/examples/menu blends/examples/menu/task1 blends/examples/tasks blends/share/blends blends/share/blends/unixgroups blends/share/dis blends/share/menu webtools
CDD Subversion Commit
noreply at alioth.debian.org
Sun Oct 26 06:15:36 UTC 2008
Author: tille
Date: Sun Oct 26 06:15:36 2008
New Revision: 1142
Added:
cdd/trunk/blends/etc/blends/
- copied from r1137, cdd/trunk/blends/etc/dis/
cdd/trunk/blends/etc/blends/blends.conf
- copied, changed from r1137, cdd/trunk/blends/etc/dis/dis.conf
cdd/trunk/blends/share/blends/
- copied from r1137, cdd/trunk/blends/share/dis/
cdd/trunk/blends/share/blends/blend-actions
- copied, changed from r1137, cdd/trunk/blends/share/dis/dis-actions
cdd/trunk/blends/share/blends/blend-update-menus
- copied, changed from r1137, cdd/trunk/blends/share/dis/dis-update-menus
cdd/trunk/blends/share/blends/blend-utils
- copied, changed from r1137, cdd/trunk/blends/share/dis/dis-utils
cdd/trunk/blends/share/menu/blend-menu
- copied, changed from r1137, cdd/trunk/blends/share/menu/dis-menu
Removed:
cdd/trunk/blends/etc/blends/dis.conf
cdd/trunk/blends/etc/dis/
cdd/trunk/blends/share/blends/dis-actions
cdd/trunk/blends/share/blends/dis-update-menus
cdd/trunk/blends/share/blends/dis-utils
cdd/trunk/blends/share/dis/
cdd/trunk/blends/share/menu/dis-menu
Modified:
cdd/trunk/blends/examples/Makefile
cdd/trunk/blends/examples/README
cdd/trunk/blends/examples/config/README
cdd/trunk/blends/examples/config/common.1
cdd/trunk/blends/examples/config/conf
cdd/trunk/blends/examples/config/control
cdd/trunk/blends/examples/debian/README
cdd/trunk/blends/examples/debian/compat
cdd/trunk/blends/examples/debian/control.stub
cdd/trunk/blends/examples/debian/dis-task1.install
cdd/trunk/blends/examples/debian/dis-task1.manpages
cdd/trunk/blends/examples/debian/rules
cdd/trunk/blends/examples/install/README
cdd/trunk/blends/examples/install/task1/extra-script-which-is-needed-in-task1.1
cdd/trunk/blends/examples/menu/README
cdd/trunk/blends/examples/menu/task1/README
cdd/trunk/blends/examples/menu/task1/dep1.menu
cdd/trunk/blends/examples/menu/task1/dep2.txt
cdd/trunk/blends/examples/tasks/README
cdd/trunk/blends/examples/tasks/task1
cdd/trunk/blends/share/blends/unixgroups/dis-actions
cdd/trunk/webtools/bugs.py
Log:
Commiting several changes of renaming and enhancing comments. SVN seems to have trouble when trying to rename a file in renamed subsubdirectories.
Copied: cdd/trunk/blends/etc/blends/blends.conf (from r1137, cdd/trunk/blends/etc/dis/dis.conf)
==============================================================================
--- cdd/trunk/blends/etc/dis/dis.conf (original)
+++ cdd/trunk/blends/etc/blends/blends.conf Sun Oct 26 06:15:36 2008
@@ -1,8 +1,7 @@
-
# unset it if no DBBACKEND is wanted (no use of Roles)
DBBACKEND=unixgroups
-SHAREDIR=${SHAREDIR:-/usr/share/dis}
+SHAREDIR=${SHAREDIR:-/usr/share/blends}
# unset (NOT set it to false!) for disable dryrun
#DRYRUN=true
@@ -11,8 +10,8 @@
#DEBUG=1
# Utility functions, backend indep
-. ${SHAREDIR}/dis-utils
-. ${SHAREDIR}/dis-actions
+. ${SHAREDIR}/blends-utils
+. ${SHAREDIR}/blends-actions
# actual action performed by choosen backend
-. ${SHAREDIR}/${DBBACKEND}/dis-actions
+. ${SHAREDIR}/${DBBACKEND}/blends-actions
Modified: cdd/trunk/blends/examples/Makefile
==============================================================================
--- cdd/trunk/blends/examples/Makefile (original)
+++ cdd/trunk/blends/examples/Makefile Sun Oct 26 06:15:36 2008
@@ -1,12 +1,12 @@
#!/usr/bin/make -f
-DISMAKEFILE=/usr/share/dis-dev/Makefile
+BLENDMAKEFILE=/usr/share/blends-dev/Makefile
-CheckDISMakefile := $(shell if [ -e $(DISMAKEFILE) ] ; then echo 1 ; else echo 0 ; fi)
-ifeq ($(CheckDISMakefile),1)
- include $(DISMAKEFILE)
+CheckBlendMakefile := $(shell if [ -e $(BLENDMAKEFILE) ] ; then echo 1 ; else echo 0 ; fi)
+ifeq ($(CheckBlendMakefile),1)
+ include $(BLENDMAKEFILE)
else
- err := $(shell echo "$(DISMAKEFILE) is missing. Please install dis-dev package!")
+ err := $(shell echo "$(BLENDMAKEFILE) is missing. Please install blends-dev package!")
endif
dummy:
Modified: cdd/trunk/blends/examples/README
==============================================================================
--- cdd/trunk/blends/examples/README (original)
+++ cdd/trunk/blends/examples/README Sun Oct 26 06:15:36 2008
@@ -1,5 +1,4 @@
-This is an example directory layout for building meta packages for a
-Custom Debian Distribution with the name Debian-_DIS_. So search for the
-string _DIS_ and replacing it with a real name would provide a basic
+This is an example directory layout for building metapackages for a
+Debian Pure Blend with the name Debian-_BLEND_. So search for the
+string _BLEND_ and replacing it with a real name would provide a basic
skeleton to work with.
-
Modified: cdd/trunk/blends/examples/config/README
==============================================================================
--- cdd/trunk/blends/examples/config/README (original)
+++ cdd/trunk/blends/examples/config/README Sun Oct 26 06:15:36 2008
@@ -1,2 +1,2 @@
-If this directory exists a _DIS_-common package is created.
+If this directory exists a _BLEND_-common package is created.
See for instance Debian Med packages.
Modified: cdd/trunk/blends/examples/config/common.1
==============================================================================
--- cdd/trunk/blends/examples/config/common.1 (original)
+++ cdd/trunk/blends/examples/config/common.1 Sun Oct 26 06:15:36 2008
@@ -1,17 +1,17 @@
-.TH _DIS_-common 1 "May 24, 2002" "Debian-_DIS_"
+.TH _BLEND_-common 1 "October 24, 2008" "Debian-_BLEND_"
.SH NAME
-.B _DIS_-common
-.B _DIS_-<metapackage_name>
+.B _BLEND_-common
+.B _BLEND_-<metapackage_name>
\- package information and auto-apt helper
.SH SYNOPSIS
-.B _DIS_-common
-.B _DIS_-<metapackage_name>
+.B _BLEND_-common
+.B _BLEND_-<metapackage_name>
.SH DESCRIPTION
-Print just a simple information page about every _DIS_-* package
-of the Debian _DIS_ Debian Integrated Solution. Each metapackage has a
-.I /usr/bin/_DIS_-<metapackage_name>
+Print just a simple information page about every _BLEND_-* package
+of the Debian _BLEND_ Blend. Each metapackage has a
+.I /usr/bin/_BLEND_-<metapackage_name>
file which should print some usefull informations and could be serve
as auto-apt helper.
Modified: cdd/trunk/blends/examples/config/conf
==============================================================================
--- cdd/trunk/blends/examples/config/conf (original)
+++ cdd/trunk/blends/examples/config/conf Sun Oct 26 06:15:36 2008
@@ -1,6 +1,6 @@
-## This is a configuration file for Debian-med Debian Integrated Solution
-## It is read after /etc/dis/dis.conf and can override or add variables
+## This is a configuration file for the Debian _BLEND_ Blend
+## It is read after /etc/blends/blends.conf and can override or add variables
-## Some DISs do not build their name generic like Debian-#DIS# so
+## Some Blends do not build their name generic like Debian #BLEND# so
## we need the correct name here
-DISNAME=Debian-_DIS_
+BLENDNAME=Debian-_BLEND_
Modified: cdd/trunk/blends/examples/config/control
==============================================================================
--- cdd/trunk/blends/examples/config/control (original)
+++ cdd/trunk/blends/examples/config/control Sun Oct 26 06:15:36 2008
@@ -1,7 +1,6 @@
-Package: _DIS_-config
+Package: _BLEND_-config
Architecture: all
-Depends: adduser, ${misc:Depends}, menu, dis-common (>= 0.6)
-Description: Debian-_DIS_ Project config package
+Depends: adduser, ${misc:Depends}, menu, blends-common (>= 0.6)
+Description: Debian _BLEND_ Project config package
This package builds the basic infra structure of all metapackages
- for the Debian-_DIS_ Debian Integrated Solution.
-
+ for the Debian _BLEND_ Blend.
Modified: cdd/trunk/blends/examples/debian/README
==============================================================================
--- cdd/trunk/blends/examples/debian/README (original)
+++ cdd/trunk/blends/examples/debian/README Sun Oct 26 06:15:36 2008
@@ -1,3 +1,3 @@
You always need this directory to build metapackages.
-Just change control.stub and replace the variables _DIS_ and
+Just change control.stub and replace the variables _BLEND_ and
_MAINTAINER_ to the apropriate strings.
Modified: cdd/trunk/blends/examples/debian/compat
==============================================================================
--- cdd/trunk/blends/examples/debian/compat (original)
+++ cdd/trunk/blends/examples/debian/compat Sun Oct 26 06:15:36 2008
@@ -1 +1 @@
-5
+6
Modified: cdd/trunk/blends/examples/debian/control.stub
==============================================================================
--- cdd/trunk/blends/examples/debian/control.stub (original)
+++ cdd/trunk/blends/examples/debian/control.stub Sun Oct 26 06:15:36 2008
@@ -1,10 +1,10 @@
-Source: debian-_DIS_
+Source: debian-_BLEND_
Section: misc
Priority: extra
Maintainer: _MAINTAINER_ <_maintainer_ at debian.org>
Uploaders: _OPTIONAL-FURTHER-MAINTAINER_ <_optional-further-maintainer_ at debian.org>
-Build-Depends-Indep: debhelper (>= 6.0.7), dis-dev
+Build-Depends-Indep: debhelper (>= 6.0.7), blends-dev
Standards-Version: 3.8.0
-Package: _DIS_
+Package: _BLEND_
Architecture: all
Modified: cdd/trunk/blends/examples/debian/dis-task1.install
==============================================================================
--- cdd/trunk/blends/examples/debian/dis-task1.install (original)
+++ cdd/trunk/blends/examples/debian/dis-task1.install Sun Oct 26 06:15:36 2008
@@ -1,3 +1,2 @@
### this file is optional and only needed if the install directory is needed
install/task1/extra-script-which-is-needed-in-task1 usr/bin
-
Modified: cdd/trunk/blends/examples/debian/dis-task1.manpages
==============================================================================
--- cdd/trunk/blends/examples/debian/dis-task1.manpages (original)
+++ cdd/trunk/blends/examples/debian/dis-task1.manpages Sun Oct 26 06:15:36 2008
@@ -1,3 +1,2 @@
### this file is optional and only needed if the install directory is needed
install/task1/extra-script-which-is-needed-in-task1.1
-
Modified: cdd/trunk/blends/examples/debian/rules
==============================================================================
--- cdd/trunk/blends/examples/debian/rules (original)
+++ cdd/trunk/blends/examples/debian/rules Sun Oct 26 06:15:36 2008
@@ -1,3 +1,3 @@
#!/usr/bin/make -f
-include /usr/share/dis-dev/rules
+include /usr/share/blends-dev/rules
Modified: cdd/trunk/blends/examples/install/README
==============================================================================
--- cdd/trunk/blends/examples/install/README (original)
+++ cdd/trunk/blends/examples/install/README Sun Oct 26 06:15:36 2008
@@ -1,9 +1,9 @@
-If some extra files like scripts of manpages are needed in the meta packages
-the should be placed into apropriate subdirectories of this directory.
-While there is no certain procedure in the dis-dev tools to handle files
-in this directory it might be a good idea to settle down with some
-default place for those extra files. To move them right into place
-the files debian/<pkg>.install, debian/<pkg>.manpages etc. should
-be used.
+If some extra files like scripts of manpages are needed in the
+metapackages they should be placed into apropriate subdirectories of
+this directory. While there is no certain procedure in the blends-dev
+tools to handle files in this directory it might be a good idea to
+settle down with some default place for those extra files. To move
+them right into place the files debian/<pkg>.install,
+debian/<pkg>.manpages etc. should be used.
See for instance Debian Med packages.
Modified: cdd/trunk/blends/examples/install/task1/extra-script-which-is-needed-in-task1.1
==============================================================================
--- cdd/trunk/blends/examples/install/task1/extra-script-which-is-needed-in-task1.1 (original)
+++ cdd/trunk/blends/examples/install/task1/extra-script-which-is-needed-in-task1.1 Sun Oct 26 06:15:36 2008
@@ -1,4 +1,4 @@
-.TH extra-script-which-is-needed-in-task1 1 "<date>" "#DIS#"
+.TH extra-script-which-is-needed-in-task1 1 "<date>" "#BLEND#"
.SH NAME
.B extra-script-which-is-needed-in-task1
\- some useful script for task1
Modified: cdd/trunk/blends/examples/menu/README
==============================================================================
--- cdd/trunk/blends/examples/menu/README (original)
+++ cdd/trunk/blends/examples/menu/README Sun Oct 26 06:15:36 2008
@@ -1,24 +1,26 @@
-If this directory exists, menu entries for the single meta packages can
-be provided here. The files should have the same name as the files in the
-tasks directory and ideally each single task should have its own menu.
+If this directory exists, menu entries for the single metapackages can
+be provided here. The files should have the same name as the files in
+the tasks directory and ideally each single task should have its own
+menu.
See for instance Debian Med packages.
-In general a meta package should provide a menu for every dependent package.
-This menu entry should either point to a package executable (perhaps with
-some special hints assigned) or to a pager call which proveides some extra
-information how the special package can be used. For instance this can be
-done via text files /usr/share/doc/_DIS_task1/deppkg1.txt (see Debian-Med).
+In general a metapackage should provide a menu for every dependent
+package. This menu entry should either point to a package executable
+(perhaps with some special hints assigned) or to a pager call which
+provides some extra information how the special package can be used.
+For instance this can be done via text files
+/usr/share/doc/_BLEND_task1/deppkg1.txt (see Debian Med).
-The idea is to provide a special _DIS_ menu with the relevant parts for
-the users of the _DIS_.
+The idea is to provide a special _BLEND_ menu with the relevant parts
+for the users of the _BLEND_.
-At install time the existing dependencies are checked for their
-menu entries. These are tekan over into the user menu. If the
-meta package maintainer wants to override this entry he is able
-to provide menu/<task>/<dep>.menu files. If there is no reasonable
-menu entry for a package extra documentation can be provided which
-can be viewed via menu entries. This can either be given as plain
-text files menu/<task>/<dep>.txt or HTML files menu/<task>/<dep>.html.
-The created menu entry calls sensible-pager or sensible-browser,
+At install time the existing dependencies are checked for their menu
+entries. These are taken over into the user menu. If the metapackage
+maintainer wants to override this entry he is able to provide
+menu/<task>/<dep>.menu files. If there is no reasonable menu entry
+for a package extra documentation can be provided which can be viewed
+via menu entries. This can either be given as plain text files
+menu/<task>/<dep>.txt or HTML files menu/<task>/<dep>.html. The
+created menu entry calls sensible-pager or sensible-browser,
respectively.
Modified: cdd/trunk/blends/examples/menu/task1/README
==============================================================================
--- cdd/trunk/blends/examples/menu/task1/README (original)
+++ cdd/trunk/blends/examples/menu/task1/README Sun Oct 26 06:15:36 2008
@@ -3,9 +3,9 @@
Sometimes it is not possible to provide a useful menu entry for a
package and thus we would fail to create a menu entry for a dependency
-inside a metapackage. This sucks in term of user support and thus
-it is strongly suggested to provide some information about each
-dependant package which has no reasonable menu entry.
+inside a metapackage. This sucks in term of user support and thus it
+is strongly suggested to provide some information about each dependant
+package which has no reasonable menu entry.
This can easily done by creating a text file with the name of the
dependency, i.e. dep2.txt. Alternatively you can provide HTML
Modified: cdd/trunk/blends/examples/menu/task1/dep1.menu
==============================================================================
--- cdd/trunk/blends/examples/menu/task1/dep1.menu (original)
+++ cdd/trunk/blends/examples/menu/task1/dep1.menu Sun Oct 26 06:15:36 2008
@@ -1,5 +1,5 @@
?package(dep1): needs = "X11" \
- section = "_DIS_/Task1" \
+ section = "_BLEND_/Task1" \
title = "DepPkg1" \
command = "/usr/bin/deppkg1" \
hints = "Use of DepPkg1"
Modified: cdd/trunk/blends/examples/menu/task1/dep2.txt
==============================================================================
--- cdd/trunk/blends/examples/menu/task1/dep2.txt (original)
+++ cdd/trunk/blends/examples/menu/task1/dep2.txt Sun Oct 26 06:15:36 2008
@@ -1,6 +1,6 @@
dep2: Short description of package dep2
-Some information about dep2 from the Debian-_DIS_ project.
+Some information about dep2 from the Debian-_BLEND_ project.
long description of dep2
Modified: cdd/trunk/blends/examples/tasks/README
==============================================================================
--- cdd/trunk/blends/examples/tasks/README (original)
+++ cdd/trunk/blends/examples/tasks/README Sun Oct 26 06:15:36 2008
@@ -1,4 +1,4 @@
This directory is mandatory. Each file had to follow a certain syntax
-to build a valid control file entry for the meta package to build.
+to build a valid control file entry for the metapackage to build.
-For an extensive and working example see Debian-Med packages >= 0.8.9 .
+For an extensive and working example see Debian Med packages >= 1.0 .
Modified: cdd/trunk/blends/examples/tasks/task1
==============================================================================
--- cdd/trunk/blends/examples/tasks/task1 (original)
+++ cdd/trunk/blends/examples/tasks/task1 Sun Oct 26 06:15:36 2008
@@ -1,7 +1,7 @@
Task: task1
-Description: Debian-_DIS_ task1 packages
- This meta package will install Debian packages for use in
- task1 of Debian-_DIS_.
+Description: Debian-_BLEND_ task1 packages
+ This metapackage will install Debian packages for use in
+ task1 of Debian-_BLEND_.
Depends: dep-pkg1, dep-pkg2, ...
Suggests: sug-pkg1, ...
@@ -11,7 +11,7 @@
Responsible: Somebody who cares
NeedConfig: no / yes via debconf
-Depends: _DIS_-common
-Why: Reason for dependency of the _DIS_common package
-Responsible: _DIS_Maintainer
-NeedConfig: yes via debconf
+Depends: _BLEND_-common
+Why: Optional reason for dependency of the _BLEND_-common package
+Responsible: Optional _BLEND_Maintainer
+NeedConfig: Optional yes via debconf
Copied: cdd/trunk/blends/share/blends/blend-actions (from r1137, cdd/trunk/blends/share/dis/dis-actions)
==============================================================================
--- cdd/trunk/blends/share/dis/dis-actions (original)
+++ cdd/trunk/blends/share/blends/blend-actions Sun Oct 26 06:15:36 2008
@@ -1,18 +1,18 @@
# $Id$
#
-# Backend independant functions for dis package
+# Backend independant functions for blends package
#
# For error codes check in /usr/include/sysexits.h
# CHECK Functions
-# checks if DIS $1 exists as a DIS
-checkDIS() {
+# checks if Blend $1 exists as a Blend
+CheckBlend() {
RET=0
- DIS=$1
+ BLEND=$1
if [ $# -ne 1 ]; then
RET=64 # EX_USAGE
- elif ! [ -d ${CONFBASE}/`toLower ${DIS}` ]; then
+ elif ! [ -d ${CONFBASE}/`toLower ${BLEND}` ]; then
RET=67 # EX_NOUSER
fi
return ${RET}
@@ -20,32 +20,32 @@
# GET Functions
-# echos a blank-space separated list of DISs registered into DIS subsystem
-getDISList() {
+# echos a space separated list of Blends registered into Blend subsystem
+getBlendList() {
# print out dir in CONFBASE and stript last space added by printf
find ${CONFBASE} -mindepth 1 -maxdepth 1 -not -name CVS -type d -printf "%f " | sed s/.$/\\n/g
}
-# echoes a list of DBBACKEND for DIS present in the current system
+# echoes a list of DBBACKEND for Blend present in the current system
getBackendList() {
find ${SHAREDIR} -mindepth 1 -maxdepth 1 \
-not -name CVS -and -not -name menu \
-type d -printf "%f " | sed s/.$/\\n/g
}
-# is user registered in at least one DIS?
-# it's a kludgy way :(, run a subshell and iterate on every registered DIS
-# checking if a user covers a Role in that DIS.
+# is user registered in at least one Blend?
+# it's a kludgy way :(, run a subshell and iterate on every registered Blend
+# checking if a user covers a Role in that Blend.
isUserRegistered() {
RET=1 # return false
- DISUSER=$1
+ BLENDUSER=$1
- for DIS in `getDISList`; do
+ for BLEND in `getBlendList`; do
# Run a subshell as a environment sandbox
- ( test -f ${CONFBASE}/${DIS}/${DIS}.conf &&
- . ${CONFBASE}/${DIS}/${DIS}.conf
- . ${SHAREDIR}/${DBBACKEND}/dis-actions
- checkUserInDIS ${DIS} ${DISUSER} && exit 0
+ ( test -f ${CONFBASE}/${BLEND}/${BLEND}.conf &&
+ . ${CONFBASE}/${BLEND}/${BLEND}.conf
+ . ${SHAREDIR}/${DBBACKEND}/blend-actions
+ checkUserInBlend ${BLEND} ${BLENDUSER} && exit 0
) && RET=0 && break
done
return ${RET}
Copied: cdd/trunk/blends/share/blends/blend-update-menus (from r1137, cdd/trunk/blends/share/dis/dis-update-menus)
==============================================================================
--- cdd/trunk/blends/share/dis/dis-update-menus (original)
+++ cdd/trunk/blends/share/blends/blend-update-menus Sun Oct 26 06:15:36 2008
@@ -10,17 +10,17 @@
# The following scripts have historical reasons and are currently not
# used any more. The complete text might be found in version 0.3 of
# the scripts.
-# updates user's menu for user $1, indipendently from any DIS
+# updates user's menu for user $1, indipendently from any Blend
updateUser() {
RET=0
SYSUSER=$1
return ${RET}
}
-# updates menu scripts for any user registered in DIS
-updateDIS() {
+# updates menu scripts for any user registered in Blend
+updateBlend() {
RET=0
- DIS=$1
+ BLEND=$1
return ${RET}
}
Copied: cdd/trunk/blends/share/blends/blend-utils (from r1137, cdd/trunk/blends/share/dis/dis-utils)
==============================================================================
--- cdd/trunk/blends/share/dis/dis-utils (original)
+++ cdd/trunk/blends/share/blends/blend-utils Sun Oct 26 06:15:36 2008
@@ -6,13 +6,13 @@
}
# log (typically echos on stdout)
-disLog() {
+blendLog() {
echo $@
return 0
}
# log error (typically echos on stderr)
-disErr() {
+blendErr() {
RET=$1
shift
echo "err ${RET}: $@" > /dev/stderr
@@ -20,7 +20,7 @@
}
# log on stderr for debug outputs
-disDebug() {
+blendDebug() {
test -n "${DEBUG}" && echo "debug: $@" > /dev/stderr
return 0
}
@@ -28,7 +28,7 @@
# log error and return a fail code $1
-disFail() {
+blendFail() {
RET=$1
shift
echo "err ${RET}: $@" > /dev/stderr
Modified: cdd/trunk/blends/share/blends/unixgroups/dis-actions
==============================================================================
--- cdd/trunk/blends/share/dis/unixgroups/dis-actions (original)
+++ cdd/trunk/blends/share/blends/unixgroups/dis-actions Sun Oct 26 06:15:36 2008
@@ -1,12 +1,12 @@
# $Id$
#
-# Backend dependant functions for dis package
+# Backend dependant functions for blends package
#
# For error codes check in /usr/include/sysexits.h
# CHECK Functions
-#checkDIS() is backend indep, and is defined in ${SHAREDIR}/dis-action
+#checkBlend() is backend indep, and is defined in ${SHAREDIR}/blend-actions
# Read adduser config to find out from which ID normal users start
# Default = 1000
@@ -16,17 +16,17 @@
# checks if User $1 exists as a system user
checkUser() {
RET=0
- DISUSER=$1
+ BLENDUSER=$1
if [ $# -ne 1 ]; then
RET=64 # EX_USAGE
- elif ! getent passwd "${DISUSER}" > /dev/null; then
+ elif ! getent passwd "${BLENDUSER}" > /dev/null; then
RET=67 # EX_NOUSER
fi
return ${RET}
}
# checks if Role $1 is registered into system
-# actually a mere check if Unix group, named like the DIS project, exists
+# actually a mere check if Unix group, named like the Blend, exists
checkRole() {
RET=0
ROLE=$1
@@ -39,59 +39,59 @@
}
-# check if DIS ($1) has registered Role ($2)
-# (or, in other words, if Role has been registerd in DIS)
-checkRoleInDIS() {
+# check if Blend ($1) has registered Role ($2)
+# (or, in other words, if Role has been registerd as Debian Pure Blend)
+checkRoleInBlend() {
RET=0
- DIS=$1
+ BLEND=$1
ROLE=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
- # currently there is no way to extract a Role from a DIS if
+ # currently there is no way to extract a Role from a Blend if
# they're named differently, using unixgroups backend
- elif [ "${DIS}" != "${ROLE}" ]; then
+ elif [ "${BLEND}" != "${ROLE}" ]; then
RET=69 # EX_UNAVAILABLE
fi
return ${RET}
}
-# checks if user $2 is registered in DIS $1
-checkUserInDIS() {
+# checks if user $2 is registered in Blend $1
+checkUserInBlend() {
RET=0
- DIS=$1
- DISUSER=$2
+ BLEND=$1
+ BLENDUSER=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
- # currently the only way to check if user is registered in a DIS is check
- # if he/she covers any role the DIS, using unixgroups backend
- elif [ -z "`getUserRoles ${DIS} ${DISUSER}`" ]; then
- RET=1 # user has no role, so is not registered in DIS
+ # currently the only way to check if user is registered in a Blend
+ # is check he covers any role the Blend, using unixgroups backend
+ elif [ -z "`getUserRoles ${BLEND} ${BLENDUSER}`" ]; then
+ RET=1 # user has no role, so is not registered in Blend
fi
return ${RET}
}
# GET Functions
-# getDISList() is backend indep and is defined in ${SHAREDIR}/dis-action
+# getBlendList() is backend indep and is defined in ${SHAREDIR}/blend-actions
-# echos the roles registered by DIS
+# echos the roles registered by Blend
# for Unix groups backend, it's actually the identity function
-getDISRoleList() {
+getBlendRoleList() {
RET=0
- DIS=$1
+ BLEND=$1
if [ "$#" -ne 1 ]; then
RET=64 # EX_USAGE
else
- checkRole ${DIS} && echo ${DIS}
+ checkRole ${BLEND} && echo ${BLEND}
fi
return ${RET}
}
-# echoes list of users having role $2 in DIS $1
+# echoes list of users having role $2 in Blend $1
# if $4 exists use ',' as separator between user names
getUsersInRole() {
RET=0
- DIS=$1
+ BLEND=$1
ROLE=$2
SIMPLE=$3
USERS=""
@@ -153,23 +153,23 @@
fi
return ${RET}
}
-# echo all Role covered by user $2 in DIS $1
+# echo all Role covered by user $2 in Blend $1
getUserRoles() {
RET=0
- DIS=$1
- DISUSER=$2
+ BLEND=$1
+ BLENDUSER=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
else
- DISROLES=`getDISRoleList ${DIS}`
+ BLENDROLES=`getBlendRoleList ${BLEND}`
ROLES=""
- for ROLE in ${DISROLES}; do
- for USER in `getUsersInRole ${DIS} ${ROLE} 1`; do
- test "${USER}" == "${DISUSER}" && \
+ for ROLE in ${BLENDROLES}; do
+ for USER in `getUsersInRole ${BLEND} ${ROLE} 1`; do
+ test "${USER}" == "${BLENDUSER}" && \
ROLES="${ROLES} ${ROLE}"
done
done
- disDebug "getUserRoles(): roles covered by user ${DISUSER} in DIS ${DIS}: ${ROLES}"
+ blendDebug "getUserRoles(): roles covered by user ${BLENDUSER} in Debian Pure Blend ${BLEND}: ${ROLES}"
echo ${ROLES}
fi
return ${RET}
@@ -179,12 +179,12 @@
# echos the home directory of the system user
getUserHome() {
RET=0
- DISUSER=$1
+ BLENDUSER=$1
if [ "$#" -ne 1 ]; then
RET=64 # EX_USAGE
else
- if checkUser ${DISUSER}; then
- getent passwd ${DISUSER} | sed "s/.*:\([^:]*\):[^:]*$/\1/"
+ if checkUser ${BLENDUSER}; then
+ getent passwd ${BLENDUSER} | sed "s/.*:\([^:]*\):[^:]*$/\1/"
RET=$?
else
RET=67 # EX_NOUSER
@@ -198,11 +198,11 @@
# ADD/SET functions
-# adds role $2 to current unix groups for the specified DIS $1, as a system
+# adds role $2 to current unix groups for the specified Blend $1, as a system
# dynamic allocated group
addRole() {
RET=0
- DIS=$1
+ BLEND=$1
ROLE=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
@@ -217,10 +217,10 @@
return ${RET}
}
-# set user $2 to have role $3, for the specified DIS $1
+# set user $2 to have role $3, for the specified Blend $1
setUserRole() {
RET=0
- DIS=$1
+ BLEND=$1
USER=$2
ROLE=$3
if [ "$#" -ne 3 ]; then
@@ -234,11 +234,11 @@
# DEL/USET Functions
-# remove role $2 for the specified DIS $1 from current unix groups, as a
+# remove role $2 for the specified Blend $1 from current unix groups, as a
# system dynamic allocated group
delRole() {
RET=0
- DIS=$1
+ BLEND=$1
ROLE=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
@@ -254,19 +254,19 @@
}
-# unset user $2 from having role $3, for the specified DIS $1
+# unset user $2 from having role $3, for the specified Blend $1
unsetUserRole() {
RET=0
- DIS=$1
- DISUSER=$2
+ BLEND=$1
+ BLENDUSER=$2
ROLE=$3
- # Make sure DISUSER and ROLE are BOTH defined,
+ # Make sure BLENDUSER and ROLE are BOTH defined,
# to avoid disasters using deluser
if [ "$#" -ne 3 ]; then
RET=64 # EX_USAGE
else
- if checkUser "${DISUSER}"; then
- ${DRYRUN} deluser "${DISUSER}" "${ROLE}"
+ if checkUser "${BLENDUSER}"; then
+ ${DRYRUN} deluser "${BLENDUSER}" "${ROLE}"
RET=$?
else
RET=67 # EX_NOUSER
Copied: cdd/trunk/blends/share/menu/blend-menu (from r1137, cdd/trunk/blends/share/menu/dis-menu)
==============================================================================
--- cdd/trunk/blends/share/menu/dis-menu (original)
+++ cdd/trunk/blends/share/menu/blend-menu Sun Oct 26 06:15:36 2008
@@ -1,31 +1,31 @@
#!/bin/bash
-# Script to handle menu profiles for DIS subsystem, installed by your system
-# administrator via dis-common package.
+# Script to handle menu profiles for Debian Pure Blends subsystem, installed
+# by your system administrator via blends-common package.
#
# It prints on STDOUT Debian menu entries for user
-CONFBASE=${CONFBASE:-/etc/dis}
+CONFBASE=${CONFBASE:-/etc/blends}
-# read generic DIS conf ... in case it exists
+# read generic Blends conf ... in case it exists
# Since menu 2.1.39 triggers are used to run update-menus for every change
-# in /usr/{lib,share}/menu - which fails finding ${CONFBASE}/dis.conf in
-# case you are installing dis-common the first time. I do not regard this
+# in /usr/{lib,share}/menu - which fails finding ${CONFBASE}/blends.conf in
+# case you are installing blends-common the first time. I do not regard this
# as a reasonable behaviour because it is a real performance loss and
-# obviousely error prone (for instance in case of dis-common (see #484167)
+# obviousely error prone (for instance in case of blends-common (see #484167)
# but we have to deal with this somehow
-if [ -s "${CONFBASE}/dis.conf" ] ; then
- . ${CONFBASE}/dis.conf
+if [ -s "${CONFBASE}/blends.conf" ] ; then
+ . ${CONFBASE}/blends.conf
else
exit 0
fi
-DISUSER=`whoami`
+BLENDUSER=`whoami`
-tasksdir=/usr/share/dis/tasks
+tasksdir=/usr/share/blends/tasks
# it has to be run only by unprivileged users via update-menus
-test "${DISUSER}" == "root" && exit 0
+test "${BLENDUSER}" == "root" && exit 0
# Upper case the first letter of a string to have a nicer menu
NameToUpper() {
@@ -60,26 +60,29 @@
return 0
}
-# Strip DIS-name from meta package name
+# Strip Blend name from metapackage name
+# FIXME: the Blend name does not necessarily match the metapackage
+# prefix. Example: education-* packages of Debian Edu
+# Proposed fix: Read Blend name from config file
GetTaskNameFromPackage () {
if [ $# -ne 2 ] ; then
RET=64 # EX_USAGE
return ${RET}
fi
- DIS=$1 # DIS - name
- PKG=$2 # meta package name
- echo $PKG | sed "s/^$DIS-//"
+ BLEND=$1 # Blend name
+ PKG=$2 # metapackage name
+ echo $PKG | sed "s/^${BLEND}-//"
return 0
}
-# Obtain task title which has to be defined in the meta package control templates
+# Obtain task title which has to be defined in the metapackage control templates
GetTaskTitle () {
if [ $# -ne 1 ] ; then
RET=64 # EX_USAGE
return ${RET}
fi
- PKG=$1 # meta package name
- cat "$tasksdir"/"$DIS"/`GetTaskNameFromPackage "$DIS" "$PKG"`
+ PKG=$1 # metapackage name
+ cat "$tasksdir"/"$BLEND"/`GetTaskNameFromPackage "$BLEND" "$PKG"`
return 0
}
@@ -89,9 +92,9 @@
RET=64 # EX_USAGE
return ${RET}
fi
- PKG="$DIS"-$1
+ PKG="$BLEND"-$1
TASK=`GetTaskTitle $PKG`
- SECTION=`NameToUpper "$DIS"`/`NameToUpper "$TASK"`
+ SECTION=`NameToUpper "$BLEND"`/`NameToUpper "$TASK"`
# find the list of Depends / Recommends / Suggests
DepPkgs=`dpkg --status "$PKG" | \
@@ -99,33 +102,33 @@
grep -v ^[A-CE-QT-Z] | \
grep -v ^S[eot] | \
sed -e "s/([^)]*)//" \
- -e "s/,* *${DIS}-config//" \
+ -e "s/,* *${BLEND}-config//" \
-e "s/^[^:]*: *//" \
-e "s/, */\\n/g" | \
sort | uniq`
- # check whether DIS-maintainer provided menu override different from
+ # check whether Blend maintainer provided menu override different from
# package maintainers menu file
# FIXME: This is outdated! The concept of menu files named like the
- # meta package is stopped in favour of single menu files named like
+ # metapackage is stopped in favour of single menu files named like
# the dependant package. The rationale is that you can get more
# fine grained replacements.
- dismenufile=""
+ blendmenufile=""
if [ -s "$HOME"/.menu/"$PKG" ] ; then
- dismenufile="$HOME"/.menu/"$PKG"
- elif [ -s /etc/dis/"$DIS"/menu/"$PKG" ] ; then
- dismenufile=/etc/dis/"$DIS"/menu/"$PKG"
- elif [ -s /usr/lib/dis/"$DIS"/menu/"$PKG" ] ; then
- dismenufile=/usr/lib/dis/"$DIS"/menu/"$PKG"
- elif [ -s /usr/share/dis/"$DIS"/menu/"$PKG" ] ; then
- dismenufile=/usr/share/dis/"$DIS"/menu/"$PKG"
+ blendmenufile="$HOME"/.menu/"$PKG"
+ elif [ -s /etc/blends/"$BLEND"/menu/"$PKG" ] ; then
+ blendmenufile=/etc/blends/"$BLEND"/menu/"$PKG"
+ elif [ -s /usr/lib/blends/"$BLEND"/menu/"$PKG" ] ; then
+ blendmenufile=/usr/lib/blends/"$BLEND"/menu/"$PKG"
+ elif [ -s /usr/share/blends/"$BLEND"/menu/"$PKG" ] ; then
+ blendmenufile=/usr/share/blends/"$BLEND"/menu/"$PKG"
fi
for pkg in $DepPkgs ; do
- # if DIS maintainer provided override just continue
- [ ! -z "$dismenufile" ] && grep -q -i "?package($pkg)" "$dismenufile" && continue
+ # if Blend maintainer provided override just continue
+ [ ! -z "$blendmenufile" ] && grep -q -i "?package($pkg)" "$blendmenufile" && continue
- # check for documentation text of DIS maintainer which should
+ # check for documentation text of Blend maintainer which should
# be prefered over package maintainers menu
docfile=""
if [ -s /usr/share/doc/"$PKG"/"$pkg".html ] ; then
@@ -135,7 +138,7 @@
elif [ -s /usr/share/doc/"$PKG"/"$pkg" ] ; then
docfile=/usr/share/doc/"$PKG"/"$pkg"
fi
- # if DIS maintainer provides documentation view this as menu entry ...
+ # if Blend maintainer provides documentation view this as menu entry ...
if [ ! -z "$docfile" -a -s "$docfile" ] ; then
hint=""
if file "$docfile" | grep -q HTML ; then
@@ -159,15 +162,15 @@
fi
# search for a menu file with the following priority
- # ${HOME}/.menu, /etc/menu, /usr/share/dis/${DIS}/menu, /usr/share/menu, /usr/lib/menu
+ # ${HOME}/.menu, /etc/menu, /usr/share/blends/${BLEND}/menu, /usr/share/menu, /usr/lib/menu
pkgmenufile=""
donotchange=1
if [ -s "$HOME"/.menu/"$pkg" ] ; then
pkgmenufile="$HOME"/.menu/"$pkg"
elif [ -s /etc/menu/"$pkg" ] ; then
pkgmenufile=/etc/menu/"$pkg"
- elif [ -s /usr/share/dis/"$DIS"/menu/"$pkg" ] ; then
- pkgmenufile=/usr/share/dis/"$DIS"/menu/"$pkg"
+ elif [ -s /usr/share/blends/"$BLEND"/menu/"$pkg" ] ; then
+ pkgmenufile=/usr/share/blends/"$BLEND"/menu/"$pkg"
donotchange=0
elif [ -s /usr/share/menu/"$pkg" ] ; then
pkgmenufile=/usr/share/menu/"$pkg"
@@ -195,31 +198,31 @@
echo
done
- [ -s "$dismenufile" ] && cat "$dismenufile"
+ [ -s "$blendmenufile" ] && cat "$blendmenufile"
}
-ALLDIS=`getDISList`
-for DIS in ${ALLDIS}; do
- # read per DIS conf
- test -f ${CONFBASE}/${DIS}/${DIS}.conf && \
- . ${CONFBASE}/${DIS}/${DIS}.conf
+ALLBLENDS=`getBlendList`
+for BLEND in ${ALLBLENDS}; do
+ # read per Blend conf
+ test -f ${CONFBASE}/${BLEND}/${BLEND}.conf && \
+ . ${CONFBASE}/${BLEND}/${BLEND}.conf
- if [ -d "$tasksdir"/"$DIS" ] ; then
- for PKG in `ls "$tasksdir"/"$DIS"` ; do
+ if [ -d "$tasksdir"/"$BLEND" ] ; then
+ for PKG in `ls "$tasksdir"/"$BLEND"` ; do
getMenuEntriesFromDependencies "$PKG"
done
fi
-# # print on STDOUT menu generic entries if user belongs to DIS
-# checkUserInDIS ${DIS} ${DISUSER} && \
-# test -d ${CONFBASE}/${DIS}/menu/ && \
-# find ${CONFBASE}/${DIS}/menu/ -maxdepth 1 -mindepth 1 -type f \
+# # print on STDOUT menu generic entries if user belongs to Blend
+# checkUserInBlend ${BLEND} ${BLENDUSER} && \
+# test -d ${CONFBASE}/${BLEND}/menu/ && \
+# find ${CONFBASE}/${BLEND}/menu/ -maxdepth 1 -mindepth 1 -type f \
# -exec cat {} \;
#
# # and role specific menu entries
-# for ROLE in `getUserRoles ${DIS} ${DISUSER}`; do
-# test -d ${CONFBASE}/${DIS}/menu/${ROLE} &&
-# find ${CONFBASE}/${DIS}/menu/${ROLE} -maxdepth 1 -mindepth 1 \
+# for ROLE in `getUserRoles ${BLEND} ${BLENDUSER}`; do
+# test -d ${CONFBASE}/${BLEND}/menu/${ROLE} &&
+# find ${CONFBASE}/${BLEND}/menu/${ROLE} -maxdepth 1 -mindepth 1 \
# -type f -exec cat {} \;
# done
done
Modified: cdd/trunk/webtools/bugs.py
==============================================================================
--- cdd/trunk/webtools/bugs.py (original)
+++ cdd/trunk/webtools/bugs.py Sun Oct 26 06:15:36 2008
@@ -30,7 +30,8 @@
self.nbugs = 0
self.done = [] # closed bugs
self.ndone = 0
-
+
+ print >>stderr, "DEBUG: src:", pkgname, "(%s)" % (pkgname)
bugs = bts.query('src:' + pkgname)
if bugs:
for bug in bugs:
@@ -84,7 +85,7 @@
data['taskskeys'] = cdeps.metapackagekeys
data['lang'] = 'en'
data['othertasks'] = _("Links to other tasks")
-data['taskslink'] = _("Tasks")
+data['indexlink'] = _("Index of all tasks")
data['updatetimestamp'] = _('Last update:') + ' ' + formatdate(time.mktime(t.timetuple()))
if data['advertising'] != None:
# If data['advertising'] is enclosed in _() gettext tries to ask for translations of 'advertising'
@@ -124,8 +125,8 @@
for task in packages.keys():
data['task'] = task
data['pkgbugs'] = allbugs[task]
- data['nbugs'] = nbugs
- data['ndone'] = ndone
+ data['nbugs'] = nbugs[task]
+ data['ndone'] = ndone[task]
template = loader.load('bugs.xhtml')
f = open(outputdir + '/' + task + '.html', 'w')
print >> f, template.generate(**data).render('xhtml')
More information about the Cdd-commits
mailing list