[Cdd-commits] r1034 - in cdd/trunk: cdd dis dis/debian dis/devtools dis/etc/cdd dis/share/cdd dis/share/cdd/unixgroups dis/share/menu dis/templates dis/templates/po
CDD Subversion Commit
noreply at alioth.debian.org
Mon Aug 18 00:02:24 UTC 2008
Author: tille
Date: Mon Aug 18 00:02:23 2008
New Revision: 1034
Added:
cdd/trunk/dis/ (props changed)
- copied from r1033, cdd/trunk/cdd/
cdd/trunk/dis/README.DIS (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/README.CDD
cdd/trunk/dis/dis-role (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-role
cdd/trunk/dis/dis-role.8 (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-role.8
cdd/trunk/dis/dis-task-lister (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-task-lister
cdd/trunk/dis/dis-update-menus (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-update-menus
cdd/trunk/dis/dis-update-menus.8 (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-update-menus.8
cdd/trunk/dis/dis-update-usermenus (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-update-usermenus
cdd/trunk/dis/dis-update-usermenus.8 (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-update-usermenus.8
cdd/trunk/dis/dis-user (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-user
cdd/trunk/dis/dis-user.8 (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd-user.8
cdd/trunk/dis/dis.conf.5 (contents, props changed)
- copied, changed from r1033, cdd/trunk/cdd/cdd.conf.5
Removed:
cdd/trunk/cdd/
cdd/trunk/dis/README.CDD
cdd/trunk/dis/cdd-role
cdd/trunk/dis/cdd-role.8
cdd/trunk/dis/cdd-task-lister
cdd/trunk/dis/cdd-update-menus
cdd/trunk/dis/cdd-update-menus.8
cdd/trunk/dis/cdd-update-usermenus
cdd/trunk/dis/cdd-update-usermenus.8
cdd/trunk/dis/cdd-user
cdd/trunk/dis/cdd-user.8
cdd/trunk/dis/cdd.conf.5
Modified:
cdd/trunk/dis/BUGS
cdd/trunk/dis/Changelog
cdd/trunk/dis/TODO
cdd/trunk/dis/debian/cdd-common.README.Debian
cdd/trunk/dis/debian/cdd-common.docs
cdd/trunk/dis/debian/cdd-common.install
cdd/trunk/dis/debian/cdd-common.lintian-overrides
cdd/trunk/dis/debian/cdd-dev.install
cdd/trunk/dis/debian/cdd-doc.doc-base
cdd/trunk/dis/debian/cdd-doc.docs
cdd/trunk/dis/debian/cdd-doc.install
cdd/trunk/dis/debian/changelog
cdd/trunk/dis/debian/control
cdd/trunk/dis/debian/copyright
cdd/trunk/dis/debian/rules
cdd/trunk/dis/devtools/Makefile
cdd/trunk/dis/devtools/cdd-gen-control
cdd/trunk/dis/devtools/cdd-get-names
cdd/trunk/dis/devtools/cdd-install-helper
cdd/trunk/dis/devtools/rules
cdd/trunk/dis/etc/cdd/cdd.conf
cdd/trunk/dis/share/cdd/cdd-actions
cdd/trunk/dis/share/cdd/cdd-update-menus
cdd/trunk/dis/share/cdd/cdd-utils
cdd/trunk/dis/share/cdd/unixgroups/cdd-actions
cdd/trunk/dis/share/menu/cdd-menu
cdd/trunk/dis/sources.list.unstable
cdd/trunk/dis/templates/README.Debian
cdd/trunk/dis/templates/apt.conf
cdd/trunk/dis/templates/config.config
cdd/trunk/dis/templates/config.install
cdd/trunk/dis/templates/config.links
cdd/trunk/dis/templates/config.postinst
cdd/trunk/dis/templates/config.templates
cdd/trunk/dis/templates/po/ca.po
cdd/trunk/dis/templates/po/de.po
cdd/trunk/dis/templates/po/fr.po
cdd/trunk/dis/templates/po/pt_BR.po
cdd/trunk/dis/templates/po/templates.pot
cdd/trunk/dis/templates/postinst
cdd/trunk/dis/templates/postrm
Log:
Big cdd -> dis renaming step one. Well, people, it was decided to change tha name at DebConf. I have time to do this on my travels - so why waiting ...
Modified: cdd/trunk/dis/BUGS
==============================================================================
--- cdd/trunk/cdd/BUGS (original)
+++ cdd/trunk/dis/BUGS Mon Aug 18 00:02:23 2008
@@ -1,5 +1,5 @@
List of known bugs:
-------------------
-cdd-gen-control does not regard virtual package syntax ('|') and
+dis-gen-control does not regard virtual package syntax ('|') and
versioned depends.
Modified: cdd/trunk/dis/Changelog
==============================================================================
--- cdd/trunk/cdd/Changelog (original)
+++ cdd/trunk/dis/Changelog Mon Aug 18 00:02:23 2008
@@ -1,3 +1,12 @@
+dis 0.6
+-------
+ - Renaming to DIS = Debian Integrated Solutions
+
+cdd 0.5
+-------
+ - Create fixed control files. These will not change
+ for a source tarball of a CDD
+
cdd 0.4
-------
Copied: cdd/trunk/dis/README.DIS (from r1033, cdd/trunk/cdd/README.CDD)
==============================================================================
--- cdd/trunk/cdd/README.CDD (original)
+++ cdd/trunk/dis/README.DIS Mon Aug 18 00:02:23 2008
@@ -1,33 +1,33 @@
-This README file explains how to use cdd-* scripts.
+This README file explains how to use dis-* scripts.
File system:
-- /etc/cdd/<CDD>
- Each CDD should create this directory, containing all the infos needed
- by cdd-* scripts and by the CDD itself.
+- /etc/dis/<DIS>
+ Each DIS should create this directory, containing all the infos needed
+ by dis-* scripts and by the DIS itself.
- In this way it's clear for users to realize that CDD is using
- cdd framework
+ In this way it's clear for users to realize that DIS is using
+ dis framework
-- /etc/cdd/cdd.conf
- Main configuration file of cdd-* scripts.
+- /etc/dis/dis.conf
+ Main configuration file of dis-* scripts.
- CDDs should be aware of it, but not modify it.
+ DISs should be aware of it, but not modify it.
-- /etc/cdd/<CDD>/<CDD>.conf
- A configuration file, in /bin/sh syntax, in which each CDD can
- override /etc/cdd/cdd.conf
+- /etc/dis/<DIS>/<DIS>.conf
+ A configuration file, in /bin/sh syntax, in which each DIS can
+ override /etc/dis/dis.conf
- CDDs with particular needing, for example a particular backend, should
+ DISHes with particular needing, for example a particular backend, should
set variables here.
- In this way a default set of parameters is provided by cdd.conf and a
- specific set for each CDD instance in <CDD>/<CDD>.conf
+ 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
-- /usr/share/cdd/
+- /usr/share/dis/
Where common functions for script 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/cdd/<CDD>/menu/<ROLE>/
+- /etc/dis/<DIS>/menu/<ROLE>/
Users' menus for each registered role.
- If <ROLE> directory is not present, all files in /etc/cdd/<CDD>/menu/
- are considered to be valid Debian menu entries for any Roles in CDD.
+ 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.
Modified: cdd/trunk/dis/TODO
==============================================================================
--- cdd/trunk/cdd/TODO (original)
+++ cdd/trunk/dis/TODO Mon Aug 18 00:02:23 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
-cdd-gen-control
+dis-gen-control
should handle versioned dependencies
-cdd-install-helper
+dis-install-helper
This script is currently more or less a hack.
It might be reasonable to modularize this script.
Modified: cdd/trunk/dis/debian/cdd-common.README.Debian
==============================================================================
--- cdd/trunk/cdd/debian/cdd-common.README.Debian (original)
+++ cdd/trunk/dis/debian/cdd-common.README.Debian Mon Aug 18 00:02:23 2008
@@ -1,23 +1,23 @@
-Custom Debian Distributions common files
+Debian Integrated Solutions common files
----------------------------------------
-This package builds the basic infra structure of all meta packages.
+This package builds the basic infra structure of all metapackages.
-You can add or remove users to the group of users of a Custom Debian
-Distribution. This is used for instance by Debian-Med. It provides
-a med-common package which calls the scripts from cdd-common. It
+You can add or remove users to the group of users of a Debian Integrated
+Solution. This is used for instance by Debian Med. It provides
+a med-common package which calls the scripts from dis-common. It
can be used by
dpkg-reconfigure med-common
Users of this group are provided by a user menu which will be build from
-menu files which are provided by each single med-* meta package in
+menu files which are provided by each single med-* metapackage in
/etc/med/menu.
-If you do not want to install the suggested cdd-doc package you might read
+If you do not want to install the suggested dis-doc package you might read
the online version at
- http://people.debian.org/~tille/debian-med/talks/paper-cdd/debian-cdd.html/
+ http://cdd.alioth.debian.org/
which is frequently updated.
Modified: cdd/trunk/dis/debian/cdd-common.docs
==============================================================================
--- cdd/trunk/cdd/debian/cdd-common.docs (original)
+++ cdd/trunk/dis/debian/cdd-common.docs Mon Aug 18 00:02:23 2008
@@ -1,2 +1,2 @@
-README.CDD
+README.DIS
debian/NEWS.Debian
Modified: cdd/trunk/dis/debian/cdd-common.install
==============================================================================
--- cdd/trunk/cdd/debian/cdd-common.install (original)
+++ cdd/trunk/dis/debian/cdd-common.install Mon Aug 18 00:02:23 2008
@@ -1,7 +1,7 @@
-cdd-user usr/sbin
-cdd-role usr/sbin
-cdd-update-menus usr/sbin
-cdd-update-usermenus usr/sbin
+dis-user usr/sbin
+dis-role usr/sbin
+dis-update-menus usr/sbin
+dis-update-usermenus usr/sbin
share usr
etc/* etc
-cdd-task-lister usr/share/cdd
+dis-task-lister usr/share/dis
Modified: cdd/trunk/dis/debian/cdd-common.lintian-overrides
==============================================================================
--- cdd/trunk/cdd/debian/cdd-common.lintian-overrides (original)
+++ cdd/trunk/dis/debian/cdd-common.lintian-overrides Mon Aug 18 00:02:23 2008
@@ -1,12 +1,12 @@
-# The script /usr/lib/menu/cdd-menu is not intended to be called by the
-# cdd-common package but should be called by meta packages according to
-# the Custom Debian Distribution philosphy which is explained in cdd-doc.
+# The script /usr/lib/menu/dis-menu is not intended to be called by the
+# dis-common package but should be called by meta packages according to
+# the Debian Integrated Solution philosphy which is explained in dis-doc.
# That's why neither postinst nor postrm will call update-menus and
# if they would it would just be a useless call because it just exits 0
# if called by root.
-cdd-common: postinst-does-not-call-updatemenus usr/share/menu/cdd-menu
-cdd-common: postrm-does-not-call-updatemenus usr/share/menu/cdd-menu
+dis-common: postinst-does-not-call-updatemenus usr/share/menu/dis-menu
+dis-common: postrm-does-not-call-updatemenus usr/share/menu/dis-menu
# For obvious reasons the script has to be executable which is the
# intended use for scripts which dynamically create menu entries.
-cdd-common: executable-menu-file usr/share/menu/cdd-menu 0755
+dis-common: executable-menu-file usr/share/menu/dis-menu 0755
Modified: cdd/trunk/dis/debian/cdd-dev.install
==============================================================================
--- cdd/trunk/cdd/debian/cdd-dev.install (original)
+++ cdd/trunk/dis/debian/cdd-dev.install Mon Aug 18 00:02:23 2008
@@ -1,3 +1,3 @@
-sources.list* etc/cdd
-templates usr/share/cdd
-devtools/* usr/share/cdd-dev
+sources.list* etc/dis
+templates usr/share/dis
+devtools/* usr/share/dis-dev
Modified: cdd/trunk/dis/debian/cdd-doc.doc-base
==============================================================================
--- cdd/trunk/cdd/debian/cdd-doc.doc-base (original)
+++ cdd/trunk/dis/debian/cdd-doc.doc-base Mon Aug 18 00:02:23 2008
@@ -1,24 +1,24 @@
-Document: cdd-doc
-Title: Custom Debian Distributions
+Document: dis-doc
+Title: Debian Integrated Solutions
Author: Andreas Tille
Abstract: This paper is intended to people who are interested in the philosophy
- of Custom Debian Distributions and the technique which is used to
+ of Debian Integrated Solutions and the technique which is used to
manage those projects.
.
It is explained in detail why these are no forks from Debian but reside
completely inside the Debian GNU/Linux distribution and which
advantages can be gathered by this approach. The concept of
meta-packages and user role based menus is explained. In short: This
- document describes why Custom Debian Distributions are important to
+ document describes why Debian Integrated Solutions are important to
the vitality and quality of Debian.
Section: Debian
Format: HTML
-Index: /usr/share/doc/cdd-doc/html/index.html
-Files: /usr/share/doc/cdd-doc/html/*.html
+Index: /usr/share/doc/dis-doc/html/index.html
+Files: /usr/share/doc/dis-doc/html/*.html
Format: text
-Files: /usr/share/doc/cdd-doc/debian-cdd.en.txt.gz
+Files: /usr/share/doc/dis-doc/debian-dis.en.txt.gz
Format: pdf
-Files: /usr/share/doc/cdd-doc/debian-cdd.en.pdf
+Files: /usr/share/doc/dis-doc/debian-dis.en.pdf
Modified: cdd/trunk/dis/debian/cdd-doc.docs
==============================================================================
--- cdd/trunk/cdd/debian/cdd-doc.docs (original)
+++ cdd/trunk/dis/debian/cdd-doc.docs Mon Aug 18 00:02:23 2008
@@ -1,2 +1,2 @@
-doc/debian-cdd.en.pdf
-doc/debian-cdd.en.txt
+doc/debian-dis.en.pdf
+doc/debian-dis.en.txt
Modified: cdd/trunk/dis/debian/cdd-doc.install
==============================================================================
--- cdd/trunk/cdd/debian/cdd-doc.install (original)
+++ cdd/trunk/dis/debian/cdd-doc.install Mon Aug 18 00:02:23 2008
@@ -1 +1 @@
-doc/debian-cdd.html/* usr/share/doc/cdd-doc/html
+doc/debian-dis.html/* usr/share/doc/dis-doc/html
Modified: cdd/trunk/dis/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog (original)
+++ cdd/trunk/dis/debian/changelog Mon Aug 18 00:02:23 2008
@@ -1,3 +1,12 @@
+dis (0.6.0) unstable; urgency=low
+
+ * The great renaming: The confusing name Custom Debian Distribution
+ was dropped at DebConf 8 and replaced by Debian Integrated
+ Solutions. This reflects in a rename of the package and all
+ the tools.
+
+ -- Andreas Tille <tille at debian.org> Sun, 17 Aug 2008 18:46:32 -0300
+
cdd (0.5.6) unstable; urgency=low
* doc/Makefile: publish target now enables moving the docs to
Modified: cdd/trunk/dis/debian/control
==============================================================================
--- cdd/trunk/cdd/debian/control (original)
+++ cdd/trunk/dis/debian/control Mon Aug 18 00:02:23 2008
@@ -1,7 +1,7 @@
-Source: cdd
+Source: dis
Priority: optional
Section: devel
-Maintainer: Custom Debian Distribution Team <debian-custom at lists.debian.org>
+Maintainer: Debian Integrated Solution Team <debian-custom at lists.debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>,
Andreas Tille <tille at debian.org>,
Cosimo Alfarano <kalfa at debian.org>,
@@ -11,47 +11,47 @@
Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra,
texlive-latex-recommended, texlive-fonts-recommended
Standards-Version: 3.8.0
-Vcs-Browser: http://svn.debian.org/wsvn/cdd/cdd/trunk/cdd/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/cdd/cdd/trunk/cdd/
+Vcs-Browser: http://svn.debian.org/wsvn/dis/dis/trunk/dis/?rev=0&sc=0
+Vcs-Svn: svn://svn.debian.org/dis/dis/trunk/dis/
-Package: cdd-dev
+Package: dis-dev
Architecture: all
Section: devel
Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential, apt,
debhelper (>= 6.0.7)
-Suggests: cdd-doc
-Description: Custom Debian Distributions common files for developing metapackages
+Suggests: dis-doc
+Description: Debian Integrated Solutions common files for developing metapackages
This package makes life easier when packaging metapackages. Perhaps
this will also encourage other people to build metapackages if there are
easy to use templates where only the packages, the metapackage is depending
from, to insert into the right place.
-Package: cdd-common
+Package: dis-common
Architecture: all
Section: misc
Depends: adduser, menu (>= 2.1.25), debconf (>= 0.5) | debconf-2.0
-Suggests: cdd-doc
-Description: Custom Debian Distributions common package
+Suggests: dis-doc
+Description: Debian Integrated Solutions common package
This package builds the basic infra structure for metapackages.
.
This package provides some files which are common to metapackages
of Common Debian Distributions. It introduces a method to handle
system users in a group named according to the name of the
- Custom Debian Distribution.
+ Debian Integrated Solution.
-Package: cdd-doc
+Package: dis-doc
Architecture: all
Section: doc
Suggests: www-browser, postscript-viewer
-Description: Custom Debian Distribution documentation
+Description: Debian Integrated Solution documentation
This paper is intended to people who are interested in the philosophy
- of Custom Debian Distributions and the technique which is used to
+ of Debian Integrated Solutions and the technique which is used to
manage those projects.
.
It is explained in detail why these are no forks from Debian but reside
completely inside the Debian GNU/Linux distribution and which
advantages can be gathered by this approach. The concept of
metapackages and user role based menus is explained. In short: This
- document describes why Custom Debian Distributions are important to
+ document describes why Debian Integrated Solutions are important to
the vitality and quality of Debian.
Modified: cdd/trunk/dis/debian/copyright
==============================================================================
--- cdd/trunk/cdd/debian/copyright (original)
+++ cdd/trunk/dis/debian/copyright Mon Aug 18 00:02:23 2008
@@ -15,7 +15,7 @@
Copyright (C) 2002-2007 by Andreas Tille, Petter Reinholdtsen, Cosimo Alfarano
-The copyright for the Custom Debian Distributions documentation:
+The copyright for the Debian Integrated Solutions documentation:
Copyright (C) 2002-2004 by Ben Armstrong.
Copyright (C) 2004-2007 by Andreas Tille.
Modified: cdd/trunk/dis/debian/rules
==============================================================================
--- cdd/trunk/cdd/debian/rules (original)
+++ cdd/trunk/dis/debian/rules Mon Aug 18 00:02:23 2008
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# debian/rules for cdd-dev
+# debian/rules for dis-dev
# This file is public domain software, originally written by Andreas Tille.
# $Id$
@@ -7,8 +7,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-VERSION := $(shell grep '^cdd *(.\+)' debian/changelog | head -n 1 | sed 's/^cdd \+(\(.\+\)) .*/\1/' )
-DISTDIR := cdd-$(VERSION)
+VERSION := $(shell grep '^dis *(.\+)' debian/changelog | head -n 1 | sed 's/^dis \+(\(.\+\)) .*/\1/' )
+DISTDIR := dis-$(VERSION)
build: build-stamp
build-stamp:
@@ -71,7 +71,7 @@
ln -sf sources.list.unstable $(DISTDIR)/sources.list
# ln -s control.stub $(DISTDIR)/examples/debian/control
rm -f `find . -name "*~"`
- GZIP=-9 tar -czf ../cdd_$(VERSION).tar.gz $(DISTDIR)
+ GZIP=-9 tar -czf ../dis_$(VERSION).tar.gz $(DISTDIR)
rm -rf $(DISTDIR)
binary: binary-indep binary-arch
Modified: cdd/trunk/dis/devtools/Makefile
==============================================================================
--- cdd/trunk/cdd/devtools/Makefile (original)
+++ cdd/trunk/dis/devtools/Makefile Mon Aug 18 00:02:23 2008
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# This Makefile is used to build a debian/control file
-# for a Custom Debian Distribution.
+# for a Debian Integrated Solution.
#
# Copyright (C) Andreas Tille <tille at debian.org>
# License: GPL
@@ -9,13 +9,13 @@
# TARGET_DIST is one of stable, sarge, etch, unstable, or any other available
# sources.list file available
TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
-CDD := $(shell /usr/share/cdd-dev/cdd-get-names cddname)
-GENCONTROL := /usr/share/cdd-dev/cdd-gen-control
+DIS := $(shell /usr/share/dis-dev/dis-get-names disname)
+GENCONTROL := /usr/share/dis-dev/dis-gen-control
# Verify whether config/control exists, if yes, add it to the depends of debian/control
CONFIGCONTROL := $(shell if [ -d config -a -e config/control ] ; then echo config/control; fi)
-all: $(CDD)-tasks.desc debian/control
+all: $(DIS)-tasks.desc debian/control
debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
(echo "XS-Comment: This file is autogenerated via "make -f debian/rules dist". Do not edit!"; \
@@ -23,9 +23,9 @@
test -f config/control && ( cat config/control; echo ) ; \
$(GENCONTROL) -s $(TARGET_DIST) -D -c -m -i -A) > $@.new && mv $@.new $@
-tasksel: $(CDD)-tasks.desc
-$(CDD)-tasks.desc: tasks/* debian/changelog
- $(GENCONTROL) -s $(TARGET_DIST) -t -A > $(CDD)-tasks.desc.new && mv $(CDD)-tasks.desc.new $(CDD)-tasks.desc
+tasksel: $(DIS)-tasks.desc
+$(DIS)-tasks.desc: tasks/* debian/changelog
+ $(GENCONTROL) -s $(TARGET_DIST) -t -A > $(DIS)-tasks.desc.new && mv $(DIS)-tasks.desc.new $(DIS)-tasks.desc
packages.txt: tasks/*
$(GENCONTROL) -s $(TARGET_DIST) -a > packages.txt.$$$$ && mv packages.txt.$$$$ packages.txt
@@ -51,7 +51,7 @@
distclean: clean
rm -f debian/control
- rm -f $(CDD)-tasks.desc
+ rm -f $(DIS)-tasks.desc
-dist: $(CDD)-tasks.desc debian/control
+dist: $(DIS)-tasks.desc debian/control
make -f debian/rules get-orig-source
Modified: cdd/trunk/dis/devtools/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-gen-control (original)
+++ cdd/trunk/dis/devtools/cdd-gen-control Mon Aug 18 00:02:23 2008
@@ -5,9 +5,9 @@
# Andreas Tille <tille at debian.org>
# Date: 2001-08-23
#
-# # $Id: cdd-gen-control 448 2007-08-11 08:02:48Z tille $
+# # $Id: dis-gen-control 448 2007-08-11 08:02:48Z tille $
#
-# Generate the control file used by the CDD task package.
+# Generate the control file used by the DIS task package.
use warnings;
use strict;
@@ -27,9 +27,9 @@
my $tasksdir = "tasks" ;
my $taskcontrolfile = "tasks.ctl" ;
-my $aptsourcesdefaultlocation = "/etc/cdd";
+my $aptsourcesdefaultlocation = "/etc/dis";
my $aptsources = $aptsourcesdefaultlocation . "/sources.list";
-my $cdd_dev_dir = "/usr/share/cdd-dev";
+my $dis_dev_dir = "/usr/share/dis-dev";
my %commondepends ;
$commondepends{"adduser"} = "0" ;
@@ -38,14 +38,14 @@
my $CommonPackage = "" ;
my $prefix = "test-" ;
-my $cddname = "" ;
-my $cddshortname = "" ;
+my $disname = "" ;
+my $disshortname = "" ;
my $tasksname = "" ;
my $hasconfig = 0 ;
sub usage() {
print STDERR << "EOF";
-cdd-gen-control help screen
+dis-gen-control help screen
usage: $0 [options]
-a : print wanted packages
@@ -86,15 +86,15 @@
$nodepends = 1 if ($opts{'D'});
$ignoreapterrors = 1 if ($opts{'A'});
-cdd_init();
+dis_init();
-# print "$prefix ; $cddshortname ; $cddname ; $tasksname \n";
+# print "$prefix ; $disshortname ; $disname ; $tasksname \n";
load_available_packages();
load_tasks();
-# An ordered list of CDD tasks, in priority order of which are
+# An ordered list of DIS tasks, in priority order of which are
# most needed on the CD. Only leaf tasks need be listed.
my @priorityorder = get_priorities("priority-high", 1);
my @medpriorder = get_priorities("priority-med", 0);
@@ -241,7 +241,7 @@
$taskinfo{$task}{'Leaf'} eq 'false');
print "Task: $task\n";
- print "Section: $cddname\n";
+ print "Section: $disname\n";
print "Description: $taskinfo{$task}{Description}\n";
print "$taskinfo{$task}{'Description-long'}"; # Already contain newline
print "Relevance: 10\n";
@@ -313,7 +313,7 @@
if (exists $taskinfo{$package}) {
# Add packages from task recursively, since
# tasksel does not support dependent tasks of
- # the type used by CDD
+ # the type used by DIS
if (defined $includealldeps && $includealldeps) {
for my $h (qw(Depends Recommends)) {
@@ -612,8 +612,8 @@
return @list;
}
-sub cdd_init {
- # initialise cdd name and other basic stuff
+sub dis_init {
+ # initialise dis name and other basic stuff
unless ( -d "debian" ) {
mkdir("debian") || die "mkdir debian: $!";
}
@@ -621,11 +621,11 @@
unless ( -e "debian/control.stub" ) {
print STDERR "No template debian/control.stub. Use test prefix.\n" ;
} else {
- chomp($prefix = `$cdd_dev_dir/cdd-get-names metapackageprefix`) ;
+ chomp($prefix = `$dis_dev_dir/dis-get-names metapackageprefix`) ;
$prefix = $prefix . "-" ;
$tasksname = $prefix . "tasks";
- chomp($cddshortname = `$cdd_dev_dir/cdd-get-names cddshortname`);
- chomp($cddname = `$cdd_dev_dir/cdd-get-names cddname`);
+ chomp($disshortname = `$dis_dev_dir/dis-get-names disshortname`);
+ chomp($disname = `$dis_dev_dir/dis-get-names disname`);
}
if ( -d "config" && -e "config/control" ) {
$hasconfig = 1;
Modified: cdd/trunk/dis/devtools/cdd-get-names
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-get-names (original)
+++ cdd/trunk/dis/devtools/cdd-get-names Mon Aug 18 00:02:23 2008
@@ -1,6 +1,6 @@
#!/bin/sh
-# Read CDD specific names from debian/control.stub
+# Read DIS specific names from debian/control.stub
#
# Copyright (C) Andreas Tille <tille at debian.org>
# License: GPL
@@ -22,17 +22,17 @@
if [ "$#" -ne 1 ] ; then
echo "Missing argument"
- echo "Usage: $0 cddname|cddshortname|metapackageprefix"
+ echo "Usage: $0 disname|disshortname|metapackageprefix"
exit 64 # EX_USAGE
fi
case "$1" in
- cddname)
+ disname)
grep '^Source:[[:space:]]*debian-' "$CONTROLFILE" | \
sed 's/^Source:[[:space:]]*//'
exit 0
;;
- cddshortname)
+ disshortname)
GetShortName
exit 0
;;
@@ -48,7 +48,7 @@
;;
*)
echo "Unknown argument $1"
- echo "Usage: $0 cddname|cddshortname|metapackageprefix"
+ echo "Usage: $0 disname|disshortname|metapackageprefix"
exit 64 # EX_USAGE
;;
esac
Modified: cdd/trunk/dis/devtools/cdd-install-helper
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-install-helper (original)
+++ cdd/trunk/dis/devtools/cdd-install-helper Mon Aug 18 00:02:23 2008
@@ -1,16 +1,16 @@
#!/bin/sh
-cdd=`/usr/share/cdd-dev/cdd-get-names metapackageprefix`
-menudir=usr/share/cdd/"$cdd"/menu
+dis=`/usr/share/dis-dev/dis-get-names metapackageprefix`
+menudir=usr/share/dis/"$dis"/menu
-SubstCDDName () {
- sed -e "s/#CDD#/${cdd}/g" \
- -e "s?\([/ ]\)\(config.templates:*\)?\1${cdd}-\2?" \
- -e "s/#CDDNAME#/${CDDNAME}/g" /usr/share/cdd/templates/$1 >> \
+SubstDISName () {
+ sed -e "s/#DIS#/${dis}/g" \
+ -e "s?\([/ ]\)\(config.templates:*\)?\1${dis}-\2?" \
+ -e "s/#DISNAME#/${DISNAME}/g" /usr/share/dis/templates/$1 >> \
debian/$2
}
-# Make dependency from menu containing packages to the right #CDD#-config version
+# Make dependency from menu containing packages to the right #DIS#-config version
version="(>= `dpkg-parsechangelog | grep "^Version:" | sed -e "s/^Version:[[:space:]]\+\([\.0-9]*\)[[:space:]]*/\1/"`)"
# General Task registry, menu registration and post{inst,rm} preparation
@@ -23,8 +23,8 @@
# For the moment disable tasksel if there is no "Task:" tag given
else
task=`grep -w "^Task:" tasks/"$pkg" | sed "s/^Task:[[:space:]]*\([^[:space:]]*\)/\1/"`
- mkdir -p debian/"$cdd"-"$pkg"/usr/share/cdd/tasks/"$cdd"/
- echo "$task" > debian/"$cdd"-"$pkg"/usr/share/cdd/tasks/"$cdd"/"$pkg"
+ mkdir -p debian/"$dis"-"$pkg"/usr/share/dis/tasks/"$dis"/
+ echo "$task" > debian/"$dis"-"$pkg"/usr/share/dis/tasks/"$dis"/"$pkg"
fi
# if we provide an extra menu which overrides some menus provided by
@@ -32,15 +32,15 @@
# directory
[ -d menu ] && [ -d menu/"$pkg" ] && \
if [ `find menu/"$pkg" -maxdepth 1 -name \*.menu | wc -l` -gt 0 ] ; then
- mkdir -p debian/"$cdd"-"$pkg"/"$menudir"
+ mkdir -p debian/"$dis"-"$pkg"/"$menudir"
for dep in `find menu/"$pkg" -maxdepth 1 -name \*.menu` ; do
- cp -a "$dep" debian/"$cdd"-"$pkg"/"$menudir"/`basename "$dep" .menu`
+ cp -a "$dep" debian/"$dis"-"$pkg"/"$menudir"/`basename "$dep" .menu`
done
fi
# Provide a README.Debian in any case
- mkdir -p debian/"$cdd"-"$pkg"/usr/share/doc/"$cdd"-"$pkg"
- [ ! -s docs/"$pkg"/README.Debian ] && cp -a /usr/share/cdd/templates/README.Debian debian/"$cdd"-"$pkg"/usr/share/doc/"$cdd"-"$pkg"
+ mkdir -p debian/"$dis"-"$pkg"/usr/share/doc/"$dis"-"$pkg"
+ [ ! -s docs/"$pkg"/README.Debian ] && cp -a /usr/share/dis/templates/README.Debian debian/"$dis"-"$pkg"/usr/share/doc/"$dis"-"$pkg"
# Check for documentation of packages (*.txt or *.html) which should be viewed in
# case of missing GUI
[ -d menu ] && [ -d menu/"$pkg" ] && \
@@ -52,76 +52,76 @@
# system cares about whether a sugested package is installed or not
depmenu=`basename ${dep} .txt`
if [ "$depmenu" = `basename ${dep}` ] ; then depmenu=`basename ${dep} .html` ; fi
- if ! grep -A 5 "Package: $cdd-$pkg" debian/control | grep -q -w "$depmenu" ; then
+ if ! grep -A 5 "Package: $dis-$pkg" debian/control | grep -q -w "$depmenu" ; then
## echo "Package ${depmenu} seems not to be in dependencies"
continue
fi
- cp -a "$dep" debian/"$cdd"-"$pkg"/usr/share/doc/"$cdd"-"$pkg"
+ cp -a "$dep" debian/"$dis"-"$pkg"/usr/share/doc/"$dis"-"$pkg"
done
fi
# if README.Source exits move it into every package
- [ -s debian/README.source ] && cp -a debian/README.source debian/"$cdd"-"$pkg"/usr/share/doc/"$cdd"-"$pkg"
+ [ -s debian/README.source ] && cp -a debian/README.source debian/"$dis"-"$pkg"/usr/share/doc/"$dis"-"$pkg"
# post{inst/rm} template are appended if some extra scripts are provided or just created
# an extra postinst has to be saved (*.stub) and restored by the clean target in
# debian/rules
- [ -s debian/"$cdd"-"$pkg".postinst.stub ] && cp debian/"$cdd"-"$pkg".postinst.stub debian/"$cdd"-"$pkg".postinst
- sed -e "s/#CDD#/${cdd}/g" \
- -e "s/#PKG#/${cdd}-${pkg}/g" \
- /usr/share/cdd/templates/postinst >> debian/"$cdd"-"$pkg".postinst
- sed -e "s/#CDD#/${cdd}/g" \
- -e "s/#PKG#/${cdd}-${pkg}/g" \
- /usr/share/cdd/templates/postrm >> debian/"$cdd"-"$pkg".postrm
+ [ -s debian/"$dis"-"$pkg".postinst.stub ] && cp debian/"$dis"-"$pkg".postinst.stub debian/"$dis"-"$pkg".postinst
+ sed -e "s/#DIS#/${dis}/g" \
+ -e "s/#PKG#/${dis}-${pkg}/g" \
+ /usr/share/dis/templates/postinst >> debian/"$dis"-"$pkg".postinst
+ sed -e "s/#DIS#/${dis}/g" \
+ -e "s/#PKG#/${dis}-${pkg}/g" \
+ /usr/share/dis/templates/postrm >> debian/"$dis"-"$pkg".postrm
done
# if config/config exists use this as general helper script
if [ -s config/config ] ; then
- mkdir -p debian/"$cdd"-config/usr/bin
- mkdir -p debian/"$cdd"-config/usr/share/man/man1
- cp -a config/config debian/"$cdd"-config/usr/bin/"$cdd"-config
- cp -a config/config.1 debian/"$cdd"-config/usr/share/man/man1/"$cdd"-config.1
+ mkdir -p debian/"$dis"-config/usr/bin
+ mkdir -p debian/"$dis"-config/usr/share/man/man1
+ cp -a config/config debian/"$dis"-config/usr/bin/"$dis"-config
+ cp -a config/config.1 debian/"$dis"-config/usr/share/man/man1/"$dis"-config.1
# install link to package helper script
for pkg in `ls tasks` ; do
- mkdir -p debian/"$cdd"-"$pkg"/usr/bin
- mkdir -p debian/"$cdd"-"$pkg"/usr/share/man/man1
- ln -s "$cdd"-config debian/"$cdd"-"$pkg"/usr/bin/"$cdd"-"$pkg"
- ln -s "$cdd"-config.1.gz debian/"$cdd"-"$pkg"/usr/share/man/man1/"$cdd"-"$pkg".1.gz
+ mkdir -p debian/"$dis"-"$pkg"/usr/bin
+ mkdir -p debian/"$dis"-"$pkg"/usr/share/man/man1
+ ln -s "$dis"-config debian/"$dis"-"$pkg"/usr/bin/"$dis"-"$pkg"
+ ln -s "$dis"-config.1.gz debian/"$dis"-"$pkg"/usr/share/man/man1/"$dis"-"$pkg".1.gz
done
fi
-# config/conf should really exist for the CDD registry in /etc/cdd
+# config/conf should really exist for the DIS registry in /etc/dis
# currently there is no error message issued if it is missing but
# this might be reasonable
if [ -s config/conf ] ; then
- # Get name of Custom Debian Distribution
+ # Get name of Debian Integrated Solution
. config/conf
- # Config file should set CDDNAME, but if not try to build a useful one
- if [ _"$CDDNAME" = _"" ] ; then
- CDDNAME=Debian-`echo ${cdd} | perl -ne 'print "\u\L$_";'`
+ # Config file should set DISNAME, but if not try to build a useful one
+ if [ _"$DISNAME" = _"" ] ; then
+ DISNAME=Debian-`echo ${dis} | perl -ne 'print "\u\L$_";'`
fi
# Move templates for user configuration script
# In case there is a config postinst template, preserve this
- [ -s debian/"$cdd"-config.postinst.stub ] && cp debian/"$cdd"-config.postinst.stub debian/"$cdd"-config.postinst
- for comm in `ls /usr/share/cdd/templates/config.* /usr/share/cdd/templates/apt.conf` ; do
+ [ -s debian/"$dis"-config.postinst.stub ] && cp debian/"$dis"-config.postinst.stub debian/"$dis"-config.postinst
+ for comm in `ls /usr/share/dis/templates/config.* /usr/share/dis/templates/apt.conf` ; do
commname=`basename $comm`
- SubstCDDName ${commname} ${cdd}-${commname}
+ SubstDISName ${commname} ${dis}-${commname}
done
# rename apt.conf.d file
- [ -s debian/${cdd}-apt.conf ] && mv debian/${cdd}-apt.conf debian/90${cdd}-config
+ [ -s debian/${dis}-apt.conf ] && mv debian/${dis}-apt.conf debian/90${dis}-config
if [ -d debian/po.stub ] ; then
cp -a debian/po.stub debian/po
else
mkdir -p debian/po
fi
- for po in `ls /usr/share/cdd/templates/po/*` ; do
+ for po in `ls /usr/share/dis/templates/po/*` ; do
poname=`basename $po`
- SubstCDDName po/${poname} po/${poname}
+ SubstDISName po/${poname} po/${poname}
done
[ -d debian/po ] && debconf-updatepo
- # Add common config file for ${cdd}
- mkdir -p debian/"$cdd"-config/etc/cdd/"$cdd"
- cp -a config/conf debian/"$cdd"-config/etc/cdd/"$cdd"/"$cdd".conf
+ # Add common config file for ${dis}
+ mkdir -p debian/"$dis"-config/etc/dis/"$dis"
+ cp -a config/conf debian/"$dis"-config/etc/dis/"$dis"/"$dis".conf
fi
Modified: cdd/trunk/dis/devtools/rules
==============================================================================
--- cdd/trunk/cdd/devtools/rules (original)
+++ cdd/trunk/dis/devtools/rules Mon Aug 18 00:02:23 2008
@@ -1,43 +1,43 @@
#!/usr/bin/make -f
# This is a debian/rules file which builds meta packages
-# for a Custom Debian Distribution.
+# for a Debian Integrated Solution.
#
# Copyright (C) Andreas Tille <tille at debian.org>
# License: GPL
-CDDNAME := $(shell /usr/share/cdd-dev/cdd-get-names cddname)
-PREFIX := $(shell /usr/share/cdd-dev/cdd-get-names metapackageprefix)
-CDDMKFILE := /usr/share/cdd-dev/Makefile
-CDD_INSTALL_HELPER := /usr/share/cdd-dev/cdd-install-helper
+DISNAME := $(shell /usr/share/dis-dev/dis-get-names disname)
+PREFIX := $(shell /usr/share/dis-dev/dis-get-names metapackageprefix)
+DISMKFILE := /usr/share/dis-dev/Makefile
+DIS_INSTALL_HELPER := /usr/share/dis-dev/dis-install-helper
TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
-CDD := $(shell /usr/share/cdd-dev/cdd-get-names cddname)
-GENCONTROL := /usr/share/cdd-dev/cdd-gen-control
+DIS := $(shell /usr/share/dis-dev/dis-get-names disname)
+GENCONTROL := /usr/share/dis-dev/dis-gen-control
-VERSION := $(shell grep '^$(CDDNAME) *(.\+)' debian/changelog | head -n 1 | sed 's/^$(CDDNAME) \+(\(.\+\)) .*/\1/' )
-DISTDIR := $(CDDNAME)-$(VERSION)
+VERSION := $(shell grep '^$(DISNAME) *(.\+)' debian/changelog | head -n 1 | sed 's/^$(DISNAME) \+(\(.\+\)) .*/\1/' )
+DISTDIR := $(DISNAME)-$(VERSION)
all:
- echo $(PREFIX), $(CDDNAME)
+ echo $(PREFIX), $(DISNAME)
INSTALLREADME := $(shell if test -e README ; then echo "-A README"; fi)
debian/control:
- $(MAKE) -f $(CDDMKFILE) debian/control
+ $(MAKE) -f $(DISMKFILE) debian/control
-$(CDD)-tasks.desc:
- $(MAKE) -f $(CDDMKFILE) $(CDD)-tasks.desc
+$(DIS)-tasks.desc:
+ $(MAKE) -f $(DISMKFILE) $(DIS)-tasks.desc
build:
## Don't build debian/control and tasks.desc at package build time
- # $(MAKE) -f $(CDDMKFILE) all
+ # $(MAKE) -f $(DISMKFILE) all
dh_testdir
clean:
dh_testdir
dh_testroot
- $(MAKE) -f $(CDDMKFILE) clean
+ $(MAKE) -f $(DISMKFILE) clean
# Clear apt-get cache
rm -rf tmp
@@ -54,11 +54,11 @@
# remove auto generated debconf template translations
rm -rf debian/po
# DO NOT Remove auto generated tasksel descriptions - it sticks to the source
- # rm -f $(CDDNAME)-tasks.desc
+ # rm -f $(DISNAME)-tasks.desc
dh_clean build-stamp
-get-orig-source: $(CDD)-tasks.desc debian/control
+get-orig-source: $(DIS)-tasks.desc debian/control
if [ ! -f debian/changelog ] ; then \
echo "File debian/changelog is missing. Something is wrong!" ; \
exit -1 ; \
@@ -75,17 +75,17 @@
--exclude CVS --exclude .svn --exclude svn-commit.tmp . | \
(cd $(DISTDIR); tar xfBp -)
rm -f `find $(DISTDIR) -name "*~"`
- GZIP=-9 tar -czf ../$(CDDNAME)_$(VERSION).tar.gz $(DISTDIR)
+ GZIP=-9 tar -czf ../$(DISNAME)_$(VERSION).tar.gz $(DISTDIR)
rm -rf $(DISTDIR)
# remove auto generated files from SVN dir where it should not be stored
- rm -f debian/control $(CDD)-tasks.desc
+ rm -f debian/control $(DIS)-tasks.desc
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- dh_install $(CDDNAME)-tasks.desc usr/share/tasksel
+ dh_install $(DISNAME)-tasks.desc usr/share/tasksel
# Build architecture-dependent files here.
# Since Debian Edu builds architecture dependant meta packages
@@ -102,8 +102,8 @@
dh_installinfo -a
dh_lintian -a
if grep -q "^Architecture: \+any" debian/control ; then \
- echo "$(CDD_INSTALL_HELPER) for architecture any" ; \
- $(CDD_INSTALL_HELPER) ; \
+ echo "$(DIS_INSTALL_HELPER) for architecture any" ; \
+ $(DIS_INSTALL_HELPER) ; \
fi
dh_install -a
dh_installdebconf -a
@@ -130,8 +130,8 @@
dh_installinfo -i
dh_lintian -i
if grep -q "^Architecture: \+all" debian/control ; then \
- echo "$(CDD_INSTALL_HELPER) for architecture all" ; \
- $(CDD_INSTALL_HELPER) ; \
+ echo "$(DIS_INSTALL_HELPER) for architecture all" ; \
+ $(DIS_INSTALL_HELPER) ; \
fi
dh_install -i
dh_installdebconf -i
Copied: cdd/trunk/dis/dis-role (from r1033, cdd/trunk/cdd/cdd-role)
==============================================================================
--- cdd/trunk/cdd/cdd-role (original)
+++ cdd/trunk/dis/dis-role Mon Aug 18 00:02:23 2008
@@ -3,19 +3,19 @@
# $Id$
usage () {
- echo "Usage: `basename $0` <action> <CDD> [<role>]"
+ echo "Usage: `basename $0` <action> <DIS> [<role>]"
echo "action: add|del"
- echo "CDD: `getCDDList|tr ' ' '|'`"
- echo "role: `getCDDList|tr ' ' '|'` (default: CDD name)"
+ echo "DIS: `getDISList|tr ' ' '|'`"
+ echo "role: `getDISList|tr ' ' '|'` (default: DIS name)"
}
-# the base dir for CDD conffiles, where script expects to find dirs named like
-# each registered CDDs
-CONFBASE=${CONFBASE:-/etc/cdd}
+# the base dir for DIS conffiles, where script expects to find dirs named like
+# each registered DISs
+CONFBASE=${CONFBASE:-/etc/dis}
-# should be /usr/lib/cdd/*, file should be named differently
-. ${CONFBASE}/cdd.conf
+# should be /usr/lib/dis/*, file should be named differently
+. ${CONFBASE}/dis.conf
# Check consistency of passed argouments
@@ -30,7 +30,7 @@
exit 67 # EX_USAGE
fi
if [ -z "$2" ] ; then
- echo "Missing CDD name."
+ echo "Missing DIS name."
echo
usage
exit 67 # EX_USAGE
@@ -38,40 +38,40 @@
ACTION=`toLower $1`
-CDD=$2
-ROLE=${3:-${CDD}}
+DIS=$2
+ROLE=${3:-${DIS}}
-# Now that we know the selected CDD, we can check if there is a local
+# Now that we know the selected DIS, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
-test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- . ${CONFBASE}/${CDD}/${CDD}.conf
+test -n "${DIS}" -a -f ${CONFBASE}/${DIS}/${DIS}.conf &&
+ . ${CONFBASE}/${DIS}/${DIS}.conf
if [ -n "${DBBACKEND}" ]; then
set -e
- checkCDD ${CDD} || cddFail $? "Custom Distribution ${CDD} does not exist"
+ checkDIS ${DIS} || disFail $? "Debian Integrated Solution ${DIS} does not exist"
if [ "${ACTION}" = "add" ]; then
- checkCDD ${CDD} || cddFail $? "CDD ${CDD} does not exist"
- checkRole ${ROLE} && cddFail $? "Role ${ROLE} currently exist"
- checkRoleInCDD ${CDD} ${ROLE} || \
- cddFail $? "CDD (${CDD}) and Role (${ROLE}) are not correct or incompatible with the selected backend"
+ 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"
- addRole ${CDD} ${ROLE} || \
- cddFail $? "Failed to add role ${ROLE}"
+ addRole ${DIS} ${ROLE} || \
+ disFail $? "Failed to add role ${ROLE}"
elif [ "${ACTION}" = "del" ]; then
- checkCDD ${CDD} || cddFail $? "CDD ${CDD} doesn't exist"
- checkRole ${ROLE} || cddFail $? "Role ${ROLE} doesn't exist"
- checkRoleInCDD ${CDD} ${ROLE} || \
- cddFail $? "CDD (${CDD} and Role (${ROLE}) are not correct"
-
- delRole ${CDD} ${ROLE} || \
- cddFail $? "Failed to remove role ${ROLE}"
- cddLog Role ${ROLE} successfully registered in CDD ${CDD}
+ 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}
fi
set +e
else
# EX_USAGE
- cddFail 67 "You chose to not use Roles"
+ disFail 67 "You chose to not use Roles"
fi
Copied: cdd/trunk/dis/dis-role.8 (from r1033, cdd/trunk/cdd/cdd-role.8)
==============================================================================
--- cdd/trunk/cdd/cdd-role.8 (original)
+++ cdd/trunk/dis/dis-role.8 Mon Aug 18 00:02:23 2008
@@ -1,13 +1,13 @@
-.TH cdd-user 8 "2004/04/14" "" "Custom Debian Distributions"
+.TH dis-user 8 "2008/08/17" "" "Debian Integrated Solutions"
.SH NAME
-.B cdd-role
-\- add/remove roles in registered Custom Debian Distribution
+.B dis-role
+\- add/remove roles in registered Debian Integrated Solution
.SH SYNOPSIS
-.B cdd-user
+.B dis-user
.B add|del
<
-.B CDD
+.B DIS
>
[<
.B Role
@@ -17,17 +17,17 @@
Add/remove (register/unregister)
.B Role
for the specified
-.B CDD
+.B DIS
If
.B Role
is not specified, it's assumed to be named like
-.B CDD
+.B DIS
.SH OPTIONS
.TP
-.B CDD
-- a registered custom distribution in /etc/cdd, of example one of
+.B DIS
+- a registered Debian Integrated Solution in /etc/dis, of example one of
.I med
,
.I junior
Copied: cdd/trunk/dis/dis-task-lister (from r1033, cdd/trunk/cdd/cdd-task-lister)
==============================================================================
--- cdd/trunk/cdd/cdd-task-lister (original)
+++ cdd/trunk/dis/dis-task-lister Mon Aug 18 00:02:23 2008
@@ -1,30 +1,30 @@
#!/bin/sh
-# This script respects its own file name to find out the CDD it belongs to
-# Names should be builded like <CDD>-task-files
+# This script respects its own file name to find out the DIS it belongs to
+# Names should be builded like <DIS>-task-files
# The intended use is to create according symlinks to this file
NAME=`basename $0`
-if [ _"$NAME" = _"cdd-task-lister" ] ; then
+if [ _"$NAME" = _"dis-task-lister" ] ; then
exit
fi
-# the base dir for CDD conffiles, where script expects to find dirs named like
-# each registered CDDs
-CONFBASE=${CONFBASE:-/etc/cdd}
+# the base dir for DIS conffiles, where script expects to find dirs named like
+# each registered DISs
+CONFBASE=${CONFBASE:-/etc/dis}
-# a local per CDD conf is sourced later, after argument parsing
-. ${CONFBASE}/cdd.conf
+# a local per DIS conf is sourced later, after argument parsing
+. ${CONFBASE}/dis.conf
-CDD=`echo $NAME | sed 's/-task-files//'`
+DIS=`echo $NAME | sed 's/-task-files//'`
-# Now that we know the selected CDD, we can check if there is a local
+# Now that we know the selected DIS, we can check if there is a local
# configuration for it (ie different backend from the default one)
-test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- . ${CONFBASE}/${CDD}/${CDD}.conf
+test -n "${DIS}" -a -f ${CONFBASE}/${DIS}/${DIS}.conf &&
+ . ${CONFBASE}/${DIS}/${DIS}.conf
if [ -n "${DBBACKEND}" ]; then
set -e
- checkCDD ${CDD} || cddFail $? "Custom distribution ${CDD} does not exist"
+ checkDIS ${DIS} || disFail $? "Debian Integrated Solution ${DIS} does not exist"
fi
# Check consistency of passed argouments
@@ -33,4 +33,4 @@
exit 67 # EX_USAGE
fi
-cat /usr/share/cdd/tasksel/${CDD}/$1
+cat /usr/share/dis/tasksel/${DIS}/$1
Copied: cdd/trunk/dis/dis-update-menus (from r1033, cdd/trunk/cdd/cdd-update-menus)
==============================================================================
--- cdd/trunk/cdd/cdd-update-menus (original)
+++ cdd/trunk/dis/dis-update-menus Mon Aug 18 00:02:23 2008
@@ -3,25 +3,25 @@
# $Id$
usage() {
- echo "Usage: `basename $0` [ -u <user> | -d <CDD> ]"
- echo "CDD: `getCDDList|tr ' ' '|'`"
- echo "user: system user registerd to a CDD"
+ echo "Usage: `basename $0` [ -u <user> | -d <DIS> ]"
+ echo "DIS: `getDISList|tr ' ' '|'`"
+ echo "user: system user registerd to a DIS"
echo
echo "run as user updates only the user's menu script"
}
-# the base dir for CDD conffiles, where script expects to find dirs named like
-# each registered CDDs
-CONFBASE=${CONFBASE:-/etc/cdd}
+# the base dir for DIS conffiles, where script expects to find dirs named like
+# each registered DISs
+CONFBASE=${CONFBASE:-/etc/dis}
-# a local per CDD conf is sourced later, after argument parsing
-. ${CONFBASE}/cdd.conf
+# a local per DIS conf is sourced later, after argument parsing
+. ${CONFBASE}/dis.conf
-# specific utilities for cdd-update-menus
-. ${SHAREDIR}/cdd-update-menus
+# specific utilities for dis-update-menus
+. ${SHAREDIR}/dis-update-menus
# Get command line arguments
-GETOPT=`getopt -o d:u:h --long cdd:,user:,help -n "$0" -- "$@"`
+GETOPT=`getopt -o d:u:h --long dis:,user:,help -n "$0" -- "$@"`
eval set -- "$GETOPT"
while true
do
@@ -31,34 +31,34 @@
exit 0
;;
# get distro name
- -d|--cdd)
+ -d|--dis)
if ! amI root; then
- cddLog "You must be root to specify --cdd parameter"
- cddLog ""
+ disLog "You must be root to specify --dis parameter"
+ disLog ""
usage
exit 64
- elif [ -n "${CDDUSER}" ]; then
- cddLog "You cannot specify --cdd and --user at the same time"
- cddLog ""
+ elif [ -n "${DISUSER}" ]; then
+ disLog "You cannot specify --dis and --user at the same time"
+ disLog ""
usage
exit 0
else
- CDD=$2
+ DIS=$2
shift 2
fi
;;
# get user name
-u|--user)
- CDDUSER=$2
+ DISUSER=$2
shift 2
- if ! amI root && ! amI "${CDDUSER}"; then
- cddLog "You must be root to specify --user parameter with a user that's not you"
+ if ! amI root && ! amI "${DISUSER}"; then
+ disLog "You must be root to specify --user parameter with a user that's not you"
usage
exit 64
- elif [ "${CDDUSER}" == 'root' ]; then
- cddFail 64 "err: Menus for user 'root' cannot be updated"
- elif [ -n "${CDD}" ]; then
+ elif [ "${DISUSER}" == 'root' ]; then
+ disFail 64 "err: Menus for user 'root' cannot be updated"
+ elif [ -n "${DIS}" ]; then
usage
exit 0
fi
@@ -68,42 +68,42 @@
break
;;
*)
- cddLog "$1 not recognized as option" >&2
+ disLog "$1 not recognized as option" >&2
exit 67 # EX_USAGE
;;
esac
done
-# update menu scripts for CDDUSER, for any CDD, if any
-if [ -n "${CDDUSER}" ]; then
- SYSSCRIPT="${SHAREDIR}/menu/cdd-menu"
- USERSCRIPT="`getUserHome ${CDDUSER}`/.menu/cdd-menu"
+# update menu scripts for DISUSER, for any DIS, if any
+if [ -n "${DISUSER}" ]; then
+ SYSSCRIPT="${SHAREDIR}/menu/dis-menu"
+ USERSCRIPT="`getUserHome ${DISUSER}`/.menu/dis-menu"
set -e
- checkUser ${CDDUSER} || \
- cddFail 67 "User does not exist"
- isUserRegistered ${CDDUSER} || \
- cddFail 67 "User ${CDDUSER} is not registered to any CDD"
+ checkUser ${DISUSER} || \
+ disFail 67 "User does not exist"
+ isUserRegistered ${DISUSER} || \
+ disFail 67 "User ${DISUSER} is not registered to any DIS"
# there's nothing to do on per user basis criteria
- #updateUser ${CDDUSER} "${SYSSCRIPT}" "${USERSCRIPT}"
+ #updateUser ${DISUSER} "${SYSSCRIPT}" "${USERSCRIPT}"
set +e
-# update menu scripts for any user registered into the specified CDD
-elif [ -n "${CDD}" ]; then
- # Now that we know the selected CDD, we can check if there is a local
+# update menu scripts for any user registered into the specified DIS
+elif [ -n "${DIS}" ]; then
+ # Now that we know the selected DIS, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
- test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- . ${CONFBASE}/${CDD}/${CDD}.conf
+ test -n "${DIS}" -a -f ${CONFBASE}/${DIS}/${DIS}.conf &&
+ . ${CONFBASE}/${DIS}/${DIS}.conf
set -e
- checkCDD ${CDD} || \
- cddFail $? "Custom distribution ${CDD} does not exist"
+ checkDIS ${DIS} || \
+ disFail $? "Debian Integrated Solution ${DIS} does not exist"
- # there's nothing to do on per CDD basis criteria
- #SYSSCRIPT="${SHAREDIR}/menu/cdd-menu"
- #updateCDD ${CDD} "${SYSSCRIPT}"
+ # there's nothing to do on per DIS basis criteria
+ #SYSSCRIPT="${SHAREDIR}/menu/dis-menu"
+ #updateDIS ${DIS} "${SYSSCRIPT}"
set +e
else
exec $0 --user `whoami`
Copied: cdd/trunk/dis/dis-update-menus.8 (from r1033, cdd/trunk/cdd/cdd-update-menus.8)
==============================================================================
--- cdd/trunk/cdd/cdd-update-menus.8 (original)
+++ cdd/trunk/dis/dis-update-menus.8 Mon Aug 18 00:02:23 2008
@@ -1,32 +1,32 @@
-.TH cdd\-update\-menus 8 "2004/03/24" "" "Custom Debian Distributions"
+.TH dis\-update\-menus 8 "2004/03/24" "" "Debian Integrated Solutions"
.SH NAME
-.B cdd\-update\-menus
-\- add menu of meta package to all Custom Debian Distribution users
+.B dis\-update\-menus
+\- add menu of meta package to all Debian Integrated Solution users
.SH SYNOPSIS
-.B cdd\-update\-menus
-[ \-\-cdd|\-d <
-.B CDD
+.B dis\-update\-menus
+[ \-\-dis|\-d <
+.B DIS
> |
\-\-user|\-u <
.B user
> ]
.SH DESCRIPTION
-cdd\-update\-menus behaves differently depending on who run the command:
+dis\-update\-menus behaves differently depending on who run the command:
If it's called by a user, it adds and keeps updated menu entries for the
user who runs it.
If it's called by root, it adds and keeps updated user's menu entries
(see menu package for users' menus) for all users who belong to the
-group of the specified Custom Debian Distribution, or only for a
+group of the specified Debian Integrated Solution, or only for a
specified user, depending on which parameter is passed to the script.
.SH OPTIONS
.TP
-.B CDD
-one of the installed CDDs, listed in /etc/cdd/, for example (if installed):
+.B DIS
+one of the installed DISs, listed in /etc/dis/, for example (if installed):
.I med
,
.I junior
@@ -39,7 +39,7 @@
.TP
.B user
-a user present on the system and belonging to a CDD
+a user present on the system and belonging to a DIS
.SH AUTHOR
Andreas Tille <tille at debian.org>, Cosimo Alfarano <kalfa at debian.org>
Copied: cdd/trunk/dis/dis-update-usermenus (from r1033, cdd/trunk/cdd/cdd-update-usermenus)
==============================================================================
--- cdd/trunk/cdd/cdd-update-usermenus (original)
+++ cdd/trunk/dis/dis-update-usermenus Mon Aug 18 00:02:23 2008
@@ -3,24 +3,24 @@
# $Id$
usage() {
- echo "Usage: `basename $0` <CDD>"
- echo "CDD: `getCDDList|tr ' ' '|'`"
+ echo "Usage: `basename $0` <DIS>"
+ echo "DIS: `getDISList|tr ' ' '|'`"
echo
- echo "Updates user menus of all users registered for CDD"
+ echo "Updates user menus of all users registered for DIS"
}
-# the base dir for CDD conffiles, where script expects to find dirs named like
-# each registered CDDs
-CONFBASE=${CONFBASE:-/etc/cdd}
+# the base dir for DIS conffiles, where script expects to find dirs named like
+# each registered DISs
+CONFBASE=${CONFBASE:-/etc/dis}
-# a local per CDD conf is sourced later, after argument parsing
-. ${CONFBASE}/cdd.conf
+# a local per DIS conf is sourced later, after argument parsing
+. ${CONFBASE}/dis.conf
-# specific utilities for cdd-update-menus
-. ${SHAREDIR}/cdd-update-menus
+# specific utilities for dis-update-menus
+. ${SHAREDIR}/dis-update-menus
if ! amI root; then
- cddLog "$0 must be called by root. If you are a normal user just call update-menus ."
+ disLog "$0 must be called by root. If you are a normal user just call update-menus ."
exit 0
fi
@@ -31,21 +31,21 @@
;;
*)
set -e
- checkCDD $1 || \
- cddFail $? "Custom distribution $1 does not exist"
- CDD=$1
+ checkDIS $1 || \
+ disFail $? "Debian Integrated Solution $1 does not exist"
+ DIS=$1
set +e
esac
-if [ -s /etc/cdd/${CDD}/${CDD}.conf ] ; then
- . /etc/cdd/${CDD}/${CDD}.conf
+if [ -s /etc/dis/${DIS}/${DIS}.conf ] ; then
+ . /etc/dis/${DIS}/${DIS}.conf
fi
-for ROLE in `getCDDRoleList ${CDD}`; do
- for CDDUSER in `getUsersInRole ${CDD} ${ROLE} 1`; do
+for ROLE in `getDISRoleList ${DIS}`; do
+ for DISUSER in `getUsersInRole ${DIS} ${ROLE} 1`; do
# Update user menus if UPDATEUSERMENU is set to yes
- cddLog "Adding menu for user ${CDDUSER} of ${CDD} ..."
- su ${CDDUSER} -c "update-menus"
+ disLog "Adding menu for user ${DISUSER} of ${DIS} ..."
+ su ${DISUSER} -c "update-menus"
done
done
Copied: cdd/trunk/dis/dis-update-usermenus.8 (from r1033, cdd/trunk/cdd/cdd-update-usermenus.8)
==============================================================================
--- cdd/trunk/cdd/cdd-update-usermenus.8 (original)
+++ cdd/trunk/dis/dis-update-usermenus.8 Mon Aug 18 00:02:23 2008
@@ -1,35 +1,35 @@
-.TH cdd-update-usermenus 8 "2004/03/24" "" "Custom Debian Distributions"
+.TH dis-update-usermenus 8 "2004/03/24" "" "Debian Integrated Solutions"
.SH NAME
-.B cdd-update-usermenus
-\- update user menus of all Custom Debian Distribution users
+.B dis-update-usermenus
+\- update user menus of all Debian Integrated Solution users
.SH SYNOPSIS
-.B cdd-update-menus
-<\fBCDD\fR>
+.B dis-update-menus
+<\fBDIS\fR>
.SH DESCRIPTION
The script can only be called by root and calls
.B update-menus(1)
-for every user who is registered for the Custom Debian Distribution
-\fBCDD\fR. If a user wants to update his own personal menu he should
+for every user who is registered for the Debian Integrated Solution
+\fBDIS\fR. If a user wants to update his own personal menu he should
call
.B update-menus(1)
directly.
.SH OPTIONS
.TP
-.B CDD
-- one of the installed CDDs, listed in /etc/cdd/, for example (if installed):
+.B DIS
+- one of the installed DISs, listed in /etc/dis/, for example (if installed):
.I med
,
.I junior
,
-.I desktop
-,
.I edu
+,
+.I science
or
-.I demudi
+.I gis
.SH AUTHOR
Andreas Tille <tille at debian.org>, Cosimo Alfarano <kalfa at debian.org>
Copied: cdd/trunk/dis/dis-user (from r1033, cdd/trunk/cdd/cdd-user)
==============================================================================
--- cdd/trunk/cdd/cdd-user (original)
+++ cdd/trunk/dis/dis-user Mon Aug 18 00:02:23 2008
@@ -3,21 +3,21 @@
# $Id$
usage () {
- echo "Usage: `basename $0` <action> <CDD> <user> [<Role>]"
+ echo "Usage: `basename $0` <action> <DIS> <user> [<Role>]"
echo "action: add|del"
- echo "CDD: `getCDDList|tr ' ' '|'`"
- echo "user: user of the system who should be added to the CDD"
- echo "Role: a registered Role for specified CDD"
- echo " (default: the one named like CDD)"
+ echo "DIS: `getDISList|tr ' ' '|'`"
+ echo "user: user of the system who should be added to the DIS"
+ echo "Role: a registered Role for specified DIS"
+ echo " (default: the one named like DIS)"
}
-# the base dir for CDD conffiles, where script expects to find dirs named like
-# each registered CDDs
-CONFBASE=${CONFBASE:-/etc/cdd}
+# the base dir for DIS conffiles, where script expects to find dirs named like
+# each registered DISs
+CONFBASE=${CONFBASE:-/etc/dis}
-# a local per CDD conf is sourced later, after argoument parsing
-. ${CONFBASE}/cdd.conf
+# a local per DIS conf is sourced later, after argoument parsing
+. ${CONFBASE}/dis.conf
# Check consistency of passed argouments
@@ -32,7 +32,7 @@
exit 67 # EX_USAGE
fi
if [ -z "$2" ] ; then
- echo "Missing cdd name."
+ echo "Missing dis name."
echo
usage
exit 67 # EX_USAGE
@@ -45,67 +45,67 @@
fi
ACTION=$1
-CDD=$2
-CDDUSER=$3
-ROLE=${4:-${CDD}}
+DIS=$2
+DISUSER=$3
+ROLE=${4:-${DIS}}
-# Now that we know the selected CDD, we can check if there is a local
+# Now that we know the selected DIS, we can check if there is a local
# configuration for it (ie differnt backend from the default one)
-test -n "${CDD}" -a -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- . ${CONFBASE}/${CDD}/${CDD}.conf
+test -n "${DIS}" -a -f ${CONFBASE}/${DIS}/${DIS}.conf &&
+ . ${CONFBASE}/${DIS}/${DIS}.conf
if [ -n "${DBBACKEND}" ]; then
set -e
- checkCDD ${CDD} || cddFail $? "Custom distribution ${CDD} does not exist"
- checkUser ${CDDUSER} || cddFail $? "User ${CDDUSER} does not exist"
- checkRole ${ROLE} || cddFail $? "Role ${ROLE} does not exist"
- checkRoleInCDD ${CDD} ${ROLE} || \
- cddFail $? "CDD (${CDD}) and Role (${ROLE}) are not correct or incompatible with the selected backend"
+ checkDIS ${DIS} || disFail $? "Debian Integrated Solution ${DIS} does not exist"
+ checkUser ${DISUSER} || disFail $? "User ${DISUSER} does not exist"
+ checkRole ${ROLE} || disFail $? "Role ${ROLE} does not exist"
+ checkRoleInDIS ${DIS} ${ROLE} || \
+ disFail $? "DIS (${DIS}) and Role (${ROLE}) are not correct or incompatible with the selected backend"
if [ "`toLower ${ACTION}`" = "add" ]; then
- setUserRole ${CDD} ${CDDUSER} ${ROLE} || \
- cddFail $? "Failed to set user ${CDDUSER} to role ${ROLE}"
+ setUserRole ${DIS} ${DISUSER} ${ROLE} || \
+ disFail $? "Failed to set user ${DISUSER} to role ${ROLE}"
elif [ "`toLower ${ACTION}`" = "del" ]; then
- unsetUserRole ${CDD} ${CDDUSER} ${ROLE} || \
- cddFail $? "Failed to unset user ${CDDUSER} to role ${ROLE}"
+ unsetUserRole ${DIS} ${DISUSER} ${ROLE} || \
+ disFail $? "Failed to unset user ${DISUSER} to role ${ROLE}"
fi
# # MENU installation
#
-# # All CDD menu entries will go in .cdd-menu, only one file will goes in
+# # All DIS menu entries will go in .dis-menu, only one file will goes in
# # .menu, so it's easy to remove/update
-# UHOME=`getUserHome ${CDDUSER}`
+# UHOME=`getUserHome ${DISUSER}`
# if [ ! -d "${UHOME}" ] ; then
-# logFail 67 "Home directory for user ${CDDUSER} does not exist.\n... Sorry can not update menus."
+# logFail 67 "Home directory for user ${DISUSER} does not exist.\n... Sorry can not update menus."
# fi
#
# if [ ! -d ${UHOME}/.menu ] ; then
# mkdir -p ${UHOME}/.menu
-# chown ${CDDUSER}: ${UHOME}/.menu
+# chown ${DISUSER}: ${UHOME}/.menu
# fi
#
-# if [ ! -d ${UHOME}/.cdd-menu ] ; then
-# mkdir -p ${UHOME}/.cdd-menu
-# chown ${CDDUSER}: ${UHOME}/.cdd-menu
+# if [ ! -d ${UHOME}/.dis-menu ] ; then
+# mkdir -p ${UHOME}/.dis-menu
+# chown ${DISUSER}: ${UHOME}/.dis-menu
# fi
#
# MENUS=""
-# if [ -d ${CONFBASE}/${CDD} ] ; then
-# if [ -d ${CONFBASE}/${CDD}/menu ] ; then
-# for MENU in `ls ${CONFBASE}/${CDD}/menu` ; do
-# cp -a ${CONFBASE}/${CDD}/menu/${MENU} ${UHOME}/.cdd-menu
-# chown ${CDDUSER}: ${UHOME}/.cdd-menu/${MENU}
+# if [ -d ${CONFBASE}/${DIS} ] ; then
+# if [ -d ${CONFBASE}/${DIS}/menu ] ; then
+# for MENU in `ls ${CONFBASE}/${DIS}/menu` ; do
+# cp -a ${CONFBASE}/${DIS}/menu/${MENU} ${UHOME}/.dis-menu
+# chown ${DISUSER}: ${UHOME}/.dis-menu/${MENU}
# MENUS="${MENUS} ${MENU}"
# done
# fi
# fi
#
# for MENU in ${MENUS}; do
-# echo '!include'" ${UHOME}/.cdd-menu/${MENU}"
-# done > ${UHOME}/.menu/cdd-menu
+# echo '!include'" ${UHOME}/.dis-menu/${MENU}"
+# done > ${UHOME}/.menu/dis-menu
set +e
else
# EX_USAGE
- cddFail 67 "You choose to not use Roles"
+ disFail 67 "You choose to not use Roles"
fi
Copied: cdd/trunk/dis/dis-user.8 (from r1033, cdd/trunk/cdd/cdd-user.8)
==============================================================================
--- cdd/trunk/cdd/cdd-user.8 (original)
+++ cdd/trunk/dis/dis-user.8 Mon Aug 18 00:02:23 2008
@@ -1,13 +1,13 @@
-.TH cdd-user 8 "2004/03/24" "" "Custom Debian Distributions"
+.TH dis-user 8 "2004/03/24" "" "Debian Integrated Solutions"
.SH NAME
-.B cdd-user
-\- add/remove user to Role of a registered Custom Debian Distribution
+.B dis-user
+\- add/remove user to Role of a registered Debian Integrated Solution
.SH SYNOPSIS
-.B cdd-user
+.B dis-user
.B add|del
<
-.B CDD
+.B DIS
>
<
.B user
@@ -20,17 +20,17 @@
Add user to a
.B Role
of the specified
-.B CDD
+.B DIS
If
.B Role
is not specified, it's assumed to be named like
-.B CDD
+.B DIS
.SH OPTIONS
.TP
-.B CDD
-- a registered custom distribution in /etc/cdd, for example one of
+.B DIS
+- a registered Debian Integrated Solution in /etc/dis, for example one of
.I med
,
.I junior
@@ -44,7 +44,7 @@
.B user
- user to add
.B Role
-- the role in the CDD that user will assume
+- the role in the DIS that user will assume
.SH AUTHOR
Andreas Tille <tille at debian.org>
Copied: cdd/trunk/dis/dis.conf.5 (from r1033, cdd/trunk/cdd/cdd.conf.5)
==============================================================================
--- cdd/trunk/cdd/cdd.conf.5 (original)
+++ cdd/trunk/dis/dis.conf.5 Mon Aug 18 00:02:23 2008
@@ -1,15 +1,15 @@
-.TH CDD.CONF 5 2004-05-10 "Custom Debian Distribution Configuration" ""
+.TH DIS.CONF 5 2004-05-10 "Debian Integraded Solution Configuration" ""
.SH NAME
-cdd.conf \- configuration for Custom Debian Distribution registry
+dis.conf \- configuration for Debian Integraded Solution registry
.SH DESCRIPTION
-This file is sourced from shell scripts inside the Custom Debian
-Distribution package
-.B cdd-common
+This file is sourced from shell scripts inside the Debian Integrated
+Solution package
+.B dis-common
and thus it has to follow shell syntax. The variables which are set
-inside this configuration file can be overriden by special CDD
+inside this configuration file can be overriden by special DIS
configration files
-.I /etc/cdd/<cdd>/<cdd>.conf
-for each single CDD.
+.I /etc/dis/<dis>/<dis>.conf
+for each single DIS.
.SH SYNTAX
The following variables can be set:
@@ -27,7 +27,7 @@
the user menus of meta packages can be created automatically at
install time of the package if the postinst script of the package
allows this. It is suggested to use this option in the specific
-configuration files of a special Custom Debian Distribution which
+configuration files of a special Debian Integraded Solution which
overrides the settings of the general configuration file.
.TP
.I SHAREDIR
@@ -48,9 +48,9 @@
debugging mode is switched on.
.SH "SEE ALSO"
-.BR cdd-role (8)
-.BR cdd-update-menus (8)
-.BR cdd-user (8)
+.BR dis-role (8)
+.BR dis-update-menus (8)
+.BR dis-user (8)
.SH AUTHOR
Andreas Tille <tille at debian.org>
Modified: cdd/trunk/dis/etc/cdd/cdd.conf
==============================================================================
--- cdd/trunk/cdd/etc/cdd/cdd.conf (original)
+++ cdd/trunk/dis/etc/cdd/cdd.conf Mon Aug 18 00:02:23 2008
@@ -2,7 +2,7 @@
# unset it if no DBBACKEND is wanted (no use of Roles)
DBBACKEND=unixgroups
-SHAREDIR=${SHAREDIR:-/usr/share/cdd}
+SHAREDIR=${SHAREDIR:-/usr/share/dis}
# unset (NOT set it to false!) for disable dryrun
#DRYRUN=true
@@ -11,8 +11,8 @@
#DEBUG=1
# Utility functions, backend indep
-. ${SHAREDIR}/cdd-utils
-. ${SHAREDIR}/cdd-actions
+. ${SHAREDIR}/dis-utils
+. ${SHAREDIR}/dis-actions
# actual action performed by choosen backend
-. ${SHAREDIR}/${DBBACKEND}/cdd-actions
+. ${SHAREDIR}/${DBBACKEND}/dis-actions
Modified: cdd/trunk/dis/share/cdd/cdd-actions
==============================================================================
--- cdd/trunk/cdd/share/cdd/cdd-actions (original)
+++ cdd/trunk/dis/share/cdd/cdd-actions Mon Aug 18 00:02:23 2008
@@ -1,18 +1,18 @@
# $Id$
#
-# Backend independant functions for cdd package
+# Backend independant functions for dis package
#
# For error codes check in /usr/include/sysexits.h
# CHECK Functions
-# checks if CDD $1 exists as a CDD
-checkCDD() {
+# checks if DIS $1 exists as a DIS
+checkDIS() {
RET=0
- CDD=$1
+ DIS=$1
if [ $# -ne 1 ]; then
RET=64 # EX_USAGE
- elif ! [ -d ${CONFBASE}/`toLower ${CDD}` ]; then
+ elif ! [ -d ${CONFBASE}/`toLower ${DIS}` ]; then
RET=67 # EX_NOUSER
fi
return ${RET}
@@ -20,32 +20,32 @@
# GET Functions
-# echos a blank-space separated list of CDDs registered into CDD subsystem
-getCDDList() {
+# echos a blank-space separated list of DISs registered into DIS subsystem
+getDISList() {
# 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 CDD present in the current system
+# echoes a list of DBBACKEND for DIS 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 CDD?
-# it's a kludgy way :(, run a subshell and iterate on every registered CDD
-# checking if a user covers a Role in that CDD.
+# 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.
isUserRegistered() {
RET=1 # return false
- CDDUSER=$1
+ DISUSER=$1
- for CDD in `getCDDList`; do
+ for DIS in `getDISList`; do
# Run a subshell as a environment sandbox
- ( test -f ${CONFBASE}/${CDD}/${CDD}.conf &&
- . ${CONFBASE}/${CDD}/${CDD}.conf
- . ${SHAREDIR}/${DBBACKEND}/cdd-actions
- checkUserInCDD ${CDD} ${CDDUSER} && exit 0
+ ( test -f ${CONFBASE}/${DIS}/${DIS}.conf &&
+ . ${CONFBASE}/${DIS}/${DIS}.conf
+ . ${SHAREDIR}/${DBBACKEND}/dis-actions
+ checkUserInDIS ${DIS} ${DISUSER} && exit 0
) && RET=0 && break
done
return ${RET}
Modified: cdd/trunk/dis/share/cdd/cdd-update-menus
==============================================================================
--- cdd/trunk/cdd/share/cdd/cdd-update-menus (original)
+++ cdd/trunk/dis/share/cdd/cdd-update-menus Mon Aug 18 00:02:23 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 CDD
+# updates user's menu for user $1, indipendently from any DIS
updateUser() {
RET=0
SYSUSER=$1
return ${RET}
}
-# updates menu scripts for any user registered in CDD
-updateCDD() {
+# updates menu scripts for any user registered in DIS
+updateDIS() {
RET=0
- CDD=$1
+ DIS=$1
return ${RET}
}
Modified: cdd/trunk/dis/share/cdd/cdd-utils
==============================================================================
--- cdd/trunk/cdd/share/cdd/cdd-utils (original)
+++ cdd/trunk/dis/share/cdd/cdd-utils Mon Aug 18 00:02:23 2008
@@ -6,13 +6,13 @@
}
# log (typically echos on stdout)
-cddLog() {
+disLog() {
echo $@
return 0
}
# log error (typically echos on stderr)
-cddErr() {
+disErr() {
RET=$1
shift
echo "err ${RET}: $@" > /dev/stderr
@@ -20,7 +20,7 @@
}
# log on stderr for debug outputs
-cddDebug() {
+disDebug() {
test -n "${DEBUG}" && echo "debug: $@" > /dev/stderr
return 0
}
@@ -28,7 +28,7 @@
# log error and return a fail code $1
-cddFail() {
+disFail() {
RET=$1
shift
echo "err ${RET}: $@" > /dev/stderr
Modified: cdd/trunk/dis/share/cdd/unixgroups/cdd-actions
==============================================================================
--- cdd/trunk/cdd/share/cdd/unixgroups/cdd-actions (original)
+++ cdd/trunk/dis/share/cdd/unixgroups/cdd-actions Mon Aug 18 00:02:23 2008
@@ -1,12 +1,12 @@
# $Id$
#
-# Backend dependant functions for cdd package
+# Backend dependant functions for dis package
#
# For error codes check in /usr/include/sysexits.h
# CHECK Functions
-#checkCDD() is backend indep, and is defined in ${SHAREDIR}/cdd-action
+#checkDIS() is backend indep, and is defined in ${SHAREDIR}/dis-action
# 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
- CDDUSER=$1
+ DISUSER=$1
if [ $# -ne 1 ]; then
RET=64 # EX_USAGE
- elif ! getent passwd "${CDDUSER}" > /dev/null; then
+ elif ! getent passwd "${DISUSER}" > /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 CDD project, exists
+# actually a mere check if Unix group, named like the DIS project, exists
checkRole() {
RET=0
ROLE=$1
@@ -39,59 +39,59 @@
}
-# check if CDD ($1) has registered Role ($2)
-# (or, in other words, if Role has been registerd in CDD)
-checkRoleInCDD() {
+# check if DIS ($1) has registered Role ($2)
+# (or, in other words, if Role has been registerd in DIS)
+checkRoleInDIS() {
RET=0
- CDD=$1
+ DIS=$1
ROLE=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
- # currently there is no way to extract a Role from a CDD if
+ # currently there is no way to extract a Role from a DIS if
# they're named differently, using unixgroups backend
- elif [ "${CDD}" != "${ROLE}" ]; then
+ elif [ "${DIS}" != "${ROLE}" ]; then
RET=69 # EX_UNAVAILABLE
fi
return ${RET}
}
-# checks if user $2 is registered in CDD $1
-checkUserInCDD() {
+# checks if user $2 is registered in DIS $1
+checkUserInDIS() {
RET=0
- CDD=$1
- CDDUSER=$2
+ DIS=$1
+ DISUSER=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
- # currently the only way to check if user is registered in a CDD is check
- # if he/she covers any role the CDD, using unixgroups backend
- elif [ -z "`getUserRoles ${CDD} ${CDDUSER}`" ]; then
- RET=1 # user has no role, so is not registered in CDD
+ # 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
fi
return ${RET}
}
# GET Functions
-# getCDDList() is backend indep and is defined in ${SHAREDIR}/cdd-action
+# getDISList() is backend indep and is defined in ${SHAREDIR}/dis-action
-# echos the roles registered by CDD
+# echos the roles registered by DIS
# for Unix groups backend, it's actually the identity function
-getCDDRoleList() {
+getDISRoleList() {
RET=0
- CDD=$1
+ DIS=$1
if [ "$#" -ne 1 ]; then
RET=64 # EX_USAGE
else
- checkRole ${CDD} && echo ${CDD}
+ checkRole ${DIS} && echo ${DIS}
fi
return ${RET}
}
-# echoes list of users having role $2 in CDD $1
+# echoes list of users having role $2 in DIS $1
# if $4 exists use ',' as separator between user names
getUsersInRole() {
RET=0
- CDD=$1
+ DIS=$1
ROLE=$2
SIMPLE=$3
USERS=""
@@ -153,23 +153,23 @@
fi
return ${RET}
}
-# echo all Role covered by user $2 in CDD $1
+# echo all Role covered by user $2 in DIS $1
getUserRoles() {
RET=0
- CDD=$1
- CDDUSER=$2
+ DIS=$1
+ DISUSER=$2
if [ "$#" -ne 2 ]; then
RET=64 # EX_USAGE
else
- CDDROLES=`getCDDRoleList ${CDD}`
+ DISROLES=`getDISRoleList ${DIS}`
ROLES=""
- for ROLE in ${CDDROLES}; do
- for USER in `getUsersInRole ${CDD} ${ROLE} 1`; do
- test "${USER}" == "${CDDUSER}" && \
+ for ROLE in ${DISROLES}; do
+ for USER in `getUsersInRole ${DIS} ${ROLE} 1`; do
+ test "${USER}" == "${DISUSER}" && \
ROLES="${ROLES} ${ROLE}"
done
done
- cddDebug "getUserRoles(): roles covered by user ${CDDUSER} in CDD ${CDD}: ${ROLES}"
+ disDebug "getUserRoles(): roles covered by user ${DISUSER} in DIS ${DIS}: ${ROLES}"
echo ${ROLES}
fi
return ${RET}
@@ -179,12 +179,12 @@
# echos the home directory of the system user
getUserHome() {
RET=0
- CDDUSER=$1
+ DISUSER=$1
if [ "$#" -ne 1 ]; then
RET=64 # EX_USAGE
else
- if checkUser ${CDDUSER}; then
- getent passwd ${CDDUSER} | sed "s/.*:\([^:]*\):[^:]*$/\1/"
+ if checkUser ${DISUSER}; then
+ getent passwd ${DISUSER} | 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 CDD $1, as a system
+# adds role $2 to current unix groups for the specified DIS $1, as a system
# dynamic allocated group
addRole() {
RET=0
- CDD=$1
+ DIS=$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 CDD $1
+# set user $2 to have role $3, for the specified DIS $1
setUserRole() {
RET=0
- CDD=$1
+ DIS=$1
USER=$2
ROLE=$3
if [ "$#" -ne 3 ]; then
@@ -234,11 +234,11 @@
# DEL/USET Functions
-# remove role $2 for the specified CDD $1 from current unix groups, as a
+# remove role $2 for the specified DIS $1 from current unix groups, as a
# system dynamic allocated group
delRole() {
RET=0
- CDD=$1
+ DIS=$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 CDD $1
+# unset user $2 from having role $3, for the specified DIS $1
unsetUserRole() {
RET=0
- CDD=$1
- CDDUSER=$2
+ DIS=$1
+ DISUSER=$2
ROLE=$3
- # Make sure CDDUSER and ROLE are BOTH defined,
+ # Make sure DISUSER and ROLE are BOTH defined,
# to avoid disasters using deluser
if [ "$#" -ne 3 ]; then
RET=64 # EX_USAGE
else
- if checkUser "${CDDUSER}"; then
- ${DRYRUN} deluser "${CDDUSER}" "${ROLE}"
+ if checkUser "${DISUSER}"; then
+ ${DRYRUN} deluser "${DISUSER}" "${ROLE}"
RET=$?
else
RET=67 # EX_NOUSER
Modified: cdd/trunk/dis/share/menu/cdd-menu
==============================================================================
--- cdd/trunk/cdd/share/menu/cdd-menu (original)
+++ cdd/trunk/dis/share/menu/cdd-menu Mon Aug 18 00:02:23 2008
@@ -1,31 +1,31 @@
#!/bin/bash
-# Script to handle menu profiles for CDD subsystem, installed by your system
-# administrator via cdd-common package.
+# Script to handle menu profiles for DIS subsystem, installed by your system
+# administrator via dis-common package.
#
# It prints on STDOUT Debian menu entries for user
-CONFBASE=${CONFBASE:-/etc/cdd}
+CONFBASE=${CONFBASE:-/etc/dis}
-# read generic CDD conf ... in case it exists
+# read generic DIS 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}/cdd.conf in
-# case you are installing cdd-common the first time. I do not regard this
+# 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
# as a reasonable behaviour because it is a real performance loss and
-# obviousely error prone (for instance in case of cdd-common (see #484167)
+# obviousely error prone (for instance in case of dis-common (see #484167)
# but we have to deal with this somehow
-if [ -s "${CONFBASE}/cdd.conf" ] ; then
- . ${CONFBASE}/cdd.conf
+if [ -s "${CONFBASE}/dis.conf" ] ; then
+ . ${CONFBASE}/dis.conf
else
exit 0
fi
-CDDUSER=`whoami`
+DISUSER=`whoami`
-tasksdir=/usr/share/cdd/tasks
+tasksdir=/usr/share/dis/tasks
# it has to be run only by unprivileged users via update-menus
-test "${CDDUSER}" == "root" && exit 0
+test "${DISUSER}" == "root" && exit 0
# Upper case the first letter of a string to have a nicer menu
NameToUpper() {
@@ -60,15 +60,15 @@
return 0
}
-# Strip CDD-name from meta package name
+# Strip DIS-name from meta package name
GetTaskNameFromPackage () {
if [ $# -ne 2 ] ; then
RET=64 # EX_USAGE
return ${RET}
fi
- CDD=$1 # CDD - name
+ DIS=$1 # DIS - name
PKG=$2 # meta package name
- echo $PKG | sed "s/^$CDD-//"
+ echo $PKG | sed "s/^$DIS-//"
return 0
}
@@ -79,7 +79,7 @@
return ${RET}
fi
PKG=$1 # meta package name
- cat "$tasksdir"/"$CDD"/`GetTaskNameFromPackage "$CDD" "$PKG"`
+ cat "$tasksdir"/"$DIS"/`GetTaskNameFromPackage "$DIS" "$PKG"`
return 0
}
@@ -89,9 +89,9 @@
RET=64 # EX_USAGE
return ${RET}
fi
- PKG="$CDD"-$1
+ PKG="$DIS"-$1
TASK=`GetTaskTitle $PKG`
- SECTION=`NameToUpper "$CDD"`/`NameToUpper "$TASK"`
+ SECTION=`NameToUpper "$DIS"`/`NameToUpper "$TASK"`
# find the list of Depends / Recommends / Suggests
DepPkgs=`dpkg --status "$PKG" | \
@@ -99,33 +99,33 @@
grep -v ^[A-CE-QT-Z] | \
grep -v ^S[eot] | \
sed -e "s/([^)]*)//" \
- -e "s/,* *${CDD}-config//" \
+ -e "s/,* *${DIS}-config//" \
-e "s/^[^:]*: *//" \
-e "s/, */\\n/g" | \
sort | uniq`
- # check whether CDD-maintainer provided menu override different from
+ # check whether DIS-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
# the dependant package. The rationale is that you can get more
# fine grained replacements.
- cddmenufile=""
+ dismenufile=""
if [ -s "$HOME"/.menu/"$PKG" ] ; then
- cddmenufile="$HOME"/.menu/"$PKG"
- elif [ -s /etc/cdd/"$CDD"/menu/"$PKG" ] ; then
- cddmenufile=/etc/cdd/"$CDD"/menu/"$PKG"
- elif [ -s /usr/lib/cdd/"$CDD"/menu/"$PKG" ] ; then
- cddmenufile=/usr/lib/cdd/"$CDD"/menu/"$PKG"
- elif [ -s /usr/share/cdd/"$CDD"/menu/"$PKG" ] ; then
- cddmenufile=/usr/share/cdd/"$CDD"/menu/"$PKG"
+ 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"
fi
for pkg in $DepPkgs ; do
- # if CDD maintainer provided override just continue
- [ ! -z "$cddmenufile" ] && grep -q -i "?package($pkg)" "$cddmenufile" && continue
+ # if DIS maintainer provided override just continue
+ [ ! -z "$dismenufile" ] && grep -q -i "?package($pkg)" "$dismenufile" && continue
- # check for documentation text of CDD maintainer which should
+ # check for documentation text of DIS maintainer which should
# be prefered over package maintainers menu
docfile=""
if [ -s /usr/share/doc/"$PKG"/"$pkg".html ] ; then
@@ -135,7 +135,7 @@
elif [ -s /usr/share/doc/"$PKG"/"$pkg" ] ; then
docfile=/usr/share/doc/"$PKG"/"$pkg"
fi
- # if CDD maintainer provides documentation view this as menu entry ...
+ # if DIS 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 +159,15 @@
fi
# search for a menu file with the following priority
- # ${HOME}/.menu, /etc/menu, /usr/share/cdd/${CDD}/menu, /usr/share/menu, /usr/lib/menu
+ # ${HOME}/.menu, /etc/menu, /usr/share/dis/${DIS}/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/cdd/"$CDD"/menu/"$pkg" ] ; then
- pkgmenufile=/usr/share/cdd/"$CDD"/menu/"$pkg"
+ elif [ -s /usr/share/dis/"$DIS"/menu/"$pkg" ] ; then
+ pkgmenufile=/usr/share/dis/"$DIS"/menu/"$pkg"
donotchange=0
elif [ -s /usr/share/menu/"$pkg" ] ; then
pkgmenufile=/usr/share/menu/"$pkg"
@@ -195,31 +195,31 @@
echo
done
- [ -s "$cddmenufile" ] && cat "$cddmenufile"
+ [ -s "$dismenufile" ] && cat "$dismenufile"
}
-ALLCDD=`getCDDList`
-for CDD in ${ALLCDD}; do
- # read per CDD conf
- test -f ${CONFBASE}/${CDD}/${CDD}.conf && \
- . ${CONFBASE}/${CDD}/${CDD}.conf
+ALLDIS=`getDISList`
+for DIS in ${ALLDIS}; do
+ # read per DIS conf
+ test -f ${CONFBASE}/${DIS}/${DIS}.conf && \
+ . ${CONFBASE}/${DIS}/${DIS}.conf
- if [ -d "$tasksdir"/"$CDD" ] ; then
- for PKG in `ls "$tasksdir"/"$CDD"` ; do
+ if [ -d "$tasksdir"/"$DIS" ] ; then
+ for PKG in `ls "$tasksdir"/"$DIS"` ; do
getMenuEntriesFromDependencies "$PKG"
done
fi
-# # print on STDOUT menu generic entries if user belongs to CDD
-# checkUserInCDD ${CDD} ${CDDUSER} && \
-# test -d ${CONFBASE}/${CDD}/menu/ && \
-# find ${CONFBASE}/${CDD}/menu/ -maxdepth 1 -mindepth 1 -type f \
+# # 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 \
# -exec cat {} \;
#
# # and role specific menu entries
-# for ROLE in `getUserRoles ${CDD} ${CDDUSER}`; do
-# test -d ${CONFBASE}/${CDD}/menu/${ROLE} &&
-# find ${CONFBASE}/${CDD}/menu/${ROLE} -maxdepth 1 -mindepth 1 \
+# for ROLE in `getUserRoles ${DIS} ${DISUSER}`; do
+# test -d ${CONFBASE}/${DIS}/menu/${ROLE} &&
+# find ${CONFBASE}/${DIS}/menu/${ROLE} -maxdepth 1 -mindepth 1 \
# -type f -exec cat {} \;
# done
done
Modified: cdd/trunk/dis/sources.list.unstable
==============================================================================
--- cdd/trunk/cdd/sources.list.unstable (original)
+++ cdd/trunk/dis/sources.list.unstable Mon Aug 18 00:02:23 2008
@@ -3,5 +3,5 @@
# to testing for all meta packages and thus here testing is used as target
# distribution. You are free to provide your own source.list.unstable
# in the source of your meta package building code to force unstable as
-# target or alternatively you could change this file (/etc/cdd/sources.list.unstable).
+# target or alternatively you could change this file (/etc/dis/sources.list.unstable).
deb http://ftp.debian.org/ testing main
Modified: cdd/trunk/dis/templates/README.Debian
==============================================================================
--- cdd/trunk/cdd/templates/README.Debian (original)
+++ cdd/trunk/dis/templates/README.Debian Mon Aug 18 00:02:23 2008
@@ -1,4 +1,4 @@
-This is a meta package which is used by Custom Debian Distributions
+This is a meta package which is used by Debian Integrated Solutions
-------------------------------------------------------------------
This package is a meta-package; it depends on several other packages to make
@@ -6,7 +6,7 @@
packages, you have to remove this package as well. The other packages won't be
touched.
-There exists an comprehensive documentation about Custom Debian Distributions
+There exists an comprehensive documentation about Debian Integrated Solutions
which can be found at http://alioth.debian.org/projects/cdd/.
The meta packages should always be installable on a Debian system.
Modified: cdd/trunk/dis/templates/apt.conf
==============================================================================
--- cdd/trunk/cdd/templates/apt.conf (original)
+++ cdd/trunk/dis/templates/apt.conf Mon Aug 18 00:02:23 2008
@@ -2,9 +2,9 @@
* $Id$
*/
/*
- * APT configuration file for #CDD#-config package
+ * APT configuration file for #DIS#-config package
*/
DPkg {
- Post-Invoke {"test -f /var/run/#CDD#-config.usermenu && if [ -x /usr/sbin/cdd-update-usermenus ] ; then /usr/sbin/cdd-update-usermenus #CDD# ; fi ; rm -f /var/run/#CDD#-config.usermenu";};
+ Post-Invoke {"test -f /var/run/#DIS#-config.usermenu && if [ -x /usr/sbin/dis-update-usermenus ] ; then /usr/sbin/dis-update-usermenus #DIS# ; fi ; rm -f /var/run/#DIS#-config.usermenu";};
}
Modified: cdd/trunk/dis/templates/config.config
==============================================================================
--- cdd/trunk/cdd/templates/config.config (original)
+++ cdd/trunk/dis/templates/config.config Mon Aug 18 00:02:23 2008
@@ -7,37 +7,37 @@
db_capb backup
fi
-db_input "medium" "shared/#CDD#-config/useusermenus" || true
+db_input "medium" "shared/#DIS#-config/useusermenus" || true
db_go
-db_get shared/#CDD#-config/useusermenus
+db_get shared/#DIS#-config/useusermenus
if [ $RET ] ; then
- db_input "medium" "shared/#CDD#-config/usermenus" || true
+ db_input "medium" "shared/#DIS#-config/usermenus" || true
db_go
fi
-# if cdd-config package is not yet installed we have to stop here
-if [ ! -f /etc/cdd/cdd.conf ] ; then
+# if dis-config package is not yet installed we have to stop here
+if [ ! -f /etc/dis/dis.conf ] ; then
db_stop
exit 0
fi
-[ -s /etc/cdd/cdd.conf ] && . /etc/cdd/cdd.conf
-[ -s /etc/cdd/#CDD#/#CDD#.conf ] && . /etc/cdd/#CDD#/#CDD#.conf
+[ -s /etc/dis/dis.conf ] && . /etc/dis/dis.conf
+[ -s /etc/dis/#DIS#/#DIS#.conf ] && . /etc/dis/#DIS#/#DIS#.conf
-# Add at least one default role for each CDD
-addRole #CDD# #CDD#
+# Add at least one default role for each DIS
+addRole #DIS# #DIS#
# Login names of all users of the system as comma separated list
USERS=`getAllUsers 0 ,`
-# "login (Real Name)" of users registered to the CDD #CDD#
-CDDUSERS=`getUsersInRole #CDD# #CDD# 0 ,`
+# "login (Real Name)" of users registered to the DIS #DIS#
+DISUSERS=`getUsersInRole #DIS# #DIS# 0 ,`
-db_set #CDD#-config/group "$CDDUSERS"
-db_subst #CDD#-config/group users "$USERS"
-db_get #CDD#-config/group
+db_set #DIS#-config/group "$DISUSERS"
+db_subst #DIS#-config/group users "$USERS"
+db_get #DIS#-config/group
-db_input high #CDD#-config/group || true
+db_input high #DIS#-config/group || true
db_go
db_stop
Modified: cdd/trunk/dis/templates/config.install
==============================================================================
--- cdd/trunk/cdd/templates/config.install (original)
+++ cdd/trunk/dis/templates/config.install Mon Aug 18 00:02:23 2008
@@ -1 +1 @@
-debian/90#CDD#-config etc/apt/apt.conf.d
+debian/90#DIS#-config etc/apt/apt.conf.d
Modified: cdd/trunk/dis/templates/config.links
==============================================================================
--- cdd/trunk/cdd/templates/config.links (original)
+++ cdd/trunk/dis/templates/config.links Mon Aug 18 00:02:23 2008
@@ -1 +1 @@
-usr/share/cdd/cdd-task-lister usr/lib/tasksel/#CDD#-task-files
+usr/share/dis/dis-task-lister usr/lib/tasksel/#DIS#-task-files
Modified: cdd/trunk/dis/templates/config.postinst
==============================================================================
--- cdd/trunk/cdd/templates/config.postinst (original)
+++ cdd/trunk/dis/templates/config.postinst Mon Aug 18 00:02:23 2008
@@ -1,44 +1,44 @@
#!/bin/sh -e
-# if cdd-common package is not yet installed we have to stop here
-if [ ! -f /etc/cdd/cdd.conf ] ; then
- echo "Custom Debian Distribution configuration file /etc/cdd/cdd.conf is missing."
+# if dis-common package is not yet installed we have to stop here
+if [ ! -f /etc/dis/dis.conf ] ; then
+ echo "Debian Integrated Solution configuration file /etc/dis/dis.conf is missing."
exit -1
fi
-. /etc/cdd/cdd.conf
+. /etc/dis/dis.conf
-if [ ! -f /etc/cdd/#CDD#/#CDD#.conf ] ; then
- echo "#CDDNAME# configuration file /etc/cdd/#CDD#/#CDD#.conf is missing."
+if [ ! -f /etc/dis/#DIS#/#DIS#.conf ] ; then
+ echo "#DISNAME# configuration file /etc/dis/#DIS#/#DIS#.conf is missing."
exit -1
fi
-. /etc/cdd/#CDD#/#CDD#.conf
+. /etc/dis/#DIS#/#DIS#.conf
# Source debconf library.
. /usr/share/debconf/confmodule
db_version 2.0
-# If $USEUSERMENU is not set in /etc/cdd/#CDD#/#CDD#.conf read it from debconf database
+# If $USEUSERMENU is not set in /etc/dis/#DIS#/#DIS#.conf read it from debconf database
if [ -z $USEUSERMENU ] ; then
- db_get shared/#CDD#-config/useusermenus
+ db_get shared/#DIS#-config/useusermenus
if [ $RET ] ; then
USEUSERMENU="yes"
fi
fi
if [ "$USEUSERMENU" = "yes" ] ; then
- db_get #CDD#-config/group
+ db_get #DIS#-config/group
- CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD# 1`
+ CURRENTDISUSERS=`getUsersInRole #DIS# #DIS# 1`
# Add those users which were selected but are not yet in the group
for user in `echo "$RET" | sed "s/([^)]*)//g" | sed "s/ //g" | tr ',' '\n'` ; do
- if [ `echo "${CURRENTCDDUSERS}" | grep -c -w "$user"` -eq 0 ] ; then
- /usr/sbin/cdd-user add #CDD# $user
+ if [ `echo "${CURRENTDISUSERS}" | grep -c -w "$user"` -eq 0 ] ; then
+ /usr/sbin/dis-user add #DIS# $user
fi
done
- # Del those users which were obviousely removed from list of CDD users
+ # Del those users which were obviousely removed from list of DIS users
for user in `getAllUsers 1` ; do
- if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group #CDD# | grep -c -w $user` -gt 0 ] ; then
- /usr/sbin/cdd-user del #CDD# $user
+ if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group #DIS# | grep -c -w $user` -gt 0 ] ; then
+ /usr/sbin/dis-user del #DIS# $user
fi
done
fi
Modified: cdd/trunk/dis/templates/config.templates
==============================================================================
--- cdd/trunk/cdd/templates/config.templates (original)
+++ cdd/trunk/dis/templates/config.templates Mon Aug 18 00:02:23 2008
@@ -1,21 +1,21 @@
-Template: #CDD#-config/group
+Template: #DIS#-config/group
Type: multiselect
Choices: ${users}
-_Description: #CDDNAME# users:
+_Description: #DISNAME# users:
Please select, among the whole system user list, users who should get
- a #CDDNAME# user menu.
+ a #DISNAME# user menu.
-Template: shared/#CDD#-config/usermenus
+Template: shared/#DIS#-config/usermenus
Type: select
_Choices: Each package installation, End of installation, Never
Default: never
_Description: Build user menus at:
- The meta packages of the #CDDNAME# Custom Debian Distribution
+ The meta packages of the #DISNAME# Debian Integrated Solution
contain extra menus that will be auto generated from existing packages.
If the role based user menu option was choosen these menus will be built
when a user who is registered to a given role uses the "update-menus"
utility. This can be done automatically for all users who are registered
- for #CDDNAME# after installation of each single meta package,
+ for #DISNAME# after installation of each single meta package,
at the end of the whole installation process to save time in case
of installing more than one meta package or just leave the call of
"update-menus" to the users themselves.
@@ -25,10 +25,10 @@
the whole installation/upgrading process;
* Never : Do not call "update-menus" at all.
-Template: shared/#CDD#-config/useusermenus
+Template: shared/#DIS#-config/useusermenus
Type: boolean
_Description: Do you want user menus?
- The menus for the #CDDNAME# Custom Debian Distribution could be
+ The menus for the #DISNAME# Debian Integrated Solution could be
implemented as user menus which means they are visible only for those
users that will be selected explicitely. Be warned that selecting
the users from a large list does not scale very well so it makes no
Modified: cdd/trunk/dis/templates/po/ca.po
==============================================================================
--- cdd/trunk/cdd/templates/po/ca.po (original)
+++ cdd/trunk/dis/templates/po/ca.po Mon Aug 18 00:02:23 2008
@@ -13,7 +13,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cdd 0.4\n"
+"Project-Id-Version: dis 0.4\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-06-28 15:58+0200\n"
"PO-Revision-Date: 2004-09-07 20:59+0200\n"
@@ -26,18 +26,18 @@
#. Type: multiselect
#. Description
#: ../config.templates:4
-msgid "#CDDNAME# users:"
-msgstr "Usuaris de #CDDNAME#:"
+msgid "#DISNAME# users:"
+msgstr "Usuaris de #DISNAME#:"
#. Type: multiselect
#. Description
#: ../config.templates:4
msgid ""
"Please select, among the whole system user list, users who should get a "
-"#CDDNAME# user menu."
+"#DISNAME# user menu."
msgstr ""
"Si us plau seleccioneu, de la llista de tots els usuaris del sistema, "
-"aquells usuaris que han d'obtenir un menú d'usuari de #CDDNAME#."
+"aquells usuaris que han d'obtenir un menú d'usuari de #DISNAME#."
#. Type: select
#. Choices
@@ -55,10 +55,10 @@
#. Description
#: ../config.templates:12
msgid ""
-"The meta packages of the #CDDNAME# Custom Debian Distribution contain extra "
+"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
"role based menus for users. These will be built when a user who is "
"registered to a given role uses the \"update-menus\" utility. This can be "
-"done automatically for all users who are registered for #CDDNAME# after "
+"done automatically for all users who are registered for #DISNAME# after "
"installation of each single meta package, at the end of the whole "
"installation process to save time in case of installing more than one meta "
"package or just leave the call of \"update-menus\" to the users themselves.\n"
@@ -70,11 +70,11 @@
" the whole installation/upgrading process;\n"
" * Never : Do not call \"update-menus\" at all."
msgstr ""
-"Els meta paquets de la distribució de Debian adaptada #CDDNAME# contenen "
+"Els meta paquets de la distribució de Debian adaptada #DISNAME# contenen "
"menús extra basats en rols per als usuaris. Aquests seran construïts quan "
"un usuari que estigui registrat en algun dels rols faci servir la utilitat "
"«update-menus». Això es pot fer automàticament per a tots els usuaris que "
-"estiguin registrats per #CDDNAME# després de la instal·lació de cada meta "
+"estiguin registrats per #DISNAME# després de la instal·lació de cada meta "
"paquet, al final de tot el procés d'instal·lació per a estalviar temps en "
"cas d'instal·lar més d'un meta paquet o senzillament deixar l'execució de "
"«update-menus» als propis usuaris.\n"
Modified: cdd/trunk/dis/templates/po/de.po
==============================================================================
--- cdd/trunk/cdd/templates/po/de.po (original)
+++ cdd/trunk/dis/templates/po/de.po Mon Aug 18 00:02:23 2008
@@ -13,7 +13,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: #CDD#-config\n"
+"Project-Id-Version: #DIS#-config\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-06-28 15:58+0200\n"
"PO-Revision-Date: 2004-03-26 17:42+0100\n"
@@ -26,18 +26,18 @@
#. Type: multiselect
#. Description
#: ../config.templates:4
-msgid "#CDDNAME# users:"
-msgstr "#CDDNAME# Nutzer:"
+msgid "#DISNAME# users:"
+msgstr "#DISNAME# Nutzer:"
#. Type: multiselect
#. Description
#: ../config.templates:4
msgid ""
"Please select, among the whole system user list, users who should get a "
-"#CDDNAME# user menu."
+"#DISNAME# user menu."
msgstr ""
"Bitte wählen Sie aus der Liste aller Nutzer des Systems diejenigen aus, die "
-"ein #CDDNAME# Nutzermenü erhalten sollen."
+"ein #DISNAME# Nutzermenü erhalten sollen."
#. Type: select
#. Choices
@@ -55,10 +55,10 @@
#. Description
#: ../config.templates:12
msgid ""
-"The meta packages of the #CDDNAME# Custom Debian Distribution contain extra "
+"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
"role based menus for users. These will be built when a user who is "
"registered to a given role uses the \"update-menus\" utility. This can be "
-"done automatically for all users who are registered for #CDDNAME# after "
+"done automatically for all users who are registered for #DISNAME# after "
"installation of each single meta package, at the end of the whole "
"installation process to save time in case of installing more than one meta "
"package or just leave the call of \"update-menus\" to the users themselves.\n"
@@ -70,10 +70,10 @@
" the whole installation/upgrading process;\n"
" * Never : Do not call \"update-menus\" at all."
msgstr ""
-"Die Metapakete der Custom Debian Distribution #CDDNAME# enthalten Rollen "
+"Die Metapakete der Debian Integrated Solution #DISNAME# enthalten Rollen "
"basierte Nutzermenüs. Diese werden erzeugt, wenn ein Nutzer, der für eine "
"bestimmte Rolle registriert ist, das Programm \"update-menus\" aufruft. Das "
-"kann automatisch für alle für #CDDNAME# registrierten Nutzer geschehen und "
+"kann automatisch für alle für #DISNAME# registrierten Nutzer geschehen und "
"zwar nach der Installation jedes einzelnen Metapaketes oder zeitsparend am "
"Ende des Installationsprozesses mehrerer Metapakete. Alternativ kann "
"\"update-menus\" auch manuell durch jeden Nutzer aufgerufen werden.\n"
Modified: cdd/trunk/dis/templates/po/fr.po
==============================================================================
--- cdd/trunk/cdd/templates/po/fr.po (original)
+++ cdd/trunk/dis/templates/po/fr.po Mon Aug 18 00:02:23 2008
@@ -15,7 +15,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: #CDD#-config\n"
+"Project-Id-Version: #DIS#-config\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-06-28 15:58+0200\n"
"PO-Revision-Date: 2004-06-29 08:04+0200\n"
@@ -30,18 +30,18 @@
#. Type: multiselect
#. Description
#: ../config.templates:4
-msgid "#CDDNAME# users:"
-msgstr "Utilisateurs de #CDDNAME# :"
+msgid "#DISNAME# users:"
+msgstr "Utilisateurs de #DISNAME# :"
#. Type: multiselect
#. Description
#: ../config.templates:4
msgid ""
"Please select, among the whole system user list, users who should get a "
-"#CDDNAME# user menu."
+"#DISNAME# user menu."
msgstr ""
"Veuillez choisir parmi tous les utilisateurs du système ceux qui auront un "
-"menu #CDDNAME#."
+"menu #DISNAME#."
#. Type: select
#. Choices
@@ -59,10 +59,10 @@
#. Description
#: ../config.templates:12
msgid ""
-"The meta packages of the #CDDNAME# Custom Debian Distribution contain extra "
+"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
"role based menus for users. These will be built when a user who is "
"registered to a given role uses the \"update-menus\" utility. This can be "
-"done automatically for all users who are registered for #CDDNAME# after "
+"done automatically for all users who are registered for #DISNAME# after "
"installation of each single meta package, at the end of the whole "
"installation process to save time in case of installing more than one meta "
"package or just leave the call of \"update-menus\" to the users themselves.\n"
@@ -74,12 +74,12 @@
" the whole installation/upgrading process;\n"
" * Never : Do not call \"update-menus\" at all."
msgstr ""
-"Les méta-paquets de la distribution Debian spécialisée #CDDNAME# comportent "
+"Les méta-paquets de la distribution Debian spécialisée #DISNAME# comportent "
"des menus additionnels suivant le rôle attribué aux utilisateurs. Ces menus "
"sont construits quand un utilisateur enregistré dans un rôle donné lancera "
"la commande « update-menus ». Cette opération peut se faire automatiquement "
"après l'installation de chaque méta-paquet pour chaque utilisateur "
-"enregistré pour #CDDNAME# ou à la fin du processus d'installation pour "
+"enregistré pour #DISNAME# ou à la fin du processus d'installation pour "
"gagner du temps si plu sd'un méta-paquet est installé. Il est également "
"possible de laisser aux utilisateurs l'initiative de lancer eux-même la "
"commande.\n"
Modified: cdd/trunk/dis/templates/po/pt_BR.po
==============================================================================
--- cdd/trunk/cdd/templates/po/pt_BR.po (original)
+++ cdd/trunk/dis/templates/po/pt_BR.po Mon Aug 18 00:02:23 2008
@@ -13,7 +13,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cdd-dev\n"
+"Project-Id-Version: dis-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-06-28 15:58+0200\n"
"PO-Revision-Date: 2004-06-29 22:00-0300\n"
@@ -26,18 +26,18 @@
#. Type: multiselect
#. Description
#: ../config.templates:4
-msgid "#CDDNAME# users:"
-msgstr "Usuários #CDDNAME# : "
+msgid "#DISNAME# users:"
+msgstr "Usuários #DISNAME# : "
#. Type: multiselect
#. Description
#: ../config.templates:4
msgid ""
"Please select, among the whole system user list, users who should get a "
-"#CDDNAME# user menu."
+"#DISNAME# user menu."
msgstr ""
"Por favor, selecione dentre a lista de usuários de todo o sistema os "
-"usuários que devem obter um menu de usuário do #CDDNAME#."
+"usuários que devem obter um menu de usuário do #DISNAME#."
#. Type: select
#. Choices
@@ -55,10 +55,10 @@
#. Description
#: ../config.templates:12
msgid ""
-"The meta packages of the #CDDNAME# Custom Debian Distribution contain extra "
+"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
"role based menus for users. These will be built when a user who is "
"registered to a given role uses the \"update-menus\" utility. This can be "
-"done automatically for all users who are registered for #CDDNAME# after "
+"done automatically for all users who are registered for #DISNAME# after "
"installation of each single meta package, at the end of the whole "
"installation process to save time in case of installing more than one meta "
"package or just leave the call of \"update-menus\" to the users themselves.\n"
@@ -70,11 +70,11 @@
" the whole installation/upgrading process;\n"
" * Never : Do not call \"update-menus\" at all."
msgstr ""
-"Os meta-pacotes da Distribuição Debian Customizada #CDDNAME# contém "
+"Os meta-pacotes da Distribuição Debian Customizada #DISNAME# contém "
"menus extras para usuários com base em suas funções. Tais menus serão "
"gerados quando um usuário registrado para uma função específica utilizar "
"o utilitário \"update-menus\". Isso pode ser feito automaticamente para "
-"todos os usuários que estejam registrados para o #CDDNAME# após a "
+"todos os usuários que estejam registrados para o #DISNAME# após a "
"instalação de cada meta-pacote, ao final de todo o processo de instalação "
"para economizar tempo no caso da instalação de mais de um meta-pacote ou "
"deixar a execução do utilitário \"update-menus\" por conta dos prórios"
Modified: cdd/trunk/dis/templates/po/templates.pot
==============================================================================
--- cdd/trunk/cdd/templates/po/templates.pot (original)
+++ cdd/trunk/dis/templates/po/templates.pot Mon Aug 18 00:02:23 2008
@@ -27,7 +27,7 @@
#. Type: multiselect
#. Description
#: ../config.templates:4
-msgid "#CDDNAME# users:"
+msgid "#DISNAME# users:"
msgstr ""
#. Type: multiselect
@@ -35,7 +35,7 @@
#: ../config.templates:4
msgid ""
"Please select, among the whole system user list, users who should get a "
-"#CDDNAME# user menu."
+"#DISNAME# user menu."
msgstr ""
#. Type: select
@@ -54,10 +54,10 @@
#. Description
#: ../config.templates:12
msgid ""
-"The meta packages of the #CDDNAME# Custom Debian Distribution contain extra "
+"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
"role based menus for users. These will be built when a user who is "
"registered to a given role uses the \"update-menus\" utility. This can be "
-"done automatically for all users who are registered for #CDDNAME# after "
+"done automatically for all users who are registered for #DISNAME# after "
"installation of each single meta package, at the end of the whole "
"installation process to save time in case of installing more than one meta "
"package or just leave the call of \"update-menus\" to the users themselves.\n"
Modified: cdd/trunk/dis/templates/postinst
==============================================================================
--- cdd/trunk/cdd/templates/postinst (original)
+++ cdd/trunk/dis/templates/postinst Mon Aug 18 00:02:23 2008
@@ -1,6 +1,6 @@
#!/bin/bash -e
-# This is the default postinst file from the cdd-dev package which is used
+# This is the default postinst file from the dis-dev package which is used
# in all meta packages. If there is a certain need to provide extra
# postinst files for some meta packages this template will be appended. Thus
# it will be checked whether debconf was just initialized.
@@ -9,14 +9,14 @@
# file because it is in the end of this template anyway.
###########################################################################
-# If the user menus are not needed/wished for a CDD (like for instance
-# Debian-Edu there is no need to install cdd-common package. Thus we
+# If the user menus are not needed/wished for a DIS (like for instance
+# Debian-Edu there is no need to install dis-common package. Thus we
# have to make sure that postinst does not try to include the menu stuff
-if [ -d /etc/cdd -a -f /etc/cdd/cdd.conf ] ; then
- # Also verify that this CDD provides special configuration
+if [ -d /etc/dis -a -f /etc/dis/dis.conf ] ; then
+ # Also verify that this DIS provides special configuration
# If not there is no need to execute the user menu code
- if [ -d /etc/cdd/#CDD# -a -f /etc/cdd/#CDD#/#CDD#.conf ] ; then
- test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
+ if [ -d /etc/dis/#DIS# -a -f /etc/dis/#DIS#/#DIS#.conf ] ; then
+ test -x /usr/sbin/dis-update-menus && /usr/sbin/dis-update-menus -d #DIS#
# Initialize debconf if not yet done
if [ _"$DEBCONF_REDIR" = _"" ]; then
@@ -24,20 +24,20 @@
db_version 2.0
fi
- . /etc/cdd/cdd.conf
- if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+ . /etc/dis/dis.conf
+ if [ -s /etc/dis/#DIS#/#DIS#.conf ] ; then . /etc/dis/#DIS#/#DIS#.conf ; fi
case "$1" in
abort-deconfigure|abort-remove|abort-upgrade)
;;
configure|upgrade)
- db_get "shared/#CDD#-config/usermenus" || true
+ db_get "shared/#DIS#-config/usermenus" || true
case "$RET" in
"Each package installation")
- /usr/sbin/cdd-update-usermenus #CDD#
+ /usr/sbin/dis-update-usermenus #DIS#
;;
"End of installation")
- touch /var/run/#CDD#-config.usermenu
+ touch /var/run/#DIS#-config.usermenu
;;
esac
;;
Modified: cdd/trunk/dis/templates/postrm
==============================================================================
--- cdd/trunk/cdd/templates/postrm (original)
+++ cdd/trunk/dis/templates/postrm Mon Aug 18 00:02:23 2008
@@ -1,6 +1,6 @@
#!/bin/bash -e
-# This is the default postrm file from the cdd-dev package which is used
+# This is the default postrm file from the dis-dev package which is used
# in all meta packages. If there is a certain need to provide extra
# postrm files for some meta packages this template will be appended. Thus
# it will be checked whether debconf was just initialized.
@@ -9,40 +9,40 @@
# file because it is in the end of this template anyway.
###########################################################################
-# If the user menus are not needed/wished for a CDD (like for instance
-# Debian-Edu there is no need to install cdd-common package. Thus we
+# If the user menus are not needed/wished for a DIS (like for instance
+# Debian-Edu there is no need to install dis-common package. Thus we
# have to make sure that postinst does not try to include the menu stuff
-if [ -d /etc/cdd -a -f /etc/cdd/cdd.conf ] ; then
- # Also verify that this CDD provides special configuration
+if [ -d /etc/dis -a -f /etc/dis/dis.conf ] ; then
+ # Also verify that this DIS provides special configuration
# If not there is no need to execute the user menu code
- if [ -d /etc/cdd/#CDD# -a -f /etc/cdd/#CDD#/#CDD#.conf ] ; then
+ if [ -d /etc/dis/#DIS# -a -f /etc/dis/#DIS#/#DIS#.conf ] ; then
- test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
+ test -x /usr/sbin/dis-update-menus && /usr/sbin/dis-update-menus -d #DIS#
- test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf
- test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
+ test -s /etc/dis/dis.conf && . /etc/dis/dis.conf
+ test -s /etc/dis/#DIS#/#DIS#.conf && . /etc/dis/#DIS#/#DIS#.conf
- if [ -x /usr/sbin/cdd-update-usermenus ] ; then
+ if [ -x /usr/sbin/dis-update-usermenus ] ; then
# Initialize debconf if not yet done
if [ _"$DEBCONF_REDIR" = _"" ]; then
. /usr/share/debconf/confmodule
db_version 2.0
fi
- . /etc/cdd/cdd.conf
- if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+ . /etc/dis/dis.conf
+ if [ -s /etc/dis/#DIS#/#DIS#.conf ] ; then . /etc/dis/#DIS#/#DIS#.conf ; fi
case "$1" in
abort-install|abort-upgrade|failed-upgrade|upgrade)
;;
remove|purge)
- db_get "shared/#CDD#-config/usermenus" || true
+ db_get "shared/#DIS#-config/usermenus" || true
case "$RET" in
"Each package installation")
- /usr/sbin/cdd-update-usermenus #CDD#
+ /usr/sbin/dis-update-usermenus #DIS#
;;
"End of installation")
- touch /var/run/#CDD#-config.usermenu
+ touch /var/run/#DIS#-config.usermenu
;;
esac
;;
More information about the Cdd-commits
mailing list