[Cdd-commits] r1144 - in cdd/trunk/blends/templates: . po

CDD Subversion Commit noreply at alioth.debian.org
Sun Oct 26 07:52:40 UTC 2008


Author: tille
Date: Sun Oct 26 07:52:40 2008
New Revision: 1144

Modified:
   cdd/trunk/blends/templates/README.Debian
   cdd/trunk/blends/templates/apt.conf
   cdd/trunk/blends/templates/config.config
   cdd/trunk/blends/templates/config.install
   cdd/trunk/blends/templates/config.links
   cdd/trunk/blends/templates/config.postinst
   cdd/trunk/blends/templates/config.templates
   cdd/trunk/blends/templates/po/ca.po
   cdd/trunk/blends/templates/po/de.po
   cdd/trunk/blends/templates/po/fr.po
   cdd/trunk/blends/templates/po/pt_BR.po
   cdd/trunk/blends/templates/po/templates.pot
   cdd/trunk/blends/templates/postinst
   cdd/trunk/blends/templates/postrm
Log:
Renamed stuff in templates


Modified: cdd/trunk/blends/templates/README.Debian
==============================================================================
--- cdd/trunk/blends/templates/README.Debian	(original)
+++ cdd/trunk/blends/templates/README.Debian	Sun Oct 26 07:52:40 2008
@@ -1,15 +1,15 @@
-This is a meta package which is used by Debian Integrated Solutions
--------------------------------------------------------------------
+This is a metapackage which is used by Debian Pure Blends
+---------------------------------------------------------
 
-This package is a meta-package; it depends on several other packages to make
+This package is a metapackage; it depends on several other packages to make
 them be installed when it is installed. If you want to remove one of those
 packages, you have to remove this package as well. The other packages won't be
 touched.
 
-There exists an comprehensive documentation about Debian Integrated Solutions
-which can be found at http://cdd.alioth.debian.org/dis/.
+There exists an comprehensive documentation about Debian Pure Blends
+which can be found at http://cdd.alioth.debian.org/blends/.
 
-The meta packages should always be installable on a Debian system.
+The metapackages should always be installable on a Debian system.
 Thus no dependency on a non-available package (ie. a package available
 outside of Debian) have been used. However such dependencies have
 been downgraded to Suggests.

Modified: cdd/trunk/blends/templates/apt.conf
==============================================================================
--- cdd/trunk/blends/templates/apt.conf	(original)
+++ cdd/trunk/blends/templates/apt.conf	Sun Oct 26 07:52:40 2008
@@ -2,9 +2,9 @@
  * $Id$ 
  */
 /*
- * APT configuration file for #DIS#-config package
+ * APT configuration file for #BLEND#-config package
  */
 
 DPkg {
-	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";};
+	Post-Invoke {"test -f /var/run/#BLEND#-config.usermenu && if [ -x /usr/sbin/blend-update-usermenus ] ; then /usr/sbin/blend-update-usermenus #BLEND# ; fi ; rm -f /var/run/#BLEND#-config.usermenu";};
 }

Modified: cdd/trunk/blends/templates/config.config
==============================================================================
--- cdd/trunk/blends/templates/config.config	(original)
+++ cdd/trunk/blends/templates/config.config	Sun Oct 26 07:52:40 2008
@@ -7,37 +7,37 @@
     db_capb backup
 fi
 
-db_input "medium" "shared/#DIS#-config/useusermenus" || true
+db_input "medium" "shared/#BLEND#-config/useusermenus" || true
 db_go
-db_get shared/#DIS#-config/useusermenus
+db_get shared/#BLEND#-config/useusermenus
 if [ $RET ] ; then
-    db_input "medium" "shared/#DIS#-config/usermenus" || true
+    db_input "medium" "shared/#BLEND#-config/usermenus" || true
     db_go
 fi
 
-# if dis-config package is not yet installed we have to stop here
-if [ ! -f /etc/dis/dis.conf ] ; then
+# if blends.config package is not yet installed we have to stop here
+if [ ! -f /etc/blends/blends.conf ] ; then
    db_stop
    exit 0
 fi
 
-[ -s /etc/dis/dis.conf ]         && . /etc/dis/dis.conf
-[ -s /etc/dis/#DIS#/#DIS#.conf ] && . /etc/dis/#DIS#/#DIS#.conf
+[ -s /etc/blends/blends.conf ]         && . /etc/blends/blends.conf
+[ -s /etc/blends/#BLEND#/#BLEND#.conf ] && . /etc/blends/#BLEND#/#BLEND#.conf
 
-# Add at least one default role for each DIS
-addRole #DIS# #DIS#
+# Add at least one default role for each Blend
+addRole #BLEND# #BLEND#
 
 # Login names of all users of the system as comma separated list 
 USERS=`getAllUsers 0 ,`
 
-# "login (Real Name)" of users registered to the DIS #DIS#
-DISUSERS=`getUsersInRole #DIS# #DIS# 0 ,`
+# "login (Real Name)" of users registered to the Debian Pure Blend #BLEND#
+BLENDUSERS=`getUsersInRole #BLEND# #BLEND# 0 ,`
 
-db_set #DIS#-config/group "$DISUSERS"
-db_subst #DIS#-config/group users "$USERS"
-db_get #DIS#-config/group
+db_set #BLEND#-config/group "$BLENDUSERS"
+db_subst #BLEND#-config/group users "$USERS"
+db_get #BLEND#-config/group
 
-db_input high #DIS#-config/group || true
+db_input high #BLEND#-config/group || true
 db_go
 
 db_stop

Modified: cdd/trunk/blends/templates/config.install
==============================================================================
--- cdd/trunk/blends/templates/config.install	(original)
+++ cdd/trunk/blends/templates/config.install	Sun Oct 26 07:52:40 2008
@@ -1 +1 @@
-debian/90#DIS#-config   etc/apt/apt.conf.d
+debian/90#BLEND#-config   etc/apt/apt.conf.d

Modified: cdd/trunk/blends/templates/config.links
==============================================================================
--- cdd/trunk/blends/templates/config.links	(original)
+++ cdd/trunk/blends/templates/config.links	Sun Oct 26 07:52:40 2008
@@ -1 +1 @@
-usr/share/dis/dis-task-lister usr/lib/tasksel/#DIS#-task-files
+usr/share/blends/blend-task-lister usr/lib/tasksel/#BLEND#-task-files

Modified: cdd/trunk/blends/templates/config.postinst
==============================================================================
--- cdd/trunk/blends/templates/config.postinst	(original)
+++ cdd/trunk/blends/templates/config.postinst	Sun Oct 26 07:52:40 2008
@@ -1,44 +1,44 @@
 #!/bin/sh -e
 
-# 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."
+# if blends-common package is not yet installed we have to stop here
+if [ ! -f /etc/blends/blends.conf ] ; then
+   echo "Debian Pure Blends configuration file /etc/blends/blends.conf is missing."
    exit -1
 fi
-. /etc/dis/dis.conf
+. /etc/blends/blends.conf
 
-if [ ! -f /etc/dis/#DIS#/#DIS#.conf ] ; then
-   echo "#DISNAME# configuration file /etc/dis/#DIS#/#DIS#.conf is missing."
+if [ ! -f /etc/blends/#BLEND#/#BLEND#.conf ] ; then
+   echo "#BLENDNAME# configuration file /etc/blends/#BLEND#/#BLEND#.conf is missing."
    exit -1
 fi
-. /etc/dis/#DIS#/#DIS#.conf
+. /etc/blends/#BLEND#/#BLEND#.conf
 
 # Source debconf library.
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-# If $USEUSERMENU is not set in /etc/dis/#DIS#/#DIS#.conf read it from debconf database
+# If $USEUSERMENU is not set in /etc/blends/#BLEND#/#BLEND#.conf read it from debconf database
 if [ -z $USEUSERMENU ] ; then
-    db_get shared/#DIS#-config/useusermenus
+    db_get shared/#BLEND#-config/useusermenus
     if [ $RET ] ; then
 	USEUSERMENU="yes"
     fi
 fi
 
 if [ "$USEUSERMENU" = "yes" ] ; then
-    db_get #DIS#-config/group 
+    db_get #BLEND#-config/group 
 
-    CURRENTDISUSERS=`getUsersInRole #DIS# #DIS# 1`
+    CURRENTBLENDUSERS=`getUsersInRole #BLEND# #BLEND# 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 "${CURRENTDISUSERS}" | grep -c -w "$user"` -eq 0 ] ; then
-	    /usr/sbin/dis-user add #DIS# $user
+	if [ `echo "${CURRENTBLENDUSERS}" | grep -c -w "$user"` -eq 0 ] ; then
+	    /usr/sbin/blend-user add #BLEND# $user
 	fi
     done
-    # Del those users which were obviousely removed from list of DIS users
+    # Del those users which were obviousely removed from list of Blend users
     for user in `getAllUsers 1` ; do
-	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
+	if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group #BLEND# | grep -c -w $user` -gt 0 ] ; then
+	    /usr/sbin/blend-user del #BLEND# $user
 	fi
     done
 fi

Modified: cdd/trunk/blends/templates/config.templates
==============================================================================
--- cdd/trunk/blends/templates/config.templates	(original)
+++ cdd/trunk/blends/templates/config.templates	Sun Oct 26 07:52:40 2008
@@ -1,34 +1,34 @@
-Template: #DIS#-config/group
+Template: #BLEND#-config/group
 Type: multiselect
 Choices: ${users}
-_Description: #DISNAME# users:
+_Description: #BLENDNAME# users:
  Please select, among the whole system user list, users who should get
- a #DISNAME# user menu.
+ a #BLENDNAME# user menu.
 
-Template: shared/#DIS#-config/usermenus
+Template: shared/#BLEND#-config/usermenus
 Type: select
 _Choices: Each package installation, End of installation, Never
 Default: never
 _Description: Build user menus at:
- The meta packages of the #DISNAME# Debian Integrated Solution
+ The metapackages of the #BLENDNAME# Debian Pure Blend
  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 #DISNAME# after installation of each single meta package,
+ for #BLENDNAME# after installation of each single metapackage,
  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
+ of installing more than one metapackage or just leave the call of
  "update-menus" to the users themselves.
-  * Each package installation : Call "update-menus" after each meta package
+  * Each package installation : Call "update-menus" after each metapackage
                                (time consuming);
   * End of installation       : Call "update-menus" only once at the end of
                                 the whole installation/upgrading process;
   * Never                     : Do not call "update-menus" at all.
 
-Template: shared/#DIS#-config/useusermenus
+Template: shared/#BLEND#-config/useusermenus
 Type: boolean
 _Description: Do you want user menus?
- The menus for the #DISNAME# Debian Integrated Solution could be
+ The menus for the #BLENDNAME# Debian Pure Blend 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/blends/templates/po/ca.po
==============================================================================
--- cdd/trunk/blends/templates/po/ca.po	(original)
+++ cdd/trunk/blends/templates/po/ca.po	Sun Oct 26 07:52:40 2008
@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dis 0.4\n"
+"Project-Id-Version: blends 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 "#DISNAME# users:"
-msgstr "Usuaris de #DISNAME#:"
+msgid "#BLENDNAME# users:"
+msgstr "Usuaris de #BLENDNAME#:"
 
 #. Type: multiselect
 #. Description
 #: ../config.templates:4
 msgid ""
 "Please select, among the whole system user list, users who should get a "
-"#DISNAME# user menu."
+"#BLENDNAME# 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 #DISNAME#."
+"aquells usuaris que han d'obtenir un menú d'usuari de #BLENDNAME#."
 
 #. Type: select
 #. Choices
@@ -55,10 +55,10 @@
 #. Description
 #: ../config.templates:12
 msgid ""
-"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
+"The meta packages of the #BLENDNAME# Debian Pure Blend 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 #DISNAME# after "
+"done automatically for all users who are registered for #BLENDNAME# 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 #DISNAME# contenen "
+"Els meta paquets de la distribució de Debian adaptada #BLENDNAME# 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 #DISNAME# després de la instal·lació de cada meta "
+"estiguin registrats per #BLENDNAME# 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/blends/templates/po/de.po
==============================================================================
--- cdd/trunk/blends/templates/po/de.po	(original)
+++ cdd/trunk/blends/templates/po/de.po	Sun Oct 26 07:52:40 2008
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: #DIS#-config\n"
+"Project-Id-Version: #BLEND#-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"
+"PO-Revision-Date: 2008-10-26 07:42+0100\n"
 "Last-Translator: Andreas Tille <tille at debian.org>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,18 +26,18 @@
 #. Type: multiselect
 #. Description
 #: ../config.templates:4
-msgid "#DISNAME# users:"
-msgstr "#DISNAME# Nutzer:"
+msgid "#BLENDNAME# users:"
+msgstr "#BLENDNAME# Nutzer:"
 
 #. Type: multiselect
 #. Description
 #: ../config.templates:4
 msgid ""
 "Please select, among the whole system user list, users who should get a "
-"#DISNAME# user menu."
+"#BLENDNAME# user menu."
 msgstr ""
 "Bitte wählen Sie aus der Liste aller Nutzer des Systems diejenigen aus, die "
-"ein #DISNAME# Nutzermenü erhalten sollen."
+"ein #BLENDNAME# Nutzermenü erhalten sollen."
 
 #. Type: select
 #. Choices
@@ -55,11 +55,11 @@
 #. Description
 #: ../config.templates:12
 msgid ""
-"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
+"The metapackages of the #BLENDNAME# Debian Pure Blend 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 #DISNAME# after "
-"installation of each single meta package, at the end of the whole "
+"done automatically for all users who are registered for #BLENDNAME# after "
+"installation of each single metapackage, 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"
 " * Each package installation : Call \"update-menus\" after each meta "
@@ -70,10 +70,10 @@
 "                               the whole installation/upgrading process;\n"
 " * Never                     : Do not call \"update-menus\" at all."
 msgstr ""
-"Die Metapakete der Debian Integrated Solution #DISNAME# enthalten Rollen "
+"Die Metapakete der Debian Pure Blend #BLENDNAME# 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 #DISNAME# registrierten Nutzer geschehen und "
+"kann automatisch für alle für #BLENDNAME# 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/blends/templates/po/fr.po
==============================================================================
--- cdd/trunk/blends/templates/po/fr.po	(original)
+++ cdd/trunk/blends/templates/po/fr.po	Sun Oct 26 07:52:40 2008
@@ -15,7 +15,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: #DIS#-config\n"
+"Project-Id-Version: #BLEND#-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 "#DISNAME# users:"
-msgstr "Utilisateurs de #DISNAME# :"
+msgid "#BLENDNAME# users:"
+msgstr "Utilisateurs de #BLENDNAME# :"
 
 #. Type: multiselect
 #. Description
 #: ../config.templates:4
 msgid ""
 "Please select, among the whole system user list, users who should get a "
-"#DISNAME# user menu."
+"#BLENDNAME# user menu."
 msgstr ""
 "Veuillez choisir parmi tous les utilisateurs du système ceux qui auront un "
-"menu #DISNAME#."
+"menu #BLENDNAME#."
 
 #. Type: select
 #. Choices
@@ -59,11 +59,11 @@
 #. Description
 #: ../config.templates:12
 msgid ""
-"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
+"The metapackages of the #BLENDNAME# Debian Pure Blend 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 #DISNAME# after "
-"installation of each single meta package, at the end of the whole "
+"done automatically for all users who are registered for #BLENDNAME# after "
+"installation of each single metapackage, 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"
 " * Each package installation : Call \"update-menus\" after each meta "
@@ -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 #DISNAME# comportent "
+"Les méta-paquets de la distribution Debian spécialisée #BLENDNAME# 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 #DISNAME# ou à la fin du processus d'installation pour "
+"enregistré pour #BLENDNAME# 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/blends/templates/po/pt_BR.po
==============================================================================
--- cdd/trunk/blends/templates/po/pt_BR.po	(original)
+++ cdd/trunk/blends/templates/po/pt_BR.po	Sun Oct 26 07:52:40 2008
@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dis-dev\n"
+"Project-Id-Version: blends-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 "#DISNAME# users:"
-msgstr "Usuários #DISNAME# : "
+msgid "#BLENDNAME# users:"
+msgstr "Usuários #BLENDNAME# : "
 
 #. Type: multiselect
 #. Description
 #: ../config.templates:4
 msgid ""
 "Please select, among the whole system user list, users who should get a "
-"#DISNAME# user menu."
+"#BLENDNAME# 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 #DISNAME#."
+"usuários que devem obter um menu de usuário do #BLENDNAME#."
 
 #. Type: select
 #. Choices
@@ -55,11 +55,11 @@
 #. Description
 #: ../config.templates:12
 msgid ""
-"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
+"The metapackages of the #BLENDNAME# Debian Pure Blend 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 #DISNAME# after "
-"installation of each single meta package, at the end of the whole "
+"done automatically for all users who are registered for #BLENDNAME# after "
+"installation of each single metapackage, 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"
 " * Each package installation : Call \"update-menus\" after each meta "
@@ -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 #DISNAME# contém "
+"Os meta-pacotes da Debian Pure Blend #BLENDNAME# 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 #DISNAME# após a "
+"todos os usuários que estejam registrados para o #BLENDNAME# 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/blends/templates/po/templates.pot
==============================================================================
--- cdd/trunk/blends/templates/po/templates.pot	(original)
+++ cdd/trunk/blends/templates/po/templates.pot	Sun Oct 26 07:52:40 2008
@@ -27,7 +27,7 @@
 #. Type: multiselect
 #. Description
 #: ../config.templates:4
-msgid "#DISNAME# users:"
+msgid "#BLENDNAME# 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 "
-"#DISNAME# user menu."
+"#BLENDNAME# user menu."
 msgstr ""
 
 #. Type: select
@@ -54,11 +54,11 @@
 #. Description
 #: ../config.templates:12
 msgid ""
-"The meta packages of the #DISNAME# Debian Integrated Solution contain extra "
+"The metapackages of the #BLENDNAME# Debian Pure Blend 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 #DISNAME# after "
-"installation of each single meta package, at the end of the whole "
+"done automatically for all users who are registered for #BLENDNAME# after "
+"installation of each single metapackage, 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"
 " * Each package installation : Call \"update-menus\" after each meta "

Modified: cdd/trunk/blends/templates/postinst
==============================================================================
--- cdd/trunk/blends/templates/postinst	(original)
+++ cdd/trunk/blends/templates/postinst	Sun Oct 26 07:52:40 2008
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# This is the default postinst file from the dis-dev package which is used
+# This is the default postinst file from the blends-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 DIS (like for instance
-# Debian-Edu there is no need to install dis-common package.  Thus we
+# If the user menus are not needed/wished for a Blend (like for instance
+# Debian Edu there is no need to install blends-common package.  Thus we
 # have to make sure that postinst does not try to include the menu stuff
-if [ -d /etc/dis -a -f /etc/dis/dis.conf ] ; then
-    # Also verify that this DIS provides special configuration
+if [ -d /etc/blends -a -f /etc/blends/blends.conf ] ; then
+    # Also verify that this Blend provides special configuration
     # If not there is no need to execute the user menu code
-    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#
+    if [ -d /etc/blends/#BLEND# -a -f /etc/blends/#BLEND#/#BLEND#.conf ] ; then
+        test -x /usr/sbin/blend-update-menus && /usr/sbin/blend-update-menus -d #BLEND#
 
 	# Initialize debconf if not yet done
 	if [ _"$DEBCONF_REDIR" = _"" ]; then
@@ -24,20 +24,20 @@
     	    db_version 2.0
 	fi
 
-	. /etc/dis/dis.conf
-	if [ -s /etc/dis/#DIS#/#DIS#.conf ] ; then . /etc/dis/#DIS#/#DIS#.conf ; fi
+	. /etc/blends/blends.conf
+	if [ -s /etc/blends/#BLEND#/#BLEND#.conf ] ; then . /etc/blends/#BLEND#/#BLEND#.conf ; fi
 
 	case "$1" in
 	    abort-deconfigure|abort-remove|abort-upgrade)
 		;;
     	    configure|upgrade)
-		db_get "shared/#DIS#-config/usermenus" || true
+		db_get "shared/#BLEND#-config/usermenus" || true
 		case "$RET" in
     		    "Each package installation")
-        		/usr/sbin/dis-update-usermenus #DIS#
+        		/usr/sbin/blend-update-usermenus #BLEND#
             		;;
         	    "End of installation")
-            		touch /var/run/#DIS#-config.usermenu
+            		touch /var/run/#BLEND#-config.usermenu
             		;;
     		esac
 		;;

Modified: cdd/trunk/blends/templates/postrm
==============================================================================
--- cdd/trunk/blends/templates/postrm	(original)
+++ cdd/trunk/blends/templates/postrm	Sun Oct 26 07:52:40 2008
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# This is the default postrm file from the dis-dev package which is used
+# This is the default postrm file from the blends-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 DIS (like for instance
-# Debian-Edu there is no need to install dis-common package.  Thus we
+# If the user menus are not needed/wished for a Blend (like for instance
+# Debian Edu there is no need to install blends-common package.  Thus we
 # have to make sure that postinst does not try to include the menu stuff
-if [ -d /etc/dis -a -f /etc/dis/dis.conf ] ; then
-    # Also verify that this DIS provides special configuration
+if [ -d /etc/blends -a -f /etc/blends/blends.conf ] ; then
+    # Also verify that this Blend provides special configuration
     # If not there is no need to execute the user menu code
-    if [ -d /etc/dis/#DIS# -a -f /etc/dis/#DIS#/#DIS#.conf ] ; then
+    if [ -d /etc/blends/#BLEND# -a -f /etc/blends/#BLEND#/#BLEND#.conf ] ; then
 
-	test -x /usr/sbin/dis-update-menus && /usr/sbin/dis-update-menus -d #DIS# 
+	test -x /usr/sbin/blend-update-menus && /usr/sbin/blend-update-menus -d #BLEND# 
 
-	test -s /etc/dis/dis.conf         && . /etc/dis/dis.conf
-	test -s /etc/dis/#DIS#/#DIS#.conf && . /etc/dis/#DIS#/#DIS#.conf
+	test -s /etc/blends/blends.conf         && . /etc/blends/blends.conf
+	test -s /etc/blends/#BLEND#/#BLEND#.conf && . /etc/blends/#BLEND#/#BLEND#.conf
 
-	if [ -x /usr/sbin/dis-update-usermenus ] ; then
+	if [ -x /usr/sbin/blend-update-usermenus ] ; then
 	    # Initialize debconf if not yet done
 	    if [ _"$DEBCONF_REDIR" = _"" ]; then
     		. /usr/share/debconf/confmodule
     		db_version 2.0
 	    fi
 
-	    . /etc/dis/dis.conf
-	    if [ -s /etc/dis/#DIS#/#DIS#.conf ] ; then . /etc/dis/#DIS#/#DIS#.conf ; fi
+	    . /etc/blends/blends.conf
+	    if [ -s /etc/blends/#BLEND#/#BLEND#.conf ] ; then . /etc/blends/#BLEND#/#BLEND#.conf ; fi
 
 	    case "$1" in
 		abort-install|abort-upgrade|failed-upgrade|upgrade)
 		    ;;
 		remove|purge)
-		    db_get "shared/#DIS#-config/usermenus" || true
+		    db_get "shared/#BLEND#-config/usermenus" || true
 		    case "$RET" in
 			"Each package installation")
-			    /usr/sbin/dis-update-usermenus #DIS#
+			    /usr/sbin/blend-update-usermenus #BLEND#
 			;;
 			"End of installation")
-			    touch /var/run/#DIS#-config.usermenu
+			    touch /var/run/#BLEND#-config.usermenu
 			;;
 		    esac
 		    ;;



More information about the Cdd-commits mailing list