From cdd-commits@lists.alioth.debian.org Mon Jun 7 23:08:29 2004 From: cdd-commits@lists.alioth.debian.org (Sergio Talens-Oliag) Date: Mon, 07 Jun 2004 22:08:29 +0000 Subject: [Cdd-commits] CVSROOT syncmail,1.2,1.3 Update of /cvsroot/cdd/CVSROOT In directory haydn:/tmp/cvs-serv480 Modified Files: syncmail Log Message: Downgraded to cvs rev=1.36.2.19 to be compatible with old python releases :( From cdd-commits@lists.alioth.debian.org Tue Jun 8 21:52:30 2004 From: cdd-commits@lists.alioth.debian.org (Andreas Tille) Date: Tue, 08 Jun 2004 20:52:30 +0000 Subject: [Cdd-commits] cdd/med/debian-med/docs/bio-dev libvibrant6-dev.txt,NONE,1.1 Update of /cvsroot/cdd/cdd/med/debian-med/docs/bio-dev In directory haydn:/tmp/cvs-serv26193/debian-med/docs/bio-dev Added Files: libvibrant6-dev.txt Log Message: Added Med-Menu for med-bio-dev --- NEW FILE: libvibrant6-dev.txt --- libvibrant6-dev: NCBI libraries for graphic biology applications (development files) Some information about libvibrant6-dev from the Debian-Med project. Vibrant allows you to develop portable (Motif, MS-Windows, Mac-OS) graphic biological applications. The Homepage is http://www.ncbi.nlm.nih.gov/ You can get a good overview by reading zless /usr/share/doc/libvibrant6-dev/README.gz From cdd-commits@lists.alioth.debian.org Tue Jun 8 21:52:30 2004 From: cdd-commits@lists.alioth.debian.org (Andreas Tille) Date: Tue, 08 Jun 2004 20:52:30 +0000 Subject: [Cdd-commits] cdd/med/debian-med/menu bio-dev,NONE,1.1 Update of /cvsroot/cdd/cdd/med/debian-med/menu In directory haydn:/tmp/cvs-serv26193/debian-med/menu Added Files: bio-dev Log Message: Added Med-Menu for med-bio-dev --- NEW FILE: bio-dev --- ?package(med-bio-dev):command="/usr/bin/vibrate /usr/bin/asntool" needs="X11" \ section="Med/Microbiology Development" title="asntool" hints="Biology" icon="/usr/share/pixmaps/asntool.xpm" ?package(med-bio-dev):command="/usr/bin/vibrate /usr/bin/errhdr" needs="X11" \ section="Med/Microbiology Development" title="errhdr" hints="Biology" icon="/usr/share/pixmaps/ncbilogo.xpm" From cdd-commits@lists.alioth.debian.org Wed Jun 9 08:08:46 2004 From: cdd-commits@lists.alioth.debian.org (Andreas Tille) Date: Wed, 09 Jun 2004 07:08:46 +0000 Subject: [Cdd-commits] cdd/common/cdd cdd-update-menus,1.10,1.11 cdd-update-menus.8,1.6,1.7 Update of /cvsroot/cdd/cdd/common/cdd In directory haydn:/tmp/cvs-serv28044 Modified Files: cdd-update-menus cdd-update-menus.8 Log Message: Spelling fixes. From debian-custom@lists.debian.org Thu Jun 17 23:22:15 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Thu, 17 Jun 2004 22:22:15 +0000 Subject: [Cdd-commits] CVSROOT loginfo,1.10,1.11 Update of /cvsroot/cdd/CVSROOT In directory haydn:/tmp/cvs-serv11446 Modified Files: loginfo Log Message: Fake change to check commit mailing list. Index: loginfo =================================================================== RCS file: /cvsroot/cdd/CVSROOT/loginfo,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- loginfo 17 Jun 2004 20:52:10 -0000 1.10 +++ loginfo 17 Jun 2004 22:22:13 -0000 1.11 @@ -27,3 +27,4 @@ ALL python2.2 $CVSROOT/CVSROOT/syncmail -u -f alioth.debian.org -R debian-custom@lists.debian.org %{sVv} cdd-commits@lists.alioth.debian.org ALL $CVSROOT/CVSROOT/ciabot_cvs.pl %{,,,s} $USER + From debian-custom@lists.debian.org Fri Jun 18 00:19:26 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Thu, 17 Jun 2004 23:19:26 +0000 Subject: [Cdd-commits] CVSROOT syncmail,1.8,1.9 Update of /cvsroot/cdd/CVSROOT In directory haydn:/tmp/cvs-serv4825 Modified Files: syncmail Log Message: Back to address variable since we found how deal with mailman problem. Index: syncmail =================================================================== RCS file: /cvsroot/cdd/CVSROOT/syncmail,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- syncmail 17 Jun 2004 22:14:42 -0000 1.8 +++ syncmail 17 Jun 2004 23:19:22 -0000 1.9 @@ -229,7 +229,7 @@ s = StringIO() datestamp = time.strftime('%a, %d %b %Y %H:%M:%S +0000', time.gmtime(time.time())) - vars = {'author' : dump_address_pair((name, 'otavio@debian.org')), + vars = {'author' : dump_address_pair((name, address)), 'people' : COMMASPACE.join(people), 'subject' : subject, 'version' : __version__, From debian-custom@lists.debian.org Fri Jun 18 10:57:53 2004 From: debian-custom@lists.debian.org (Ben Armstrong) Date: Fri, 18 Jun 2004 09:57:53 +0000 Subject: [Cdd-commits] cdd/doc/common/en 07_starting.sgml,1.6,1.7 Update of /cvsroot/cdd/cdd/doc/common/en In directory haydn:/tmp/cvs-serv14845 Modified Files: 07_starting.sgml Log Message: Grammar, etc. Up to section on scope. Index: 07_starting.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/07_starting.sgml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- 07_starting.sgml 18 Jun 2004 00:54:14 -0000 1.6 +++ 07_starting.sgml 18 Jun 2004 09:57:49 -0000 1.7 @@ -56,14 +56,14 @@

Checking for cooperation with other Custom Debian Distributions is - always a good idea. In technical terms this is obvious but - sometimes there are possibilities to share efforts by goals that have - parts in common. + always a good idea. In technical terms, this is obvious, but + sometimes there are possibilities to share efforts when the goals + of two projects have parts in common.

- Who decided to start a Custom Debian Distribution takes over a + The one who decides to start a Custom Debian Distribution takes on a responsibility for this project. It has to be for the good of - Debian as a whole and should bring an extra reputation to our common + Debian as a whole, and should bring an extra reputation to our common goal to build the best operating system.

From debian-custom@lists.debian.org Fri Jun 18 13:30:54 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Fri, 18 Jun 2004 12:30:54 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.7,1.8 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv27932 Modified Files: changelog Log Message: Preparation for next release Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- changelog 12 Jun 2004 19:13:09 -0000 1.7 +++ changelog 18 Jun 2004 12:30:51 -0000 1.8 @@ -6,6 +6,8 @@ * Use #CDDNAME# variable in debconf templates of cdd-dev. This variable can be set either in common/conf or it is builded by "Debian-Cdd". * cdd-install-helper handles CDD-common.{config,template} + * Usage of get-group-users depreciated, use cdd-tools instead. + Moved functionality of get-group-users to unixgroups/cdd-actions. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Fri Jun 18 13:31:58 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Fri, 18 Jun 2004 12:31:58 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian cdd-common.install,1.6,1.7 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv28016 Modified Files: cdd-common.install Log Message: Removed get-group-users which has to be replaced by cdd-functions Index: cdd-common.install =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/cdd-common.install,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cdd-common.install 17 May 2004 07:48:33 -0000 1.6 +++ cdd-common.install 18 Jun 2004 12:31:55 -0000 1.7 @@ -1,7 +1,6 @@ cdd-user usr/sbin cdd-role usr/sbin cdd-update-menus usr/sbin -get-group-users usr/sbin share/cdd/menu/cdd-menu usr/lib/menu share usr etc/* etc From debian-custom@lists.debian.org Fri Jun 18 13:33:20 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Fri, 18 Jun 2004 12:33:20 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates common.config,1.3,1.4 common.postinst,1.5,1.6 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv28097 Modified Files: common.config common.postinst Log Message: Do not use these. They are brocken because of currently brocken cdd-action but should be a preview how it should work in the future. Index: common.config =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.config,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- common.config 14 Jun 2004 20:57:47 -0000 1.3 +++ common.config 18 Jun 2004 12:33:17 -0000 1.4 @@ -20,5 +20,18 @@ # Add at least one default role for each CDD addRole #CDD# #CDD# +# 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# ,` + +db_set #CDD#-common/group "$CDDUSERS" +db_subst #CDD#-common/group users "$USERS" +db_get #CDD#-common/group + +db_input high #CDD#-common/group || true +db_go + db_stop exit 0 Index: common.postinst =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.postinst,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- common.postinst 14 Jun 2004 20:57:47 -0000 1.5 +++ common.postinst 18 Jun 2004 12:33:17 -0000 1.6 @@ -1,43 +1,33 @@ #!/bin/sh -e -PKG=$(basename $0 | sed 's/\.postinst//') -CDD=`echo ${PKG} | sed "s/^\([a-z][a-z]*\)-common/\1/"` - -[ -s /etc/cdd/cdd.conf ] && . /etc/cdd/cdd.conf -[ -s /etc/cdd/#CDD#/#CDD#.conf ] && . /etc/cdd/#CDD#/#CDD#.conf - -# Login names of all users of the system as comma separated list -USERS=`/usr/sbin/get-group-users --comma` -# "login (Real Name)" of CDD members as comma separated list -# Add the $CDD as system group if not yet existing -CDDUSERS=`/usr/sbin/get-group-users --comma --add "$CDD"` +# 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." + exit -1 +fi +if [ ! -f /etc/cdd/#CDD#/#CDD#.conf ] ; then + echo "#CDDNAME# configuration file /etc/cdd/#CDD#/#CDD#.conf is missing." + exit -1 +fi # Source debconf library. . /usr/share/debconf/confmodule db_version 2.0 -db_set ${PKG}/group "$CDDUSERS" -db_subst ${PKG}/group users "$USERS" -db_get ${PKG}/group - -db_input high ${PKG}/group || true -db_go - -db_get ${PKG}/group +db_get #CDD#-common/group -CURRENTCDDUSERS=`/usr/sbin/get-group-users --simple --add "$CDD"` +CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD#` # 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 + /usr/sbin/cdd-user add #CDD# $user fi done # Del those users which were obviousely removed from list of CDD users -for user in `/usr/sbin/get-group-users --simple` ; do - if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group "$CDD" | grep -c -w $user` -gt 0 ] ; then -# deluser $user $CDD - /usr/sbin/cdd-user del $CDD $user +for user in `getAllUsers 0` ; 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 fi done From debian-custom@lists.debian.org Fri Jun 18 13:43:59 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Fri, 18 Jun 2004 12:43:59 +0000 Subject: [Cdd-commits] cdd/common/cdd/share/cdd/unixgroups cdd-actions,1.11,1.12 Update of /cvsroot/cdd/cdd/common/cdd/share/cdd/unixgroups In directory haydn:/tmp/cvs-serv29137 Modified Files: cdd-actions Log Message: Try to implement functionality of get-group-users - but failed for the moment. Index: cdd-actions =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/share/cdd/unixgroups/cdd-actions,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- cdd-actions 14 Jun 2004 20:57:47 -0000 1.11 +++ cdd-actions 18 Jun 2004 12:43:55 -0000 1.12 @@ -8,6 +8,11 @@ #checkCDD() is backend indep, and is defined in ${SHAREDIR}/cdd-action +# Read adduser config to find out from which ID normal users start +# Default = 1000 +FIRST_UID=1000 +[ -s /etc/adduser.conf ] && . /etc/adduser.conf + # checks if User $1 exists as a system user checkUser() { RET=0 @@ -82,7 +87,6 @@ return ${RET} } - # echoes list of users having role $2 in CDD $1 # if $3 exists use ',' as separator between user names getUsersInRole() { @@ -102,6 +106,41 @@ fi return ${RET} } + +# echoes list of all users of the system +# $1 = 1 - simply login names, $1 = 0 (or anything else) - login names and real name +# if $1 exists use ',' as separator between user names +getAllUsers() { + RET=0 + if [ "$#" -ne 1 -a "$#" -ne 2 ]; then + RET=64 # EX_USAGE + else + SIMPLE=$1 + KOMMA=" " + # Append ',' if second argument is given + if [ "$#" -eq 2 ]; then + KOMMA=", " + fi + USERS="" + (IFS=":" + while read user pass uid gid name rest ; do + if [ $uid -ge $FIRST_UID -a "$user" != "nobody" ] ; then + name=`echo $name | sed "s/,.*//"` + if [ "$USERS" != "" ] ; then + USERS="$USERS$KOMMA" + fi + if [ $SIMPLE -eq 1 ] ; then + USERS="$USERS$user" + else + USERS="$USERS$user ($name)" + fi + fi + done < /etc/passwd + echo $USERS + ) + fi + return ${RET} +} # echo all Role covered by user $2 in CDD $1 getUserRoles() { RET=0 @@ -156,7 +195,7 @@ if [ "$#" -ne 2 ]; then RET=64 # EX_USAGE else - ${DRYRUN} addgroup --system "${ROLE}" + ${DRYRUN} addgroup --system "${ROLE}" || true RET=$? fi return ${RET} From debian-custom@lists.debian.org Sat Jun 19 07:51:06 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 19 Jun 2004 06:51:06 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.8,1.9 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv25019 Modified Files: changelog Log Message: Followed the advise of my English teacher. ;-) Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- changelog 18 Jun 2004 12:30:51 -0000 1.8 +++ changelog 19 Jun 2004 06:51:04 -0000 1.9 @@ -6,7 +6,7 @@ * Use #CDDNAME# variable in debconf templates of cdd-dev. This variable can be set either in common/conf or it is builded by "Debian-Cdd". * cdd-install-helper handles CDD-common.{config,template} - * Usage of get-group-users depreciated, use cdd-tools instead. + * Usage of get-group-users deprecated, use cdd-tools instead. Moved functionality of get-group-users to unixgroups/cdd-actions. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Tue Jun 22 09:58:20 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 08:58:20 +0000 Subject: [Cdd-commits] cdd/doc/common/flyer deutsch.tex,1.6,1.7 english.tex,1.7,1.8 layout.tex,1.5,1.6 Update of /cvsroot/cdd/cdd/doc/common/flyer In directory haydn:/tmp/cvs-serv19983/flyer Modified Files: deutsch.tex english.tex layout.tex Log Message: Completed German translation. Index: layout.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/layout.tex,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- layout.tex 31 May 2004 14:48:35 -0000 1.5 +++ layout.tex 22 Jun 2004 08:58:18 -0000 1.6 @@ -134,6 +134,7 @@ \Itemizesymbol\Selection \Itemizesymbol\Administration \Itemizesymbol\Documentation +\Itemizesymbol\UserRoles \end{itemize} % \colorbox{debianred}{\textcolor{white}{\bf\Large \KnowMoreCaption}} Index: deutsch.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/deutsch.tex,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- deutsch.tex 31 May 2004 14:48:35 -0000 1.6 +++ deutsch.tex 22 Jun 2004 08:58:18 -0000 1.7 @@ -47,7 +47,7 @@ bietet Unterstützung für alle medizinischen Aufgabenbereiche. Ziel ist es nicht nur eine freie Praxisverwaltungssoftware bereitzustellen sondern auch die -medizinische Forschung. Zu unterstützen. Im Moment existieren die +medizinische Forschung zu unterstützen. Im Moment existieren die meisten Programmpakete im Bereich Mikrobiologie.% % } @@ -97,13 +97,17 @@ \def\Access{ % -% +versucht Debian auch für Menschen mit Behinderungen zugänglich zu +machen. Es werden Bildschirmvorleser, -vergrößerer, Sprachsynthesizer +und -erkennungsprogramme integriert.% % } \def\Enterprise{ % -Apply the UserLinux Manifesto +soll das {\em UserLinux Manifest} umsetzen, ein +Zertifikationsprogramm mit Hilfe von Partnerorganisationen ins Leben +rufen, um die Akzeptanz von Debian in der Wirtschaft zu erhöhen.% % } @@ -111,7 +115,7 @@ \def\Metapackages{ % -A meta package is a Debian package which contains: +Ein Metapaket ist ein Debian Paket mit folgendem Inhalt: % } @@ -123,8 +127,8 @@ \def\Menu{ % -Nutzer erhalten ein extra Menü mit dem Inhalt der Custom -Debian Distribution zu der sie gehören +spezifisches Nutzermenü mit dem Inhalt der Custom +Debian Distribution der der Nutzerrolle entspricht % } @@ -132,76 +136,83 @@ % Spezielle Konfiguration (optional) \begin{itemize}\itemsep0cm - \item \texttt{debconf} questions or pre-seeding - \item \texttt{cfengine} scripts + \item \texttt{debconf}-Fragen oder Vorkonfiguration + \item \texttt{cfengine} Skripte \end{itemize} % } \def\Common{ % -Common package \texttt{{\em }-common} (optional) +"`Common"'-Paket \texttt{{\em }-common} (optional) \begin{itemize}\itemsep0cm - \item management of user roles - \item general configuration + \item Verwaltung von Nutzerrollen + \item allgemeine Konfiguration \end{itemize} % } \def\UsersPointOfView{ % -Users point of view +Sichtweise des Nutzers % } \def\Selection{ % -Meta packages provide collections of specific software which allow -easy selection of packages which are interesting for the user without -explicite research in the whole package list of Debian which contains -more than 10.000 packages. This also enables comparison of similar -packages which might be contained in the dependencies of the meta package. +Metapakete stellen eine Sammlung spezifischer Software dar, die eine +einfache Auswahl interessanter Pakete ermöglicht. Der Nutzer wird +nicht mehr genötigt, die vollständige Liste von über 10\,000 +Debianpaketen zu durchforsten, was für die ins Auge gefaßte Zielgruppe +in der Regel unzumutbar ist. Darüber hinaus wird ein einfacher +Vergleich von Paketen mit ähnlicher Funktionalität ermöglicht, sofern +sie in den Abhängigkeiten der Metapakete enthalten sind. % } \def\Administration{ % -Meta packages allow administrators without specialist knowledge to set -up computers which fit the needs of specialist. Meta packages provide -safety against accidental removal of dependencies, might even insert -conflicts to unwished packages and easy installation. Thus the effort -for administration remains low. +Metapakete erlauben Administratoren ohne Spezialkenntnisse der +jeweiligen Nutzergruppe die Computer der Nutzer mit allen relevanten +Softwarepaketen auszustatten, die die Spezialisten für ihre Arbeit +benötigen. Metapakete bieten Sicherheit vor versehentlichem Löschen +von Abhängigkeiten und könnten sogar Konflikte zu Paketen enthalten, +die ausdrücklich nicht auf dem Zielsystem gewünscht werden. Damit +verringert sich der Arbeitsaufwand für den Administrator. % } -% * Documentation packages -% o Packaging and creating of relevant documentation -% o Translation -\def\Documents{ -% -das \TeX/\LaTeX-Dokumentationssystem, PostScript\tm- und -Type1-Schriftarten und -Werkzeuge, den Ghostscript PostScript\tm\ -Interpreter und eine komplette XML/SGML/HTML Entwicklungsumgebung +\def\Documentation{ % +Für das Themengebiet relevante Dokumentation wird in dem Paket +\texttt{{\em }-doc} bereitgestellt und es wird angestrebt, +möglichst gute Übersetzungen für die speziellen Anwendungen +bereitzustellen.% } -\def\Documentation{ -% -Relevant dokumentation is provided in the \texttt{{\em }-doc} -package and maintainers try to care for translation inside the -specialized applications. +\def\UserRoles{ % +Anwender werden speziellen Rollen zugeordnet und erhalten ein +spezielles Menü, das nur die für sie relevanten Anwendungen enthält. +Momentan ist das Rollen-System durch UNIX-Gruppen realisiert, doch +andere Systeme sind möglich.% } \def\KnowMoreCaption{Sie möchten mehr wissen?} \def\KnowMore{ % -Dann besuchen Sie die Debian-Webseite \boxurl{http://www.debian.org/}, -abonnieren Sie eine oder mehrere der Debian-Mailinglisten unter -\boxurl{http://www.debian.org/MailingLists/subscribe} oder benutzen Sie die -IRC-Kanäle \#Debian.DE auf \boxurl{irc.fu-berlin.de} oder -\#debian auf \boxurl{irc.debian.org}. +Ein Gforge-Projekt +\boxurl{http://alioth.debian.org/projects/cdd/} +enthält ein CVS-Repository für jede CDD und documentation. +Die allgemeine ;ailing-Liste +\boxurl{http://lists.debian.org/debian-custom/} dient der +Entwicklerkommunikation. +Für Nutzer relevante Diskussionen gibt es für jede CDD eine eigene +Mailing Liste die in der Regel unter + \boxurl{http://lists.debian.org/debian-} zu finden ist. +Die Webseiten der einzelnen CDDs sind meist unter + \boxurl{http://www.debian.org/devel/debian-}. % } Index: english.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/english.tex,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- english.tex 31 May 2004 14:48:35 -0000 1.7 +++ english.tex 22 Jun 2004 08:58:18 -0000 1.8 @@ -198,6 +198,8 @@ \def\UserRoles{ % Specialised users get a separate menu which is based on their role. +Currently user roles are implemented as UNIX groups but other systems +are possible. % } From debian-custom@lists.debian.org Tue Jun 22 10:15:58 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 09:15:58 +0000 Subject: [Cdd-commits] cdd/doc/common/flyer Makefile,1.3,1.4 Update of /cvsroot/cdd/cdd/doc/common/flyer In directory haydn:/tmp/cvs-serv20903 Modified Files: Makefile Log Message: pdf and upload target Index: Makefile =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 11 May 2004 19:23:03 -0000 1.3 +++ Makefile 22 Jun 2004 09:15:55 -0000 1.4 @@ -28,14 +28,19 @@ # italiano.tex nederlands.tex # francaise.tex portugues.tex svenska.tex dansk.tex -.SUFFIXES: .ps .dvi +.SUFFIXES: .ps .dvi .pdf export TEXINPUTS=./sponsors: .dvi.ps: dvips -o $(base).ps $* +.ps.pdf: + ps2pdf $*.ps + +pdf: $(base).pdf $(base).ps: +$(base).pdf: all.dvi: all.tex $(texfiles) $(langfiles) echo -n > config.tex @@ -78,12 +83,12 @@ dvips -D 600 -h aurora.pro -h black.pro -o $(base)-600dpi-black.ps $(base) upload: clean - $(MAKE) $(base).ps + $(MAKE) pdf -rm -f $(base).{eps,dvi,aux,log} - rsync -e ssh -va --exclude CVS/ --delete ./ klecker.debian.org:/org/www.debian.org/events-materials/flyers/general/ - ssh klecker "cd /org/www.debian.org/events-materials/flyers/general && chgrp -R webwml * && chmod -R g+w *" + rsync -e ssh --exclude CVS/ --delete flyer.pdf tille@people.debian.org:public_html + # ssh klecker "cd /org/www.debian.org/events-materials/flyers/general && chgrp -R webwml * && chmod -R g+w *" clean: - -rm -f $(base).{ps,eps,dvi,aux,log,jpg} *~ + -rm -f $(base).{ps,eps,dvi,aux,log,jpg,pdf} *~ -rm -f all.{ps,eps,dvi,aux,log,jpg} -rm -f $(base)-*.ps From debian-custom@lists.debian.org Tue Jun 22 10:17:01 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 09:17:01 +0000 Subject: [Cdd-commits] cdd/doc/common/flyer deutsch.tex,1.7,1.8 Update of /cvsroot/cdd/cdd/doc/common/flyer In directory haydn:/tmp/cvs-serv20956/flyer Modified Files: deutsch.tex Log Message: Spelling fixes. Index: deutsch.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/deutsch.tex,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- deutsch.tex 22 Jun 2004 08:58:18 -0000 1.7 +++ deutsch.tex 22 Jun 2004 09:16:59 -0000 1.8 @@ -205,7 +205,7 @@ Ein Gforge-Projekt \boxurl{http://alioth.debian.org/projects/cdd/} enthält ein CVS-Repository für jede CDD und documentation. -Die allgemeine ;ailing-Liste +Die allgemeine Mailing-Liste \boxurl{http://lists.debian.org/debian-custom/} dient der Entwicklerkommunikation. Für Nutzer relevante Diskussionen gibt es für jede CDD eine eigene From debian-custom@lists.debian.org Tue Jun 22 11:22:15 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 10:22:15 +0000 Subject: [Cdd-commits] cdd/doc/common/flyer deutsch.tex,1.8,1.9 Update of /cvsroot/cdd/cdd/doc/common/flyer In directory haydn:/tmp/cvs-serv21713/flyer Modified Files: deutsch.tex Log Message: Spelling fixes. Index: deutsch.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/deutsch.tex,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- deutsch.tex 22 Jun 2004 09:16:59 -0000 1.8 +++ deutsch.tex 22 Jun 2004 10:22:12 -0000 1.9 @@ -204,10 +204,10 @@ % Ein Gforge-Projekt \boxurl{http://alioth.debian.org/projects/cdd/} -enthält ein CVS-Repository für jede CDD und documentation. -Die allgemeine Mailing-Liste +enthält ein CVS-Repository für jede CDD und Documentation. +Die Mailing-Liste \boxurl{http://lists.debian.org/debian-custom/} dient der -Entwicklerkommunikation. +allgemeinen Entwicklerkommunikation. Für Nutzer relevante Diskussionen gibt es für jede CDD eine eigene Mailing Liste die in der Regel unter \boxurl{http://lists.debian.org/debian-} zu finden ist. From debian-custom@lists.debian.org Tue Jun 22 17:52:15 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 16:52:15 +0000 Subject: [Cdd-commits] cdd/doc/common/flyer deutsch.tex,1.9,1.10 Update of /cvsroot/cdd/cdd/doc/common/flyer In directory haydn:/tmp/cvs-serv31744/flyer Modified Files: deutsch.tex Log Message: My wife is the best spelling checker ... Index: deutsch.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/deutsch.tex,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- deutsch.tex 22 Jun 2004 10:22:12 -0000 1.9 +++ deutsch.tex 22 Jun 2004 16:52:13 -0000 1.10 @@ -25,7 +25,7 @@ % Debian ist ein freies Betriebssystem für Ihren Computer (siehe allgemeiner Flyer). Custom Debian Distributions sind vollständig -integrierte Untermengen von Debian die besondere Unterstützung für +integrierte Untermengen von Debian, die besondere Unterstützung für spezialisierte Anwender bieten, die eine definierte Untermenge der verfügbaren Software benötigen. Sie sind das "`missing link"' zwischen Entwicklern und Anwendern dieser Software. @@ -42,16 +42,6 @@ % } -\def\Med{ -% -bietet Unterstützung für alle medizinischen -Aufgabenbereiche. Ziel ist es nicht nur eine freie -Praxisverwaltungssoftware bereitzustellen sondern auch die -medizinische Forschung zu unterstützen. Im Moment existieren die -meisten Programmpakete im Bereich Mikrobiologie.% -% -} - \def\Edu{ % stellt eine sofort lauffähige Klassen\-raum-Installation zur @@ -61,9 +51,19 @@ % } +\def\Med{ +% +bietet Unterstützung für alle medizinischen +Aufgabenbereiche. Ziel ist es, nicht nur \mbox{eine} freie +Praxisverwaltungssoftware bereitzustellen sondern auch die +medizinische Forschung zu unterstützen. Im Moment existieren die +meisten Programmpakete im Bereich Mikrobiologie.% +% +} + \def\Demudi{ % -versucht Debian zum System der Wahl für Musiker zu +versucht, Debian zum System der Wahl für Musiker zu gestalten. Derzeit ist DeMuDi keine offizielle Custom Debian Distribution sondern Teil des Agnula Projekts. Die Ergebnisse werden demnächst zu Debian zurückportiert.% @@ -72,10 +72,9 @@ \def\Desktop{ % -versucht das best\-mög\-liche Betriebssystem für -Workstation-Anwendungen bereitzustellen. Oberflächen wie Gnome und KDE -sollten gleichberechtigt optimal laufen. Anfänger sollen eine -funktionstüchtige UMgebung vorfinden ohne den Experten einzuschränken.% +stellt aktuelle Workstation-An\-wen\-dun\-gen bereit. Oberflächen wie Gnome +und KDE werden gleichberechtigt unterstützt. Anfänger sollen eine +funktionstüchtige Umgebung vorfinden, ohne den Experten einzuschränken.% % } @@ -91,13 +90,13 @@ % bedient die Bedürfnisse kleiner gemeinnütziger Vereinigungen. Es wird Software zur Unterstützung für Spendenerhebung, -Mitgliederlistenverwaltung und Konferenzorganisation bereitgestellt.% +Verwaltung von Mitgliederlisten und Konferenzorganisation bereitgestellt.% % } \def\Access{ % -versucht Debian auch für Menschen mit Behinderungen zugänglich zu +versucht, Debian auch für Menschen mit Behinderungen zugänglich zu machen. Es werden Bildschirmvorleser, -vergrößerer, Sprachsynthesizer und -erkennungsprogramme integriert.% % @@ -105,7 +104,7 @@ \def\Enterprise{ % -soll das {\em UserLinux Manifest} umsetzen, ein +soll das {\em UserLinux Manifest} umsetzen und ein Zertifikationsprogramm mit Hilfe von Partnerorganisationen ins Leben rufen, um die Akzeptanz von Debian in der Wirtschaft zu erhöhen.% % @@ -128,7 +127,7 @@ \def\Menu{ % spezifisches Nutzermenü mit dem Inhalt der Custom -Debian Distribution der der Nutzerrolle entspricht +Debian Distribution, nur für Nutzer in der entsprechenden Rolle % } @@ -166,19 +165,19 @@ Debianpaketen zu durchforsten, was für die ins Auge gefaßte Zielgruppe in der Regel unzumutbar ist. Darüber hinaus wird ein einfacher Vergleich von Paketen mit ähnlicher Funktionalität ermöglicht, sofern -sie in den Abhängigkeiten der Metapakete enthalten sind. +sie in den Abhängigkeiten der Meta\-pakete enthalten sind. % } \def\Administration{ % Metapakete erlauben Administratoren ohne Spezialkenntnisse der -jeweiligen Nutzergruppe die Computer der Nutzer mit allen relevanten +jeweiligen Nutzergruppe, die Computer der Nutzer mit \mbox{allen} relevanten Softwarepaketen auszustatten, die die Spezialisten für ihre Arbeit -benötigen. Metapakete bieten Sicherheit vor versehentlichem Löschen +benötigen. Meta\-pakete bieten Sicherheit vor versehentlichem Löschen von Abhängigkeiten und könnten sogar Konflikte zu Paketen enthalten, die ausdrücklich nicht auf dem Zielsystem gewünscht werden. Damit -verringert sich der Arbeitsaufwand für den Administrator. +verringert sich der Arbeits\-auf\-wand für den Administrator. % } @@ -204,7 +203,7 @@ % Ein Gforge-Projekt \boxurl{http://alioth.debian.org/projects/cdd/} -enthält ein CVS-Repository für jede CDD und Documentation. +enthält ein CVS-Repository für jede CDD und Dokumentation. Die Mailing-Liste \boxurl{http://lists.debian.org/debian-custom/} dient der allgemeinen Entwicklerkommunikation. @@ -229,7 +228,7 @@ \def\SponsoredBy{ % -Der Druck dieses Flyers wurde gesponsort von +Der Druck dieses Flyers wurde gesponsert von % } From debian-custom@lists.debian.org Tue Jun 22 21:55:18 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 20:55:18 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates common.config,1.4,1.5 common.postinst,1.6,1.7 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv22879/cdd/templates Modified Files: common.config common.postinst Log Message: Fixes various stupid bugs in transition from get-group-users to cdd-tools Index: common.config =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.config,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- common.config 18 Jun 2004 12:33:17 -0000 1.4 +++ common.config 22 Jun 2004 20:55:16 -0000 1.5 @@ -21,10 +21,10 @@ addRole #CDD# #CDD# # Login names of all users of the system as comma separated list -USERS=`getAllUsers 0` +USERS=`getAllUsers 0 ,` # "login (Real Name)" of users registered to the CDD #CDD# -CDDUSERS=`getUsersInRole #CDD# #CDD# ,` +CDDUSERS=`getUsersInRole #CDD# #CDD# 0 ,` db_set #CDD#-common/group "$CDDUSERS" db_subst #CDD#-common/group users "$USERS" Index: common.postinst =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.postinst,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- common.postinst 18 Jun 2004 12:33:17 -0000 1.6 +++ common.postinst 22 Jun 2004 20:55:16 -0000 1.7 @@ -5,11 +5,13 @@ echo "Custom Debian Distribution configuration file /etc/cdd/cdd.conf is missing." exit -1 fi +. /etc/cdd/cdd.conf if [ ! -f /etc/cdd/#CDD#/#CDD#.conf ] ; then echo "#CDDNAME# configuration file /etc/cdd/#CDD#/#CDD#.conf is missing." exit -1 fi +. /etc/cdd/#CDD#/#CDD#.conf # Source debconf library. . /usr/share/debconf/confmodule @@ -17,7 +19,7 @@ db_get #CDD#-common/group -CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD#` +CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD# 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 From debian-custom@lists.debian.org Tue Jun 22 21:55:18 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 20:55:18 +0000 Subject: [Cdd-commits] cdd/common/cdd/share/cdd/unixgroups cdd-actions,1.12,1.13 Update of /cvsroot/cdd/cdd/common/cdd/share/cdd/unixgroups In directory haydn:/tmp/cvs-serv22879/cdd/share/cdd/unixgroups Modified Files: cdd-actions Log Message: Fixes various stupid bugs in transition from get-group-users to cdd-tools Index: cdd-actions =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/share/cdd/unixgroups/cdd-actions,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- cdd-actions 18 Jun 2004 12:43:55 -0000 1.12 +++ cdd-actions 22 Jun 2004 20:55:15 -0000 1.13 @@ -88,56 +88,64 @@ } # echoes list of users having role $2 in CDD $1 -# if $3 exists use ',' as separator between user names +# if $4 exists use ',' as separator between user names getUsersInRole() { RET=0 CDD=$1 ROLE=$2 - if [ "$#" -eq 2 ]; then - USERS=`getent group ${ROLE} | sed -ne "s/.*:\(.*\)$/\1/p" | tr "," " "` - cddDebug "getUsersInRole(): users covering role ${ROLE} for CDD ${CDD}: ${USERS}" - echo ${USERS} - elif [ "$#" -eq 3 ]; then - USERS=`getent group ${ROLE} | sed -ne "s/.*:\(.*\)$/\1/p"` - cddDebug "getUsersInRole(): users covering role ${ROLE} for CDD ${CDD}: ${USERS}" - echo ${USERS} - else - RET=64 # EX_USAGE + SIMPLE=$3 + USERS="" + if [ "$#" -ne 3 -a "$#" -ne 4 ]; then + return RET=64 # EX_USAGE fi + for user in `getent group ${ROLE} | sed -ne "s/.*:\(.*\)$/\1/p" | tr "," " "` ; do + REALNAME=" " + if [ $SIMPLE -ne 1 ] ; then + REALNAME=" (`grep \"^$user:\" /etc/passwd | sed \"s/^$user:[^:]\+:[0-9]\+:[0-9]\+:\([^:]\+\):.*/\1/\" | sed \"s/,.*//\"`)" + fi + if [ "$#" -eq 4 ]; then + if [ "$USERS" != "" ] ; then + USERS="${USERS}," + fi + fi + if [ "$USERS" != "" ] ; then + USERS="${USERS} " + fi + USERS="${USERS}${user}${REALNAME}" + done + echo $USERS return ${RET} } # echoes list of all users of the system # $1 = 1 - simply login names, $1 = 0 (or anything else) - login names and real name -# if $1 exists use ',' as separator between user names +# if $2 exists use ',' as separator between user names getAllUsers() { RET=0 if [ "$#" -ne 1 -a "$#" -ne 2 ]; then RET=64 # EX_USAGE else SIMPLE=$1 - KOMMA=" " - # Append ',' if second argument is given - if [ "$#" -eq 2 ]; then - KOMMA=", " - fi - USERS="" + TMPFILE=`tempfile` (IFS=":" while read user pass uid gid name rest ; do if [ $uid -ge $FIRST_UID -a "$user" != "nobody" ] ; then name=`echo $name | sed "s/,.*//"` - if [ "$USERS" != "" ] ; then - USERS="$USERS$KOMMA" - fi if [ $SIMPLE -eq 1 ] ; then - USERS="$USERS$user" + echo "$user" >> ${TMPFILE} else - USERS="$USERS$user ($name)" + echo "$user ($name)" >> ${TMPFILE} fi fi done < /etc/passwd - echo $USERS ) + # Append ',' if second argument is given + if [ "$#" -eq 2 ]; then + sort -u "${TMPFILE}" | tr '\n' ',' | sed 's/,/&\ /g' | sed 's/, *$//g' + else + sort -u "${TMPFILE}" + fi + rm -f "${TMPFILE}" fi return ${RET} } From debian-custom@lists.debian.org Tue Jun 22 21:58:07 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 20:58:07 +0000 Subject: [Cdd-commits] cdd/med/debian-med/common conf,1.1,1.2 Update of /cvsroot/cdd/cdd/med/debian-med/common In directory haydn:/tmp/cvs-serv23356/debian-med/common Modified Files: conf Log Message: Preparation of next release which complies to cdd-0.3.2 Index: conf =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/common/conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- conf 21 Apr 2004 07:14:42 -0000 1.1 +++ conf 22 Jun 2004 20:58:05 -0000 1.2 @@ -1,4 +1,9 @@ ## This is a configuration file for Debian-med Custom Debian Distribution ## It is read after /etc/cdd/cdd.conf and can override or add variables -UPDATEUSERMENU=yes +## This variable is replaced by a debconf question +## UPDATEUSERMENU=yes + +## Some CDDs do not build their name generic like Debian-#CDD# so +## we need the correct name here +CDDNAME=Debian-Med From debian-custom@lists.debian.org Tue Jun 22 21:58:08 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 22 Jun 2004 20:58:08 +0000 Subject: [Cdd-commits] cdd/med/debian-med/debian changelog,1.4,1.5 control,1.2,1.3 control.stub,1.2,1.3 rules,1.2,1.3 Update of /cvsroot/cdd/cdd/med/debian-med/debian In directory haydn:/tmp/cvs-serv23356/debian-med/debian Modified Files: changelog control control.stub rules Log Message: Preparation of next release which complies to cdd-0.3.2 Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/debian/rules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rules 19 Apr 2004 09:16:15 -0000 1.2 +++ rules 22 Jun 2004 20:58:06 -0000 1.3 @@ -29,7 +29,7 @@ rm -rf tmp rm -f tasks/*~ [ -d menu ] && rm -f debian/med-*.post{inst,rm} - rm -f debian/med-common.{templates,config} + rm -f debian/med-common.{templates,config,install} debian/med-apt.conf rm -rf debian/po if [ -f debian/control ] ; then dh_clean ; fi @@ -43,15 +43,16 @@ dh_clean -k dh_installdirs -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - # Build architecture-dependent files here. binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot dh_installdocs + dh_install dh_installexamples dh_installmenu # dh_installlogrotate Index: control =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/debian/control,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- control 14 Apr 2004 21:07:47 -0000 1.2 +++ control 22 Jun 2004 20:58:06 -0000 1.3 @@ -2,7 +2,7 @@ Section: misc Priority: extra Maintainer: Andreas Tille -Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3) +Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.2) Standards-Version: 3.6.1 Package: med Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/debian/changelog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- changelog 7 Jun 2004 21:32:53 -0000 1.4 +++ changelog 22 Jun 2004 20:58:06 -0000 1.5 @@ -1,6 +1,7 @@ debian-med (0.8) unstable; urgency=low * Added med-physics, med-pharmacy, med-bio-dev + * Overworked menus of meta packages -- Andreas Tille Fri, 4 Jun 2004 14:44:36 +0200 Index: control.stub =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/debian/control.stub,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- control.stub 14 Apr 2004 21:07:47 -0000 1.2 +++ control.stub 22 Jun 2004 20:58:06 -0000 1.3 @@ -2,7 +2,7 @@ Section: misc Priority: extra Maintainer: Andreas Tille -Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3) +Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.3.2) Standards-Version: 3.6.1 Package: med From debian-custom@lists.debian.org Wed Jun 23 11:42:26 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:42:26 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/docs - New directory Update of /cvsroot/cdd/cdd/common/cdd/examples/docs In directory haydn:/tmp/cvs-serv18735/docs Log Message: Directory /cvsroot/cdd/cdd/common/cdd/examples/docs added to the repository From debian-custom@lists.debian.org Wed Jun 23 11:44:12 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:44:12 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/docs/task1 - New directory Update of /cvsroot/cdd/cdd/common/cdd/examples/docs/task1 In directory haydn:/tmp/cvs-serv18830/task1 Log Message: Directory /cvsroot/cdd/cdd/common/cdd/examples/docs/task1 added to the repository From debian-custom@lists.debian.org Wed Jun 23 11:48:21 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:48:21 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian cdd-common.install,1.7,1.8 changelog,1.9,1.10 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv3808/cdd/debian Modified Files: cdd-common.install changelog Log Message: Several bug fixes and enhancement of examples. Index: cdd-common.install =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/cdd-common.install,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- cdd-common.install 18 Jun 2004 12:31:55 -0000 1.7 +++ cdd-common.install 23 Jun 2004 10:48:19 -0000 1.8 @@ -1,6 +1,7 @@ -cdd-user usr/sbin -cdd-role usr/sbin -cdd-update-menus usr/sbin +cdd-user usr/sbin +cdd-role usr/sbin +cdd-update-menus usr/sbin +cdd-update-usermenus usr/sbin share/cdd/menu/cdd-menu usr/lib/menu -share usr -etc/* etc +share usr +etc/* etc Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- changelog 19 Jun 2004 06:51:04 -0000 1.9 +++ changelog 23 Jun 2004 10:48:19 -0000 1.10 @@ -3,11 +3,13 @@ * Remove ${HOME}/.menu/cdd-menu in postinst only if ${MENU}/.menu exists * Added /etc/apt/apt.conf.d script to #cdd#-common templates to invoke cdd-update-usermenus after all meta packages of a CDD were installed + if requested by a shared debconf variable * Use #CDDNAME# variable in debconf templates of cdd-dev. This variable can be set either in common/conf or it is builded by "Debian-Cdd". * cdd-install-helper handles CDD-common.{config,template} * Usage of get-group-users deprecated, use cdd-tools instead. Moved functionality of get-group-users to unixgroups/cdd-actions. + * Enhanced example directory. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Wed Jun 23 11:48:21 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:48:21 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/common conf,NONE,1.1 Update of /cvsroot/cdd/cdd/common/cdd/examples/common In directory haydn:/tmp/cvs-serv3808/cdd/examples/common Added Files: conf Log Message: Several bug fixes and enhancement of examples. --- NEW FILE: conf --- ## This is a configuration file for Debian-med Custom Debian Distribution ## It is read after /etc/cdd/cdd.conf and can override or add variables ## Some CDDs do not build their name generic like Debian-#CDD# so ## we need the correct name here CDDNAME=Debian-_CDD_ From debian-custom@lists.debian.org Wed Jun 23 11:48:21 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:48:21 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/debian README,NONE,1.1 control,1.1,1.2 control.stub,1.1,1.2 rules,1.2,1.3 conf,1.1,NONE Update of /cvsroot/cdd/cdd/common/cdd/examples/debian In directory haydn:/tmp/cvs-serv3808/cdd/examples/debian Modified Files: control control.stub rules Added Files: README Removed Files: conf Log Message: Several bug fixes and enhancement of examples. Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/examples/debian/rules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rules 12 Jun 2004 19:14:08 -0000 1.2 +++ rules 23 Jun 2004 10:48:19 -0000 1.3 @@ -5,6 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +cdd=_CDD_ +pkgsrc=debian-$(cdd) + control: gen-control debian/control.stub tasks/* control-stamp control-stamp: rm -f debian/control @@ -24,8 +27,8 @@ rm -f build-stamp control-stamp rm -rf tmp rm -f tasks/*~ - [ -d menu ] && rm -f debian/_CDD_-*.post{inst,rm} - rm -f debian/_CDD_-common.{templates,config,install} debian/_CDD_-apt.conf + [ -d menu ] && rm -f debian/$(cdd)-*.post{inst,rm} + rm -f debian/$(cdd)-common.{templates,config,install} debian/$(cdd)-apt.conf rm -rf debian/po if [ -f debian/control ] ; then dh_clean ; fi @@ -73,6 +76,15 @@ dh_gencontrol dh_md5sums dh_builddeb + +dist: + distdir=$(pkgsrc)-`cat VERSION` ; \ + rm -rf $${distdir} ; \ + mkdir $${distdir} ; \ + chmod 777 $${distdir} ; \ + rsync -a --exclude $${distdir} --exclude CVS * $${distdir} ; \ + GZIP=-9 tar -czf ../$(pkgsrc)_`cat VERSION`.tar.gz $${distdir} ; \ + rm -rf $${distdir} binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install Index: control =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/examples/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- control 26 Mar 2004 10:21:35 -0000 1.1 +++ control 23 Jun 2004 10:48:19 -0000 1.2 @@ -1,8 +1,8 @@ Source: debian-_CDD_ Section: misc Priority: extra -Maintainer: _CDD_Maintainer <_CDD_@debian.org> -Uploaders: _FURTHER-CDD_Maintainer <_CDD-2_@debian.org> +Maintainer: _MAINTAINER_ <_maintainer_@debian.org> +Uploaders: _OPTIONAL-FURTHER-MAINTAINER_ <_optional-further-maintainer_@debian.org> Build-Depends-Indep: debhelper (>= 4), cdd-dev Standards-Version: 3.6.1 --- NEW FILE: README --- You always need this directory to build meta packages. Just change control.stub and replace the variables _CDD_ and _MAINTAINER_ to the apropriate strings. --- conf DELETED --- Index: control.stub =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/examples/debian/control.stub,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- control.stub 26 Mar 2004 10:21:35 -0000 1.1 +++ control.stub 23 Jun 2004 10:48:19 -0000 1.2 @@ -1,8 +1,8 @@ Source: debian-_CDD_ Section: misc Priority: extra -Maintainer: _CDD_Maintainer <_CDD_@debian.org> -Uploaders: _FURTHER-CDD_Maintainer <_CDD-2_@debian.org> +Maintainer: _MAINTAINER_ <_maintainer_@debian.org> +Uploaders: _OPTIONAL-FURTHER-MAINTAINER_ <_optional-further-maintainer_@debian.org> Build-Depends-Indep: debhelper (>= 4), cdd-dev Standards-Version: 3.6.1 From debian-custom@lists.debian.org Wed Jun 23 11:48:21 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:48:21 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/docs README,NONE,1.1 Update of /cvsroot/cdd/cdd/common/cdd/examples/docs In directory haydn:/tmp/cvs-serv3808/cdd/examples/docs Added Files: README Log Message: Several bug fixes and enhancement of examples. --- NEW FILE: README --- Sometimes it is not possible to provide a useful menu entry for a package and thus we would fail to create a menu entry for a dependency inside a meta package. This sucks in term of user support and thus it is strongly suggested to provide some information about each dependant package which has no reasonable menu entry. This can easily done by creating a directory with the name of the meta package (i.e. task1) which contains the relevant package dependency. Then create a file named like the package which fails to provide a menu (i.e. dep1.txt). This simple text file should provide all information which is necessary to use this package, like man pages online documentation, usage examples, upstream URL, etc. From debian-custom@lists.debian.org Wed Jun 23 11:48:21 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:48:21 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/docs/task1 dep1.txt,NONE,1.1 Update of /cvsroot/cdd/cdd/common/cdd/examples/docs/task1 In directory haydn:/tmp/cvs-serv3808/cdd/examples/docs/task1 Added Files: dep1.txt Log Message: Several bug fixes and enhancement of examples. --- NEW FILE: dep1.txt --- dep1: Short description of package dep1 Some information about dep1 from the Debian-_CDD_ project. long description of dep1 More infromation about the dep1 package can be obtained from the following manpages: dep1_a.1 dep1_b.1 ... You can use this package in the following way: ... More information about dep1 can be obtained from the home page at http://www.dep1.org/ From debian-custom@lists.debian.org Wed Jun 23 11:48:21 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 10:48:21 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates common.config,1.5,1.6 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv3808/cdd/templates Modified Files: common.config Log Message: Several bug fixes and enhancement of examples. Index: common.config =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.config,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- common.config 22 Jun 2004 20:55:16 -0000 1.5 +++ common.config 23 Jun 2004 10:48:19 -0000 1.6 @@ -5,7 +5,7 @@ db_version 2.0 db_capb backup -db_input "medium" "shared/#CDD#-common/group" || true +db_input "medium" "shared/#CDD#-common/usermenus" || true db_go # if cdd-common package is not yet installed we have to stop here From debian-custom@lists.debian.org Wed Jun 23 12:00:25 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 11:00:25 +0000 Subject: [Cdd-commits] cdd/med/debian-med/debian rules,1.3,1.4 med-templates,1.1,NONE templates,1.1,NONE Update of /cvsroot/cdd/cdd/med/debian-med/debian In directory haydn:/tmp/cvs-serv4366/debian-med/debian Modified Files: rules Removed Files: med-templates templates Log Message: Removed templates which now come from cdd-dev, adjusted rules. --- templates DELETED --- Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/debian/rules,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rules 22 Jun 2004 20:58:06 -0000 1.3 +++ rules 23 Jun 2004 11:00:23 -0000 1.4 @@ -5,7 +5,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -pkgsrc=debian-med +cdd=med +pkgsrc=debian-$(cdd) control: gen-control debian/control.stub tasks/* control-stamp control-stamp: @@ -18,7 +19,7 @@ build-stamp: dh_testdir - #/usr/bin/docbook-to-man debian/meta-med.sgml > meta-med.1 + #/usr/bin/docbook-to-man debian/meta-$(cdd).sgml > meta-$(cdd).1 touch build-stamp @@ -28,8 +29,8 @@ rm -f build-stamp control-stamp rm -rf tmp rm -f tasks/*~ - [ -d menu ] && rm -f debian/med-*.post{inst,rm} - rm -f debian/med-common.{templates,config,install} debian/med-apt.conf + [ -d menu ] && rm -f debian/$(cdd)-*.post{inst,rm} + rm -f debian/$(cdd)-common.{templates,config,install} debian/$(cdd)-apt.conf rm -rf debian/po if [ -f debian/control ] ; then dh_clean ; fi --- med-templates DELETED --- From debian-custom@lists.debian.org Wed Jun 23 12:01:40 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 23 Jun 2004 11:01:40 +0000 Subject: [Cdd-commits] cdd/doc/common/flyer Makefile,1.4,1.5 deutsch.tex,1.10,1.11 english.tex,1.8,1.9 Update of /cvsroot/cdd/cdd/doc/common/flyer In directory haydn:/tmp/cvs-serv4620/flyer Modified Files: Makefile deutsch.tex english.tex Log Message: Forgot a paragraph in German translation and had to shorten all others. Index: Makefile =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 22 Jun 2004 09:15:55 -0000 1.4 +++ Makefile 23 Jun 2004 11:01:38 -0000 1.5 @@ -38,13 +38,14 @@ .ps.pdf: ps2pdf $*.ps -pdf: $(base).pdf $(base).ps: $(base).pdf: all.dvi: all.tex $(texfiles) $(langfiles) echo -n > config.tex latex all + +pdf: $(base).pdf $(base).dvi: $(base).tex $(lang1).tex $(lang2).tex $(texfiles) Makefile ./mkconfig $(lang1) $(lang2) Index: deutsch.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/deutsch.tex,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- deutsch.tex 22 Jun 2004 16:52:13 -0000 1.10 +++ deutsch.tex 23 Jun 2004 11:01:38 -0000 1.11 @@ -121,13 +121,21 @@ \def\Dependencies{ % Abhängigkeiten von anderen Debian Paketen +\begin{itemize} + \item Abhängigkeiten von Paketen für eine bestimmte Aufgabe + \item Empfehlen weiterer interessanter Pakete + \item Vorschlagen anderer oder nicht-freier Pakete +\end{itemize} % } \def\Menu{ % -spezifisches Nutzermenü mit dem Inhalt der Custom -Debian Distribution, nur für Nutzer in der entsprechenden Rolle +Nutzermenü-Einträge (empfohlen) +\begin{itemize}\itemsep0cm + \item in \texttt{/etc/cdd/{\em }/menu/{\em }} + \item Verwaltung durch Rollen-basierte Werkzeuge +\end{itemize} % } @@ -159,25 +167,23 @@ \def\Selection{ % -Metapakete stellen eine Sammlung spezifischer Software dar, die eine -einfache Auswahl interessanter Pakete ermöglicht. Der Nutzer wird -nicht mehr genötigt, die vollständige Liste von über 10\,000 -Debianpaketen zu durchforsten, was für die ins Auge gefaßte Zielgruppe -in der Regel unzumutbar ist. Darüber hinaus wird ein einfacher -Vergleich von Paketen mit ähnlicher Funktionalität ermöglicht, sofern +Metapakete sind Sammlungen spezifischer Software zur +einfachen Auswahl relevanter Pakete. Anstatt die +vollständige Liste der über 10\,000 Debianpakete zu durchforsten +wird lediglich das der Aufgabe entsprechende Meta\-paket installiert. +Ein Vergleich von Paketen mit ähnlicher Funktionalität wird ermöglicht, sofern sie in den Abhängigkeiten der Meta\-pakete enthalten sind. % } \def\Administration{ % -Metapakete erlauben Administratoren ohne Spezialkenntnisse der -jeweiligen Nutzergruppe, die Computer der Nutzer mit \mbox{allen} relevanten -Softwarepaketen auszustatten, die die Spezialisten für ihre Arbeit -benötigen. Meta\-pakete bieten Sicherheit vor versehentlichem Löschen -von Abhängigkeiten und könnten sogar Konflikte zu Paketen enthalten, -die ausdrücklich nicht auf dem Zielsystem gewünscht werden. Damit -verringert sich der Arbeits\-auf\-wand für den Administrator. +Administratoren ohne Spezialkenntnisse der +Zielgruppe können den Nutzern \mbox{alle} relevanten +Softwarepakete zur Verfügung stellen. Abhängige Pakete +können nicht versehentliche gelöschent werden, selbst +Konflikte zu ungewünschten Paketen sind möglich. Der +Arbeits\-auf\-wand des Administrators verringert sich. % } @@ -185,16 +191,15 @@ % Für das Themengebiet relevante Dokumentation wird in dem Paket \texttt{{\em }-doc} bereitgestellt und es wird angestrebt, -möglichst gute Übersetzungen für die speziellen Anwendungen -bereitzustellen.% +spezielle Anwendungen möglichst gut zu übersetzen.% } \def\UserRoles{ % -Anwender werden speziellen Rollen zugeordnet und erhalten ein -spezielles Menü, das nur die für sie relevanten Anwendungen enthält. -Momentan ist das Rollen-System durch UNIX-Gruppen realisiert, doch -andere Systeme sind möglich.% +Sezialanwender erhalten ein separates Menü, das ihrer Rolle +entspricht. Momentan ist das Rollen-System durch UNIX-Gruppen +realisiert - andere Systeme sind möglich.% +% } \def\KnowMoreCaption{Sie möchten mehr wissen?} @@ -217,6 +222,9 @@ \def\DetailedDoc{ % +Eine ausführliche Dokumentation über Custom Debian Distribution +befindet sich unter +\boxurl{http://people.debian.org/~tille/cdd/}. % } Index: english.tex =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/flyer/english.tex,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- english.tex 22 Jun 2004 08:58:18 -0000 1.8 +++ english.tex 23 Jun 2004 11:01:38 -0000 1.9 @@ -223,7 +223,7 @@ } \def\DetailedDoc{ -% FIXME: URL KÜRZEN!!! +% A detailed documentation about Custom Debian Distribution can be found at \boxurl{http://people.debian.org/~tille/cdd/}. % From debian-custom@lists.debian.org Sat Jun 26 08:07:56 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 07:07:56 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates common.templates,1.1,1.2 postinst,1.11,1.12 postrm,1.6,1.7 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv4163/cdd/templates Modified Files: common.templates postinst postrm Log Message: Removed echo from post{int,rm} because it conflicts with db_get Index: common.templates =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.templates,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- common.templates 12 Jun 2004 19:19:25 -0000 1.1 +++ common.templates 26 Jun 2004 07:07:54 -0000 1.2 @@ -11,8 +11,8 @@ Default: end _Description: When do you like to build user menus? The meta packages of the #CDDNAME# Custom Debian Distribution do - contain extra role based menus for users. These will be builded if - user who is registered in a certain role calls update-menus. This + contain extra role based menus for users. These will be built if + the user who is registered in a certain role calls update-menus. This can be done automatically for all users who are registered for #CDDNAME# after installation of each single meta package (=now), at the end of the whole installation process to save time in case @@ -21,4 +21,4 @@ * now: Call update-menus after each meta package (time consuming). * end: Call update-menus only once at the end of the whole installation/upgrading process. - * newver: Do not call update-menus at all. + * never: Do not call update-menus at all. Index: postrm =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postrm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- postrm 21 Apr 2004 07:07:57 -0000 1.6 +++ postrm 26 Jun 2004 07:07:54 -0000 1.7 @@ -1,7 +1,8 @@ #!/bin/bash -e -echo "Removing package #PKG#." -cdd-update-menus -d #CDD# +## Echoing breaks debconf! +## echo "Removing package #PKG#." +test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD# source /etc/cdd/cdd.conf if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then source /etc/cdd/#CDD#/#CDD#.conf ; fi Index: postinst =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- postinst 12 Jun 2004 19:15:48 -0000 1.11 +++ postinst 26 Jun 2004 07:07:54 -0000 1.12 @@ -1,7 +1,8 @@ #!/bin/bash -e -echo "Installing package #PKG#." -cdd-update-menus -d #CDD# +## Echoing breaks debconf! +## echo "Installing package #PKG#." +test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD# . /usr/share/debconf/confmodule db_version 2.0 @@ -34,7 +35,7 @@ # This code should be removed for the stable release because we can not # care for clean updates to old testing verisons for endless time ... for ROLE in `getCDDRoleList #CDD#`; do - for CDDUSER in `getUsersInRole #CDD# ${ROLE}`; do + for CDDUSER in `getUsersInRole #CDD# ${ROLE} 1`; do USERHOME="`getUserHome ${CDDUSER}`" if [ -d ${USERHOME}/.menu ] ; then OLDENTRY="${USERHOME}/.menu/cdd-menu" From debian-custom@lists.debian.org Sat Jun 26 23:03:22 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:22 +0000 Subject: [Cdd-commits] cdd/common/cdd BUGS,1.2,1.3 cdd-install-helper,1.6,1.7 cdd-update-usermenus,1.1,1.2 Update of /cvsroot/cdd/cdd/common/cdd In directory haydn:/tmp/cvs-serv5552/cdd Modified Files: BUGS cdd-install-helper cdd-update-usermenus Log Message: Preparation for next release. Index: cdd-update-usermenus =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/cdd-update-usermenus,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cdd-update-usermenus 14 Jun 2004 20:57:47 -0000 1.1 +++ cdd-update-usermenus 26 Jun 2004 22:03:18 -0000 1.2 @@ -16,6 +16,9 @@ # a local per CDD conf is sourced later, after argument parsing source ${CONFBASE}/cdd.conf +# specific utilities for cdd-update-menus +source ${SHAREDIR}/cdd-update-menus + if ! amI root; then cddLog "$0 must be called by root. If you are a normal user just call update-menus ." exit 0 @@ -37,7 +40,7 @@ if [ -s /etc/cdd/${CDD}/${CDD}.conf ] ; then source /etc/cdd/${CDD}/${CDD}.conf ; fi for ROLE in `getCDDRoleList ${CDD}`; do - for CDDUSER in `getUsersInRole ${CDD} ${ROLE}`; do + for CDDUSER in `getUsersInRole ${CDD} ${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" Index: cdd-install-helper =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/cdd-install-helper,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cdd-install-helper 12 Jun 2004 19:11:31 -0000 1.6 +++ cdd-install-helper 26 Jun 2004 22:03:18 -0000 1.7 @@ -5,6 +5,7 @@ SubstCDDName () { sed -e "s/#CDD#/${cdd}/g" \ + -e "s?\([/ ]\)\(common.templates:*\)?\1${cdd}-\2?" \ -e "s/#CDDNAME#/${CDDNAME}/g" /usr/share/cdd/templates/$1 > \ debian/$2 } @@ -96,6 +97,8 @@ commname=`basename $comm` SubstCDDName ${commname} ${cdd}-${commname} done + # rename apt.conf.d file + [ -s debian/${cdd}-apt.conf ] && mv debian/${cdd}-apt.conf debian/90${cdd}-common mkdir -p debian/po for po in `ls /usr/share/cdd/templates/po/*` ; do poname=`basename $po` Index: BUGS =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/BUGS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BUGS 14 Apr 2004 21:03:44 -0000 1.2 +++ BUGS 26 Jun 2004 22:03:18 -0000 1.3 @@ -1,5 +1,5 @@ List of known bugs: ------------------- -Gnome and KDE have different menu systems and do not work nicely -with this approach. +cdd-gen-control does not regard virtual package syntax ('|') and +versioned depends. From debian-custom@lists.debian.org Sat Jun 26 23:03:22 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:22 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian cdd-dev.docs,NONE,1.1 cdd-common.docs,1.3,1.4 rules,1.5,1.6 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv5552/cdd/debian Modified Files: cdd-common.docs rules Added Files: cdd-dev.docs Log Message: Preparation for next release. Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/rules,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rules 14 Jun 2004 07:44:33 -0000 1.5 +++ rules 26 Jun 2004 22:03:20 -0000 1.6 @@ -54,6 +54,7 @@ mkdir $${distdir} ; \ chmod 777 $${distdir} ; \ rsync -a --exclude $${distdir} --exclude CVS * $${distdir} ; \ + rm -f `find . -name "*~"` ; \ GZIP=-9 tar -czf ../cdd_`cat VERSION`.tar.gz $${distdir} ; \ rm -rf $${distdir} --- NEW FILE: cdd-dev.docs --- BUGS Index: cdd-common.docs =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/cdd-common.docs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cdd-common.docs 18 May 2004 06:57:02 -0000 1.3 +++ cdd-common.docs 26 Jun 2004 22:03:20 -0000 1.4 @@ -1,3 +1,2 @@ -BUGS README.CDD debian/NEWS.Debian From debian-custom@lists.debian.org Sat Jun 26 23:03:23 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:23 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/debian rules,1.3,1.4 Update of /cvsroot/cdd/cdd/common/cdd/examples/debian In directory haydn:/tmp/cvs-serv5552/cdd/examples/debian Modified Files: rules Log Message: Preparation for next release. Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/examples/debian/rules,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rules 23 Jun 2004 10:48:19 -0000 1.3 +++ rules 26 Jun 2004 22:03:20 -0000 1.4 @@ -28,7 +28,7 @@ rm -rf tmp rm -f tasks/*~ [ -d menu ] && rm -f debian/$(cdd)-*.post{inst,rm} - rm -f debian/$(cdd)-common.{templates,config,install} debian/$(cdd)-apt.conf + rm -f debian/$(cdd)-common.{templates,config,install} debian/90$(cdd)-common rm -rf debian/po if [ -f debian/control ] ; then dh_clean ; fi @@ -51,7 +51,6 @@ dh_testdir dh_testroot dh_installdocs - dh_install dh_installexamples dh_installmenu # dh_installlogrotate @@ -62,6 +61,9 @@ dh_installcron dh_installman cdd-install-helper + # dh_install must be called after cdd-install-helper because + # some files which have to be copied are created in this call + dh_install dh_installdebconf # dh_installinfo dh_installchangelogs From debian-custom@lists.debian.org Sat Jun 26 23:03:23 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:23 +0000 Subject: [Cdd-commits] cdd/common/cdd/share/cdd/menu cdd-menu,1.7,1.8 Update of /cvsroot/cdd/cdd/common/cdd/share/cdd/menu In directory haydn:/tmp/cvs-serv5552/cdd/share/cdd/menu Modified Files: cdd-menu Log Message: Preparation for next release. Index: cdd-menu =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/share/cdd/menu/cdd-menu,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- cdd-menu 3 Jun 2004 21:12:59 -0000 1.7 +++ cdd-menu 26 Jun 2004 22:03:21 -0000 1.8 @@ -12,6 +12,7 @@ CONFBASE=${CONFBASE:-/etc/cdd} +# read generic CDD conf source ${CONFBASE}/cdd.conf CDDUSER=`whoami` @@ -21,8 +22,7 @@ ALLCDD=`getCDDList` for CDD in ${ALLCDD}; do - # read generic and per CDD conf - source ${CONFBASE}/cdd.conf + # read per CDD conf test -f ${CONFBASE}/${CDD}/${CDD}.conf && \ source ${CONFBASE}/${CDD}/${CDD}.conf From debian-custom@lists.debian.org Sat Jun 26 23:03:23 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:23 +0000 Subject: [Cdd-commits] cdd/common/cdd/share/cdd/unixgroups cdd-actions,1.13,1.14 Update of /cvsroot/cdd/cdd/common/cdd/share/cdd/unixgroups In directory haydn:/tmp/cvs-serv5552/cdd/share/cdd/unixgroups Modified Files: cdd-actions Log Message: Preparation for next release. Index: cdd-actions =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/share/cdd/unixgroups/cdd-actions,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cdd-actions 22 Jun 2004 20:55:15 -0000 1.13 +++ cdd-actions 26 Jun 2004 22:03:21 -0000 1.14 @@ -160,7 +160,7 @@ CDDROLES=`getCDDRoleList ${CDD}` ROLES="" for ROLE in ${CDDROLES}; do - for USER in `getUsersInRole ${CDD} ${ROLE}`; do + for USER in `getUsersInRole ${CDD} ${ROLE} 1`; do test "${USER}" == "${CDDUSER}" && \ ROLES="${ROLES} ${ROLE}" done From debian-custom@lists.debian.org Sat Jun 26 23:03:23 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:23 +0000 Subject: [Cdd-commits] cdd/common/cdd/share/cdd cdd-update-menus,1.6,1.7 Update of /cvsroot/cdd/cdd/common/cdd/share/cdd In directory haydn:/tmp/cvs-serv5552/cdd/share/cdd Modified Files: cdd-update-menus Log Message: Preparation for next release. Index: cdd-update-menus =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/share/cdd/cdd-update-menus,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cdd-update-menus 7 May 2004 16:01:33 -0000 1.6 +++ cdd-update-menus 26 Jun 2004 22:03:21 -0000 1.7 @@ -7,49 +7,13 @@ return ${RET} } +# 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 updateUser() { RET=0 SYSUSER=$1 -# SYSSCRIPT=$2 -# USERSCRIPT=$3 -# -# UHOME=`getUserHome ${SYSUSER}` -# if [ $# -ne 3 ]; then -# RET=64 # EX_USAGE -# elif [ ! -x "${SYSSCRIPT}" ]; then -# cddFail 66 "Fatal: ${SYSSCRIPT} doesn't exist" -# -# # and now real check for user's USERSCRIPT symlink presence -# else -# if [ ! -d "`dirname ${USERSCRIPT}`" ]; then -# # directory ~/.menu doesn't exist, create it and link the sys -# # script -# # returning -# echo "Creating `dirname ${USERSCRIPT}` and cdd-menu link inside" -# ${DRYRUN} mkdir "`dirname ${USERSCRIPT}`" -# ${DRYRUN} ln -fs "${SYSSCRIPT}" "${USERSCRIPT}" -# ${DRYRUN} chown -R ${CDDUSER}: "`dirname ${USERSCRIPT}`" -# -# elif [ -f "${USERSCRIPT}" -a ! -L "${USERSCRIPT}" ]; then -# # parent directory of ${USERSCRIPT} exists and has cdd-menu, but -# # it's not a link probably it's a script modified by user write a -# # warning and RET=0 -# -# # TODO PERFORM ANY ACTIONS? -# cddLog "Warning: ${USERSCRIPT} isn't a symlink, probably ${CDDUSER} modified it." -# cddLog "Warning: Check it. please." -# -# else -# # here we're sure that if the file exists, it's a symlink -# # returning -# -# cddLog "Updating cdd-menu script for user ${CDDUSER}" -# ${DRYRUN} rm -f "${USERSCRIPT}" -# ${DRYRUN} ln -fs "${SYSSCRIPT}" "${USERSCRIPT}" -# ${DRYRUN} chown ${CDDUSER}: "${USERSCRIPT}" -# fi -# fi return ${RET} } @@ -57,33 +21,6 @@ updateCDD() { RET=0 CDD=$1 -# SYSSCRIPT=$2 -# -# ROLES="`getCDDRoleList ${CDD}`" -# if [ $# -ne 2 ]; then -# RET=64 # EX_USAGE -# else -# cddLog "Updating menu script for all users in ${CDD} CDD:" -# for ROLE in ${ROLES}; do -# for CDDUSER in `getUsersInRole ${CDD} ${ROLE}`; do -# UHOME="`getUserHome ${CDDUSER}`" -# if [ ! -d "${UHOME}" ] ; then -# logFail 67 "Home directory for user ${CDDUSER} does not exist.\n... Sorry can not update menus." -# fi -# -# USERSCRIPT="${UHOME}/.menu/cdd-menu" -# updateUser "${CDDUSER}" "${SYSSCRIPT}" "${USERSCRIPT}" -# done -# done -# -# # The above commented code isn't bad, only complex for the actual -# # state of the CDD menu system: -# # Update user menu script for a specific CDD can be delegated entirely -# # to ${SYSSCRIPT} script. -# # The only needing is a correct cdd-menu script to be executed by -# # update-menus, let's easy up script! -# -# fi return ${RET} } From debian-custom@lists.debian.org Sat Jun 26 23:03:23 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:23 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates/po de.po,1.2,1.3 fr.po,1.2,1.3 templates.pot,1.2,1.3 Update of /cvsroot/cdd/cdd/common/cdd/templates/po In directory haydn:/tmp/cvs-serv5552/cdd/templates/po Modified Files: de.po fr.po templates.pot Log Message: Preparation for next release. Index: de.po =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/de.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- de.po 12 Jun 2004 19:15:48 -0000 1.2 +++ de.po 26 Jun 2004 22:03:21 -0000 1.3 @@ -11,12 +11,11 @@ # # Developers do not need to manually edit POT or PO files. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: #CDD#-common\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-06-11 20:06+0200\n" +"POT-Creation-Date: 2004-06-26 21:58+0200\n" "PO-Revision-Date: 2004-03-26 17:42+0100\n" "Last-Translator: Andreas Tille \n" "Language-Team: German \n" @@ -47,6 +46,12 @@ "die Nutzer auszuwählen, die ein #CDDNAME# Nutzermenü erhalten sollen." #. Type: select +#. Choices +#: ../common.templates:10 +msgid "now, end, never" +msgstr "now, end, never" + +#. Type: select #. Description #: ../common.templates:12 msgid "When do you like to build user menus?" @@ -57,7 +62,7 @@ #: ../common.templates:12 msgid "" "The meta packages of the #CDDNAME# Custom Debian Distribution do contain " -"extra role based menus for users. These will be builded if user who is " +"extra role based menus for users. These will be built if the user who is " "registered in a certain role calls update-menus. This can be done " "automatically for all users who are registered for #CDDNAME# after " "installation of each single meta package (=now), at the end of the whole " @@ -67,17 +72,19 @@ " * now: Call update-menus after each meta package (time consuming).\n" " * end: Call update-menus only once at the end of the whole\n" " installation/upgrading process.\n" -" * newver: Do not call update-menus at all." +" * never: Do not call update-menus at all." msgstr "" "Die Metapakete der Custom Debian Distribution #CDDNAME# enthalten Rollen " "basierte Nutzermenüs. Diese werden erzugt, wenn ein Nutzer, der für eine " "bestimmte Rolle registriert ist, das Programm update-menus aufruft. Das kann " -"automatisch für alle Nutzer, die für CDDNAME registriert sind nach der " -"Installation jedes einzelnen Metapaketes (=now), am Ende des Installationsprozesses " -"um Zeit bei der Installation mehrerer Metapackete zu sparen (=end) oder " -"update-menus soll durch jeden einzelnen Nutzer selbst aufgerufen werden " -"(=never).\n" -" * now: update-menus nach jeder Metapacketinstallation aufrufen (zeitintensiv).\n" -" * end: update-menus einmalig am Ende des Installations- oder Updateprozesses\n" +"automatisch für alle Nutzer, die für #CDDNAME# registriert sind nach der " +"Installation jedes einzelnen Metapaketes (=now), am Ende des " +"Installationsprozesses um Zeit bei der Installation mehrerer Metapackete zu " +"sparen (=end) oder update-menus soll durch jeden einzelnen Nutzer selbst " +"aufgerufen werden (=never).\n" +" * now: update-menus nach jeder Metapacketinstallation aufrufen " +"(zeitintensiv).\n" +" * end: update-menus einmalig am Ende des Installations- oder " +"Updateprozesses\n" " aufrufen.\n" -" * newver: update-menus nicht aufrufen." +" * never: update-menus nicht aufrufen." Index: fr.po =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/fr.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- fr.po 12 Jun 2004 19:15:48 -0000 1.2 +++ fr.po 26 Jun 2004 22:03:21 -0000 1.3 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: _CDD_-common\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-06-11 20:06+0200\n" +"POT-Creation-Date: 2004-06-26 21:58+0200\n" "PO-Revision-Date: 2004-02-28 01:00+0100\n" "Last-Translator: Eric Madesclair \n" "Language-Team: French \n" @@ -46,6 +46,12 @@ "menu #CDDNAME#." #. Type: select +#. Choices +#: ../common.templates:10 +msgid "now, end, never" +msgstr "" + +#. Type: select #. Description #: ../common.templates:12 msgid "When do you like to build user menus?" @@ -56,7 +62,7 @@ #: ../common.templates:12 msgid "" "The meta packages of the #CDDNAME# Custom Debian Distribution do contain " -"extra role based menus for users. These will be builded if user who is " +"extra role based menus for users. These will be built if the user who is " "registered in a certain role calls update-menus. This can be done " "automatically for all users who are registered for #CDDNAME# after " "installation of each single meta package (=now), at the end of the whole " @@ -66,5 +72,5 @@ " * now: Call update-menus after each meta package (time consuming).\n" " * end: Call update-menus only once at the end of the whole\n" " installation/upgrading process.\n" -" * newver: Do not call update-menus at all." +" * never: Do not call update-menus at all." msgstr "" Index: templates.pot =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/templates.pot,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- templates.pot 12 Jun 2004 19:15:48 -0000 1.2 +++ templates.pot 26 Jun 2004 22:03:21 -0000 1.3 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-06-11 20:06+0200\n" +"POT-Creation-Date: 2004-06-26 21:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,6 +45,12 @@ msgstr "" #. Type: select +#. Choices +#: ../common.templates:10 +msgid "now, end, never" +msgstr "" + +#. Type: select #. Description #: ../common.templates:12 msgid "When do you like to build user menus?" @@ -55,7 +61,7 @@ #: ../common.templates:12 msgid "" "The meta packages of the #CDDNAME# Custom Debian Distribution do contain " -"extra role based menus for users. These will be builded if user who is " +"extra role based menus for users. These will be built if the user who is " "registered in a certain role calls update-menus. This can be done " "automatically for all users who are registered for #CDDNAME# after " "installation of each single meta package (=now), at the end of the whole " @@ -65,5 +71,5 @@ " * now: Call update-menus after each meta package (time consuming).\n" " * end: Call update-menus only once at the end of the whole\n" " installation/upgrading process.\n" -" * newver: Do not call update-menus at all." +" * never: Do not call update-menus at all." msgstr "" From debian-custom@lists.debian.org Sat Jun 26 23:03:23 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:03:23 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates apt.conf,1.1,1.2 common.install,1.1,1.2 common.templates,1.2,1.3 postinst,1.12,1.13 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv5552/cdd/templates Modified Files: apt.conf common.install common.templates postinst Log Message: Preparation for next release. Index: common.templates =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.templates,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- common.templates 26 Jun 2004 07:07:54 -0000 1.2 +++ common.templates 26 Jun 2004 22:03:21 -0000 1.3 @@ -7,8 +7,8 @@ Template: shared/#CDD#-common/usermenus Type: select -Choices: now, end, never -Default: end +_Choices: now, end, never +Default: never _Description: When do you like to build user menus? The meta packages of the #CDDNAME# Custom Debian Distribution do contain extra role based menus for users. These will be built if Index: common.install =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.install,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- common.install 12 Jun 2004 19:19:25 -0000 1.1 +++ common.install 26 Jun 2004 22:03:21 -0000 1.2 @@ -1,2 +1,2 @@ -debian/med-apt.conf etc/apt/apt.conf.d/90#CDD#-common +debian/90#CDD#-common etc/apt/apt.conf.d Index: postinst =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- postinst 26 Jun 2004 07:07:54 -0000 1.12 +++ postinst 26 Jun 2004 22:03:21 -0000 1.13 @@ -17,7 +17,7 @@ db_get "shared/#CDD#-common/usermenus" || true case "$RET" in now) - /usr/sbin/cdd-update-usermenus + /usr/sbin/cdd-update-usermenus #CDD# ;; end) touch /var/run/#CDD#-common.usermenu Index: apt.conf =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/apt.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- apt.conf 12 Jun 2004 19:19:25 -0000 1.1 +++ apt.conf 26 Jun 2004 22:03:21 -0000 1.2 @@ -6,5 +6,5 @@ */ DPkg { - Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && /usr/sbin/cdd-update-usermenus ; rm -f /var/run/#CDD#-common.usermenu";}; + Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && /usr/sbin/cdd-update-usermenus #CDD# ; rm -f /var/run/#CDD#-common.usermenu";}; } From debian-custom@lists.debian.org Sat Jun 26 23:05:05 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sat, 26 Jun 2004 22:05:05 +0000 Subject: [Cdd-commits] cdd/med/debian-med/debian rules,1.4,1.5 Update of /cvsroot/cdd/cdd/med/debian-med/debian In directory haydn:/tmp/cvs-serv9036/debian-med/debian Modified Files: rules Log Message: Preparation for release. Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/med/debian-med/debian/rules,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- rules 23 Jun 2004 11:00:23 -0000 1.4 +++ rules 26 Jun 2004 22:05:02 -0000 1.5 @@ -30,7 +30,7 @@ rm -rf tmp rm -f tasks/*~ [ -d menu ] && rm -f debian/$(cdd)-*.post{inst,rm} - rm -f debian/$(cdd)-common.{templates,config,install} debian/$(cdd)-apt.conf + rm -f debian/$(cdd)-common.{templates,config,install} debian/90$(cdd)-common rm -rf debian/po if [ -f debian/control ] ; then dh_clean ; fi @@ -53,7 +53,6 @@ dh_testdir dh_testroot dh_installdocs - dh_install dh_installexamples dh_installmenu # dh_installlogrotate @@ -64,6 +63,7 @@ dh_installcron dh_installman cdd-install-helper + dh_install dh_installdebconf # dh_installinfo dh_installchangelogs From debian-custom@lists.debian.org Sun Jun 27 13:27:42 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Sun, 27 Jun 2004 12:27:42 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates apt.conf,1.2,1.3 postinst,1.13,1.14 postrm,1.7,1.8 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv7599/cdd/templates Modified Files: apt.conf postinst postrm Log Message: Fixed behaviour on removal of meta packages. Index: postrm =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postrm,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- postrm 26 Jun 2004 07:07:54 -0000 1.7 +++ postrm 27 Jun 2004 12:27:39 -0000 1.8 @@ -1,18 +1,38 @@ #!/bin/bash -e -## Echoing breaks debconf! -## echo "Removing package #PKG#." test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD# -source /etc/cdd/cdd.conf -if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then source /etc/cdd/#CDD#/#CDD#.conf ; fi -if [ "${UPDATEUSERMENU}" = "yes" ] ; then - for ROLE in `getCDDRoleList #CDD#`; do - for CDDUSER in `getUsersInRole #CDD# ${ROLE}`; do - echo "Adding menu for user ${CDDUSER} of #CDD# ..." - su ${CDDUSER} -c "update-menus" - done - done +test -s /etc/cdd/cdd.conf && . /etc/cdd/cdd.conf +test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf + + +if [ -x /usr/sbin/cdd-update-usermenus ] ; then + . /usr/share/debconf/confmodule + db_version 2.0 + + . /etc/cdd/cdd.conf + if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi + + case "$1" in + abort-install|abort-upgrade|failed-upgrade) + ;; + remove|purge) + db_get "shared/#CDD#-common/usermenus" || true + case "$RET" in + now) + /usr/sbin/cdd-update-usermenus #CDD# + ;; + end) + touch /var/run/#CDD#-common.usermenu + ;; + esac + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + esac fi + #DEBHELPER# Index: postinst =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- postinst 26 Jun 2004 22:03:21 -0000 1.13 +++ postinst 27 Jun 2004 12:27:39 -0000 1.14 @@ -1,7 +1,5 @@ #!/bin/bash -e -## Echoing breaks debconf! -## echo "Installing package #PKG#." test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD# . /usr/share/debconf/confmodule Index: apt.conf =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/apt.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- apt.conf 26 Jun 2004 22:03:21 -0000 1.2 +++ apt.conf 27 Jun 2004 12:27:39 -0000 1.3 @@ -6,5 +6,5 @@ */ DPkg { - Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && /usr/sbin/cdd-update-usermenus #CDD# ; rm -f /var/run/#CDD#-common.usermenu";}; + Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && if [ -x /usr/sbin/cdd-update-usermenus ] ; then /usr/sbin/cdd-update-usermenus #CDD# ; fi ; rm -f /var/run/#CDD#-common.usermenu";}; } From debian-custom@lists.debian.org Mon Jun 28 21:15:43 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Mon, 28 Jun 2004 20:15:43 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates common.templates,1.3,1.4 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv32032/cdd/templates Modified Files: common.templates Log Message: Enhanced debconf description and translation. Index: common.templates =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.templates,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- common.templates 26 Jun 2004 22:03:21 -0000 1.3 +++ common.templates 28 Jun 2004 20:15:40 -0000 1.4 @@ -1,24 +1,25 @@ Template: #CDD#-common/group Type: multiselect -_Choices: ${users} -_Description: Please specify the #CDDNAME# users! - Here is a list of all normal users of the system. Now you can select - those users who should get a #CDDNAME# user menu. +Choices: ${users} +_Description: #CDDNAME# users: + Please select, among the whole system user list, users who should get + a #CDDNAME# user menu. Template: shared/#CDD#-common/usermenus Type: select -_Choices: now, end, never +_Choices: Each package installation, End of installation, Never Default: never -_Description: When do you like to build user menus? - The meta packages of the #CDDNAME# Custom Debian Distribution do - contain extra role based menus for users. These will be built if - the user who is registered in a certain role calls update-menus. This - can be done automatically for all users who are registered for - #CDDNAME# after installation of each single meta package (=now), +_Description: Build user menus at: + The meta packages of the #CDDNAME# Custom Debian Distribution + 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 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 (=end) or the call of - update-menus should be done by the users themselves (=never). - * now: Call update-menus after each meta package (time consuming). - * end: Call update-menus only once at the end of the whole - installation/upgrading process. - * never: Do not call update-menus at all. + of installing more than one meta package or just leave the call of + "update-menus" to the users themselves. + * Each package installation : Call "update-menus" after each meta package + (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. From debian-custom@lists.debian.org Mon Jun 28 21:15:43 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Mon, 28 Jun 2004 20:15:43 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates/po de.po,1.3,1.4 fr.po,1.3,1.4 templates.pot,1.3,1.4 Update of /cvsroot/cdd/cdd/common/cdd/templates/po In directory haydn:/tmp/cvs-serv32032/cdd/templates/po Modified Files: de.po fr.po templates.pot Log Message: Enhanced debconf description and translation. Index: de.po =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/de.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- de.po 26 Jun 2004 22:03:21 -0000 1.3 +++ de.po 28 Jun 2004 20:15:41 -0000 1.4 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: #CDD#-common\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-06-26 21:58+0200\n" +"POT-Creation-Date: 2004-06-28 15:58+0200\n" "PO-Revision-Date: 2004-03-26 17:42+0100\n" "Last-Translator: Andreas Tille \n" "Language-Team: German \n" @@ -24,67 +24,64 @@ "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect -#. Choices -#: ../common.templates:3 -msgid "${users}" -msgstr "${users}" - -#. Type: multiselect #. Description #: ../common.templates:4 -msgid "Please specify the #CDDNAME# users!" -msgstr "Bitte #CDDNAME# Nutzer auswählen!" +msgid "#CDDNAME# users:" +msgstr "#CDDNAME# Nutzer:" #. Type: multiselect #. Description #: ../common.templates:4 msgid "" -"Here is a list of all normal users of the system. Now you can select those " -"users who should get a #CDDNAME# user menu." +"Please select, among the whole system user list, users who should get a " +"#CDDNAME# user menu." msgstr "" -"Hier ist eine Liste aller normalen Nutzer des Systems. Es ist nun möglich " -"die Nutzer auszuwählen, die ein #CDDNAME# Nutzermenü erhalten sollen." +"Bitte wählen Sie aus der Liste aller Nutzer des Systems diejenigen aus, die " +"ein #CDDNAME# Nutzermenü erhalten sollen." #. Type: select #. Choices #: ../common.templates:10 -msgid "now, end, never" -msgstr "now, end, never" +msgid "Each package installation, End of installation, Never" +msgstr "Installation jedes Paketes, Ende der Installation, Nie" #. Type: select #. Description #: ../common.templates:12 -msgid "When do you like to build user menus?" -msgstr "Wann sollen die Nutzer-spezifischen Menüs erzeugt werden?" +msgid "Build user menus at:" +msgstr "Erzeugen der Nutzermenüs bei:" #. Type: select #. Description #: ../common.templates:12 msgid "" -"The meta packages of the #CDDNAME# Custom Debian Distribution do contain " -"extra role based menus for users. These will be built if the user who is " -"registered in a certain role calls update-menus. This can be done " -"automatically for all users who are registered for #CDDNAME# after " -"installation of each single meta package (=now), at the end of the whole " +"The meta packages of the #CDDNAME# Custom Debian Distribution 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 " +"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 (=end) or the call of update-menus should be done by the users " -"themselves (=never).\n" -" * now: Call update-menus after each meta package (time consuming).\n" -" * end: Call update-menus only once at the end of the whole\n" -" installation/upgrading process.\n" -" * never: Do not call update-menus at all." +"package or just leave the call of \"update-menus\" to the users themselves.\n" +" * Each package installation : Call \"update-menus\" after each meta " +"package\n" +" (time consuming);\n" +" * End of installation : Call \"update-menus\" only once at the end " +"of\n" +" the whole installation/upgrading process;\n" +" * Never : Do not call \"update-menus\" at all." msgstr "" "Die Metapakete der Custom Debian Distribution #CDDNAME# enthalten Rollen " "basierte Nutzermenüs. Diese werden erzugt, wenn ein Nutzer, der für eine " -"bestimmte Rolle registriert ist, das Programm update-menus aufruft. Das kann " -"automatisch für alle Nutzer, die für #CDDNAME# registriert sind nach der " -"Installation jedes einzelnen Metapaketes (=now), am Ende des " +"bestimmte Rolle registriert ist, das Programm \"update-menus\" aufruft. Das " +"kann automatisch für alle Nutzer, die für #CDDNAME# registriert sind nach " +"der Installation jedes einzelnen Metapaketes, am Ende des " "Installationsprozesses um Zeit bei der Installation mehrerer Metapackete zu " -"sparen (=end) oder update-menus soll durch jeden einzelnen Nutzer selbst " -"aufgerufen werden (=never).\n" -" * now: update-menus nach jeder Metapacketinstallation aufrufen " +"sparen oder \"update-menus\" soll durch jeden einzelnen Nutzer selbst " +"aufgerufen werden.\n" +" * Installation jedes Paketes : \"update-menus\" nach jeder\n" +" Metapacketinstallation aufrufen " "(zeitintensiv).\n" -" * end: update-menus einmalig am Ende des Installations- oder " -"Updateprozesses\n" -" aufrufen.\n" -" * never: update-menus nicht aufrufen." +" * Ende der Installation : \"update-menus\" einmalig am Ende des\n" +" Installations- oder Updateprozesses " +"aufrufen.\n" +" * Nie : \"update-menus\" nicht aufrufen." Index: fr.po =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/fr.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- fr.po 26 Jun 2004 22:03:21 -0000 1.3 +++ fr.po 28 Jun 2004 20:15:41 -0000 1.4 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: _CDD_-common\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-06-26 21:58+0200\n" +"POT-Creation-Date: 2004-06-28 15:58+0200\n" "PO-Revision-Date: 2004-02-28 01:00+0100\n" "Last-Translator: Eric Madesclair \n" "Language-Team: French \n" @@ -24,23 +24,18 @@ "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect -#. Choices -#: ../common.templates:3 -msgid "${users}" -msgstr "${users}" - -#. Type: multiselect #. Description #: ../common.templates:4 -msgid "Please specify the #CDDNAME# users!" -msgstr "Utilisateurs de #CDDNAME# :" +msgid "#CDDNAME# users:" +msgstr "" #. Type: multiselect #. Description #: ../common.templates:4 +#, fuzzy msgid "" -"Here is a list of all normal users of the system. Now you can select those " -"users who should get a #CDDNAME# user menu." +"Please select, among the whole system user list, users who should get a " +"#CDDNAME# user menu." msgstr "" "Veuillez choisir parmi tous les utilisateurs du système ceux qui auront un " "menu #CDDNAME#." @@ -48,29 +43,31 @@ #. Type: select #. Choices #: ../common.templates:10 -msgid "now, end, never" +msgid "Each package installation, End of installation, Never" msgstr "" #. Type: select #. Description #: ../common.templates:12 -msgid "When do you like to build user menus?" +msgid "Build user menus at:" msgstr "" #. Type: select #. Description #: ../common.templates:12 msgid "" -"The meta packages of the #CDDNAME# Custom Debian Distribution do contain " -"extra role based menus for users. These will be built if the user who is " -"registered in a certain role calls update-menus. This can be done " -"automatically for all users who are registered for #CDDNAME# after " -"installation of each single meta package (=now), at the end of the whole " +"The meta packages of the #CDDNAME# Custom Debian Distribution 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 " +"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 (=end) or the call of update-menus should be done by the users " -"themselves (=never).\n" -" * now: Call update-menus after each meta package (time consuming).\n" -" * end: Call update-menus only once at the end of the whole\n" -" installation/upgrading process.\n" -" * never: Do not call update-menus at all." +"package or just leave the call of \"update-menus\" to the users themselves.\n" +" * Each package installation : Call \"update-menus\" after each meta " +"package\n" +" (time consuming);\n" +" * End of installation : Call \"update-menus\" only once at the end " +"of\n" +" the whole installation/upgrading process;\n" +" * Never : Do not call \"update-menus\" at all." msgstr "" Index: templates.pot =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/templates.pot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- templates.pot 26 Jun 2004 22:03:21 -0000 1.3 +++ templates.pot 28 Jun 2004 20:15:41 -0000 1.4 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-06-26 21:58+0200\n" +"POT-Creation-Date: 2004-06-28 15:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,51 +25,47 @@ "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect -#. Choices -#: ../common.templates:3 -msgid "${users}" -msgstr "" - -#. Type: multiselect #. Description #: ../common.templates:4 -msgid "Please specify the #CDDNAME# users!" +msgid "#CDDNAME# users:" msgstr "" #. Type: multiselect #. Description #: ../common.templates:4 msgid "" -"Here is a list of all normal users of the system. Now you can select those " -"users who should get a #CDDNAME# user menu." +"Please select, among the whole system user list, users who should get a " +"#CDDNAME# user menu." msgstr "" #. Type: select #. Choices #: ../common.templates:10 -msgid "now, end, never" +msgid "Each package installation, End of installation, Never" msgstr "" #. Type: select #. Description #: ../common.templates:12 -msgid "When do you like to build user menus?" +msgid "Build user menus at:" msgstr "" #. Type: select #. Description #: ../common.templates:12 msgid "" -"The meta packages of the #CDDNAME# Custom Debian Distribution do contain " -"extra role based menus for users. These will be built if the user who is " -"registered in a certain role calls update-menus. This can be done " -"automatically for all users who are registered for #CDDNAME# after " -"installation of each single meta package (=now), at the end of the whole " +"The meta packages of the #CDDNAME# Custom Debian Distribution 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 " +"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 (=end) or the call of update-menus should be done by the users " -"themselves (=never).\n" -" * now: Call update-menus after each meta package (time consuming).\n" -" * end: Call update-menus only once at the end of the whole\n" -" installation/upgrading process.\n" -" * never: Do not call update-menus at all." +"package or just leave the call of \"update-menus\" to the users themselves.\n" +" * Each package installation : Call \"update-menus\" after each meta " +"package\n" +" (time consuming);\n" +" * End of installation : Call \"update-menus\" only once at the end " +"of\n" +" the whole installation/upgrading process;\n" +" * Never : Do not call \"update-menus\" at all." msgstr "" From debian-custom@lists.debian.org Tue Jun 29 08:16:25 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 07:16:25 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates/po fr.po,1.4,1.5 Update of /cvsroot/cdd/cdd/common/cdd/templates/po In directory haydn:/tmp/cvs-serv26579 Modified Files: fr.po Log Message: French Translation, thanks to Christian Perrier Index: fr.po =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/fr.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- fr.po 28 Jun 2004 20:15:41 -0000 1.4 +++ fr.po 29 Jun 2004 07:16:22 -0000 1.5 @@ -1,3 +1,4 @@ +# translation of fr.po to French # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -10,29 +11,31 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # # Developers do not need to manually edit POT or PO files. +# Christian Perrier , 2004. # msgid "" msgstr "" "Project-Id-Version: _CDD_-common\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-06-28 15:58+0200\n" -"PO-Revision-Date: 2004-02-28 01:00+0100\n" +"PO-Revision-Date: 2004-06-29 08:04+0200\n" "Last-Translator: Eric Madesclair \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #. Type: multiselect #. Description #: ../common.templates:4 msgid "#CDDNAME# users:" -msgstr "" +msgstr "Utilisateurs de #CDDNAME# :" #. Type: multiselect #. Description #: ../common.templates:4 -#, fuzzy msgid "" "Please select, among the whole system user list, users who should get a " "#CDDNAME# user menu." @@ -44,13 +47,13 @@ #. Choices #: ../common.templates:10 msgid "Each package installation, End of installation, Never" -msgstr "" +msgstr "À chaque installation de paquet, À la fin de l'installation, Jamais" #. Type: select #. Description #: ../common.templates:12 msgid "Build user menus at:" -msgstr "" +msgstr "Construction des menus des utilisateurs :" #. Type: select #. Description @@ -71,3 +74,19 @@ " 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 " +"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 " +"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" +" - À chaque installation de paquet : lancer « update-menus » après\n" +" l'installation de chaque méta-paquet\n" +" (cette opération peut être longue) ;\n" +" - À la fin de l'installation  : lancer « update-menus » seulement\n" +" à la fin de la procédure\n" +" d'installation ou de mise à jour ;\n" +" - Jamais  : ne pas du tout lancer « update-menus »." From debian-custom@lists.debian.org Tue Jun 29 08:28:34 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 07:28:34 +0000 Subject: [Cdd-commits] cdd/doc/common/en 02_about.sgml,1.10,1.11 03_general_ideas.sgml,1.14,1.15 04_existing_cdds.sgml,1.3,1.4 06_technology.sgml,1.2,1.3 Update of /cvsroot/cdd/cdd/doc/common/en In directory haydn:/tmp/cvs-serv1964/en Modified Files: 02_about.sgml 03_general_ideas.sgml 04_existing_cdds.sgml 06_technology.sgml Log Message: COrrections proposed by Holger Levsen Index: 02_about.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/02_about.sgml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- 02_about.sgml 4 Jun 2004 12:08:02 -0000 1.10 +++ 02_about.sgml 29 Jun 2004 07:28:31 -0000 1.11 @@ -32,7 +32,8 @@ Distributors are those companies that are building these collections of software around the GNU/Linux operating system. Because it is Free Software, the user who buys a distribution pays for - the service which the distributor is providing. These services are: + the service which the distributor is providing. These services might + be: Preparing a useful collection of software around GNU/Linux. Caring for smooth installation which the target user is able to @@ -141,8 +142,9 @@ trust" id="http://people.debian.org/~edward/globe/earthkeyring/"> which is woven by signing GPG keys. One requirement to become a member of the Debian project is to have a GPG key signed by a Debian -developer. Every time one Debian developer meets another developer, -they sign each other's keys. In this way the web of trust is woven. +developer. Every time one Debian developer meets an other developer +for the first time they sign each other's keys. In this way the web +of trust is woven.

@@ -169,9 +171,10 @@ Download Debian from the web for free. + The latter is the common way, and there are really great tools + to do it this way. For sure it is always possible to copy Debian + from a friend. - The latter is the common way, and there are really great tools - to do it this way.

Index: 03_general_ideas.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/03_general_ideas.sgml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- 03_general_ideas.sgml 30 May 2004 22:37:15 -0000 1.14 +++ 03_general_ideas.sgml 29 Jun 2004 07:28:31 -0000 1.15 @@ -61,7 +61,9 @@ of a certain profession, (e.g. a doctor or lawyer,) a person who has not (yet) gathered a certain amount of computer knowledge, (e.g. a child,) or a person with disabilities (e.g. -a visually or hearing impaired person.) +a visually or hearing impaired person.) Moreover the customisation +might deal with peculiarities of certain regions were users have needs +which differ from default Debian.

It is not unusual for these target users to be less technically @@ -89,10 +91,10 @@ interaction, and any such interaction has to be internationalised.

-Furthermore, the target user has no interest in administration of his -computer. In short, the optimal situation would be that he would not -even notice the existence of the computer, but just focus on using the -application to accomplish the task at hand. +Furthermore, most target users have no or little interest in +administration of their computer. In short, the optimal situation +would be that he would not even notice the existence of the computer, +but just focus on using the application to accomplish the task at hand.

Common to all groups of target users is their interest in a defined @@ -168,6 +170,16 @@ this kind of Free Software - they just need it for their own. So you normally find a fast, growing community around Free Software packages which have a wide use. This is different for specialised software. +

+

+In this context the term "specialised software" summarises such kind +of software which is needed by some experts for their job. This might +be a practice management system which is used by doctors, a graphical +information system (GIS) which is used by geographers, a screen reader +which helps blind people to work with the computer etc. The +difference to widely used software like office suites is that the user +base is reduced to very view people. This is also true for certain +software which supports special localisation issues. Specialist software is used only by a limited set of users (i.e. the @@ -239,7 +251,7 @@ Sometimes the tools or back-ends used in Free Software are not appropriate for such applications. For instance, sometimes database servers which do not use transactions are used to store -patent data, which is completely unacceptable. Other programs use web +medical records, which is completely unacceptable. Other programs use web clients as their front-end, which is not really good for quick (mouse-less) usage, a great shortcoming for repetitive tasks. Index: 06_technology.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/06_technology.sgml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- 06_technology.sgml 30 May 2004 22:37:16 -0000 1.2 +++ 06_technology.sgml 29 Jun 2004 07:28:31 -0000 1.3 @@ -730,7 +730,7 @@ the tools described below.

- + cdd-gen-control(1)

Index: 04_existing_cdds.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/04_existing_cdds.sgml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- 04_existing_cdds.sgml 7 Jun 2004 05:25:51 -0000 1.3 +++ 04_existing_cdds.sgml 29 Jun 2004 07:28:31 -0000 1.4 @@ -88,7 +88,8 @@

Start - Summer of 2002 + Summer of 2002, since 2003 merged with SkoleLinux which is now + synonym with Debian-Edu URL From debian-custom@lists.debian.org Tue Jun 29 15:49:19 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 14:49:19 +0000 Subject: [Cdd-commits] cdd/med/debian-med/docs/cms - New directory Update of /cvsroot/cdd/cdd/med/debian-med/docs/cms In directory haydn:/tmp/cvs-serv21011/cms Log Message: Directory /cvsroot/cdd/cdd/med/debian-med/docs/cms added to the repository From debian-custom@lists.debian.org Tue Jun 29 15:50:10 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 14:50:10 +0000 Subject: [Cdd-commits] cdd/med/debian-med/docs/cms zope-zms.txt,NONE,1.1 Update of /cvsroot/cdd/cdd/med/debian-med/docs/cms In directory haydn:/tmp/cvs-serv21036/docs/cms Added Files: zope-zms.txt Log Message: Added description vor med-cms --- NEW FILE: zope-zms.txt --- zope-zms: Content management for science, technology and medicine Some information about Zope ZMS from the Debian-Med project. ZMS (Zope based Content Management for Science, Technology and Medicine) is a ready to use solution for efficient electronic publishing. An easy to handle graphical user interface for editors and flexible modelling features (multiple languages, Metadata, content objects, XML import/export, workflow etc.) allow an optimum of productivity: A basic configuration to start with can be created with a few mouse clicks. ZMS is perfectly suitable for hospitals, research institutions, NGOs and small to medium-size international companies. The ZMS concept is based on a consulting approach for the rational publishing on the internet: the professional user is able to pursue a consequently efficiency oriented producing base with the ZMS software and can hereby also achieve important economic results in the so-called low budget area. The modulation possibilities of the ZMS components and the experienced producing steps makes out of ZMS an incomparable fast tool. Homepage: http://www.zms-publishing.com/ Read /usr/share/doc/zope-zms/README.Debian for the first steps. From debian-custom@lists.debian.org Tue Jun 29 16:16:12 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 15:16:12 +0000 Subject: [Cdd-commits] cdd/common/cdd cdd-gen-control,1.2,1.3 Update of /cvsroot/cdd/cdd/common/cdd In directory haydn:/tmp/cvs-serv23020 Modified Files: cdd-gen-control Log Message: * Add support to Pre-Depends field in cdd-gen-control script. Index: cdd-gen-control =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/cdd-gen-control,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cdd-gen-control 15 Apr 2004 21:53:37 -0000 1.2 +++ cdd-gen-control 29 Jun 2004 15:16:09 -0000 1.3 @@ -94,7 +94,7 @@ if (defined $taskinfo{$task}{$header}); } - for $header (qw(Depends Suggests Recommends)) { + for $header (qw(Pre-Depends Depends Suggests Recommends)) { print "$header: ", join(", ", sort @{$taskinfo{$task}{$header}}),"\n" if (defined $taskinfo{$task}{$header}); } @@ -261,7 +261,7 @@ next unless defined $_; my $header; - for $header (qw(Depends Suggests Recommends)) { + for $header (qw(Pre-Depends Depends Suggests Recommends)) { if (m/^$header:\s+(.+)$/ && $1 !~ /^\s*$/) { $taskinfo{$curpkg}{$header} = () if (! exists $taskinfo{$curpkg}{$header}); From debian-custom@lists.debian.org Tue Jun 29 16:16:12 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 15:16:12 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.10,1.11 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv23020/debian Modified Files: changelog Log Message: * Add support to Pre-Depends field in cdd-gen-control script. Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- changelog 23 Jun 2004 10:48:19 -0000 1.10 +++ changelog 29 Jun 2004 15:16:10 -0000 1.11 @@ -1,5 +1,6 @@ cdd (0.3.2) unstable; urgency=low + * NOT RELEASED YET. * Remove ${HOME}/.menu/cdd-menu in postinst only if ${MENU}/.menu exists * Added /etc/apt/apt.conf.d script to #cdd#-common templates to invoke cdd-update-usermenus after all meta packages of a CDD were installed @@ -10,6 +11,8 @@ * Usage of get-group-users deprecated, use cdd-tools instead. Moved functionality of get-group-users to unixgroups/cdd-actions. * Enhanced example directory. + * Otavio Salvador + - Add support to Pre-Depends field in cdd-gen-control script. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Tue Jun 29 17:32:18 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 16:32:18 +0000 Subject: [Cdd-commits] cdd/common/cdd cdd-gen-control,1.3,1.4 Update of /cvsroot/cdd/cdd/common/cdd In directory haydn:/tmp/cvs-serv24893 Modified Files: cdd-gen-control Log Message: * Change the default task prefix from 'education-' to 'test-'. Index: cdd-gen-control =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/cdd-gen-control,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cdd-gen-control 29 Jun 2004 15:16:09 -0000 1.3 +++ cdd-gen-control 29 Jun 2004 16:32:16 -0000 1.4 @@ -136,7 +136,7 @@ # sub load_tasks { my $taskfile; - my $prefix = "education-" ; + my $prefix = "test-" ; unless ( -d "debian" ) { system ( "mkdir debian" ) ; @@ -145,7 +145,7 @@ unless ( open(CTRL, ">debian/control" ) ) { die "Unable to open debian/control\n" ; } select CTRL; unless ( open(STUB, "debian/control.stub" ) ) { - print STDERR "No template debian/control.stub. Use education prefix.\n" ; + print STDERR "No template debian/control.stub. Use test prefix.\n" ; } else { while ( ) { if ( /^Package: (.+)$/) { From debian-custom@lists.debian.org Tue Jun 29 17:32:18 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 16:32:18 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.11,1.12 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv24893/debian Modified Files: changelog Log Message: * Change the default task prefix from 'education-' to 'test-'. Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- changelog 29 Jun 2004 15:16:10 -0000 1.11 +++ changelog 29 Jun 2004 16:32:16 -0000 1.12 @@ -13,6 +13,7 @@ * Enhanced example directory. * Otavio Salvador - Add support to Pre-Depends field in cdd-gen-control script. + - Change the default task prefix from 'education-' to 'test-'. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Tue Jun 29 17:55:48 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 16:55:48 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.12,1.13 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv10792/debian Modified Files: changelog Log Message: * Include code to stop if exist a task with name 'common'. Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- changelog 29 Jun 2004 16:32:16 -0000 1.12 +++ changelog 29 Jun 2004 16:55:46 -0000 1.13 @@ -14,6 +14,7 @@ * Otavio Salvador - Add support to Pre-Depends field in cdd-gen-control script. - Change the default task prefix from 'education-' to 'test-'. + - Include code to stop if exist a task with name 'common'. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Tue Jun 29 17:55:48 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 16:55:48 +0000 Subject: [Cdd-commits] cdd/common/cdd cdd-gen-control,1.4,1.5 Update of /cvsroot/cdd/cdd/common/cdd In directory haydn:/tmp/cvs-serv10792 Modified Files: cdd-gen-control Log Message: * Include code to stop if exist a task with name 'common'. Index: cdd-gen-control =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/cdd-gen-control,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cdd-gen-control 29 Jun 2004 16:32:16 -0000 1.4 +++ cdd-gen-control 29 Jun 2004 16:55:46 -0000 1.5 @@ -167,6 +167,7 @@ # First document their existence, so they can depend on each other. for $taskfile () { next if ("tasks/CVS" eq $taskfile); + if ("tasks/common" eq $taskfile) { die "You cannot use 'common' as task name"; } next if ($taskfile =~ m/~$/); my $curpkg = $taskfile; From debian-custom@lists.debian.org Tue Jun 29 17:59:26 2004 From: debian-custom@lists.debian.org (Otavio Salvador) Date: Tue, 29 Jun 2004 16:59:26 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.13,1.14 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv10860/debian Modified Files: changelog Log Message: Changed the distribution name to UNRELEASED to fallowing what was discussed in the mailing list. Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- changelog 29 Jun 2004 16:55:46 -0000 1.13 +++ changelog 29 Jun 2004 16:59:24 -0000 1.14 @@ -1,6 +1,5 @@ -cdd (0.3.2) unstable; urgency=low +cdd (0.3.2) UNRELEASED; urgency=low - * NOT RELEASED YET. * Remove ${HOME}/.menu/cdd-menu in postinst only if ${MENU}/.menu exists * Added /etc/apt/apt.conf.d script to #cdd#-common templates to invoke cdd-update-usermenus after all meta packages of a CDD were installed From debian-custom@lists.debian.org Tue Jun 29 21:02:13 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 20:02:13 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates/po de.po,1.4,1.5 Update of /cvsroot/cdd/cdd/common/cdd/templates/po In directory haydn:/tmp/cvs-serv27548/cdd/templates/po Modified Files: de.po Log Message: Menu in cdd-install-helper, Fixed translation in de.de, fixes in post{inst,rm} Index: de.po =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/po/de.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- de.po 28 Jun 2004 20:15:41 -0000 1.4 +++ de.po 29 Jun 2004 20:02:11 -0000 1.5 @@ -43,7 +43,7 @@ #. Choices #: ../common.templates:10 msgid "Each package installation, End of installation, Never" -msgstr "Installation jedes Paketes, Ende der Installation, Nie" +msgstr "Paketinstallation, Installationsende, Nie" #. Type: select #. Description @@ -71,17 +71,14 @@ " * Never : Do not call \"update-menus\" at all." msgstr "" "Die Metapakete der Custom Debian Distribution #CDDNAME# enthalten Rollen " -"basierte Nutzermenüs. Diese werden erzugt, wenn ein Nutzer, der für eine " +"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 Nutzer, die für #CDDNAME# registriert sind nach " -"der Installation jedes einzelnen Metapaketes, am Ende des " -"Installationsprozesses um Zeit bei der Installation mehrerer Metapackete zu " -"sparen oder \"update-menus\" soll durch jeden einzelnen Nutzer selbst " -"aufgerufen werden.\n" -" * Installation jedes Paketes : \"update-menus\" nach jeder\n" -" Metapacketinstallation aufrufen " -"(zeitintensiv).\n" -" * Ende der Installation : \"update-menus\" einmalig am Ende des\n" -" Installations- oder Updateprozesses " -"aufrufen.\n" -" * Nie : \"update-menus\" nicht aufrufen." +"kann automatisch für alle für #CDDNAME# 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" +" * Paketinstallation : \"update-menus\" nach jeder Metapaketinstallation\n" +" aufrufen (zeitintensiv).\n" +" * Installationsende : \"update-menus\" einmalig am Ende des\n" +" Installations- oder Updateprozesses aufrufen.\n" +" * Nie : \"update-menus\" nicht aufrufen.\n" From debian-custom@lists.debian.org Tue Jun 29 21:02:13 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 20:02:13 +0000 Subject: [Cdd-commits] cdd/common/cdd/examples/debian rules,1.4,1.5 Update of /cvsroot/cdd/cdd/common/cdd/examples/debian In directory haydn:/tmp/cvs-serv27548/cdd/examples/debian Modified Files: rules Log Message: Menu in cdd-install-helper, Fixed translation in de.de, fixes in post{inst,rm} Index: rules =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/examples/debian/rules,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- rules 26 Jun 2004 22:03:20 -0000 1.4 +++ rules 29 Jun 2004 20:02:11 -0000 1.5 @@ -17,6 +17,15 @@ build: control-stamp build-stamp build-stamp: + # Fix *.dsc file to mention all binary targets + TASKS="" ; \ + if [ -d common ] ; then TASKS="$(cdd)-common" ; fi ; \ + for task in `ls -1 tasks | sort` ; do \ + if [ "$${TASKS}" != "" ] ; then TASKS="$${TASKS}, " ; fi ; \ + TASKS="$${TASKS}$(cdd)-$${task}" ; \ + done ; \ + sed "s/^\(Binary: \)$(cdd)/\1$${TASKS}/" ../$(pkgsrc)_*.dsc > tmp.dsc ; \ + mv tmp.dsc ../$(pkgsrc)_*.dsc dh_testdir touch build-stamp From debian-custom@lists.debian.org Tue Jun 29 21:02:13 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 20:02:13 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates postinst,1.14,1.15 postrm,1.8,1.9 Update of /cvsroot/cdd/cdd/common/cdd/templates In directory haydn:/tmp/cvs-serv27548/cdd/templates Modified Files: postinst postrm Log Message: Menu in cdd-install-helper, Fixed translation in de.de, fixes in post{inst,rm} Index: postrm =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postrm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- postrm 27 Jun 2004 12:27:39 -0000 1.8 +++ postrm 29 Jun 2004 20:02:11 -0000 1.9 @@ -14,21 +14,21 @@ if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi case "$1" in - abort-install|abort-upgrade|failed-upgrade) + abort-install|abort-upgrade|failed-upgrade|upgrade) ;; remove|purge) db_get "shared/#CDD#-common/usermenus" || true case "$RET" in - now) + "Each package installation") /usr/sbin/cdd-update-usermenus #CDD# ;; - end) + "End of installation") touch /var/run/#CDD#-common.usermenu ;; esac ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac Index: postinst =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- postinst 27 Jun 2004 12:27:39 -0000 1.14 +++ postinst 29 Jun 2004 20:02:11 -0000 1.15 @@ -14,10 +14,10 @@ configure) db_get "shared/#CDD#-common/usermenus" || true case "$RET" in - now) + "Each package installation") /usr/sbin/cdd-update-usermenus #CDD# ;; - end) + "End of installation") touch /var/run/#CDD#-common.usermenu ;; esac From debian-custom@lists.debian.org Tue Jun 29 21:02:13 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Tue, 29 Jun 2004 20:02:13 +0000 Subject: [Cdd-commits] cdd/common/cdd cdd-install-helper,1.7,1.8 Update of /cvsroot/cdd/cdd/common/cdd In directory haydn:/tmp/cvs-serv27548/cdd Modified Files: cdd-install-helper Log Message: Menu in cdd-install-helper, Fixed translation in de.de, fixes in post{inst,rm} Index: cdd-install-helper =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/cdd-install-helper,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- cdd-install-helper 26 Jun 2004 22:03:18 -0000 1.7 +++ cdd-install-helper 29 Jun 2004 20:02:10 -0000 1.8 @@ -13,11 +13,13 @@ # if there is no directory named menu ignore the menu stuff if [ -d menu ] ; then # copy user menu file - for pkg in `ls menu` ; do + for pkg in `ls menu docs | grep -v "^[a-z]*:$*" | grep -v "^$" | sort | uniq` ; do if [ -d debian/"$cdd"-"$pkg" ] ; then mkdir -p debian/"$cdd"-"$pkg"/"$menudir" fi - cp -a menu/"$pkg" debian/"$cdd"-"$pkg"/"$menudir"/"$cdd"-"$pkg" + if [ -d menu/"$pkg" ] ; then + cp -a menu/"$pkg" debian/"$cdd"-"$pkg"/"$menudir"/"$cdd"-"$pkg" + fi # Check for documentation of packages which should be viewed in # case of missing GUI if [ -d docs -a -d docs/"$pkg" ] ; then @@ -63,7 +65,7 @@ # check for packages without menu for pkg in `ls tasks` ; do - if [ ! -d debian/"$cdd"-"$pkg"/"$menudir" ] ; then + if [ ! -d debian/"$cdd"-"$pkg"/"$menudir" -a ! -d docs/"$pkg" ] ; then echo "Warning: Please provide a menu for package ${cdd}-${pkg}." else # If there is a menu then we have to depend from ${cdd}-common From debian-custom@lists.debian.org Wed Jun 30 02:49:16 2004 From: debian-custom@lists.debian.org (Andre Luis Lopes) Date: Wed, 30 Jun 2004 01:49:16 +0000 Subject: [Cdd-commits] cdd/common/cdd/debian changelog,1.14,1.15 Update of /cvsroot/cdd/cdd/common/cdd/debian In directory haydn:/tmp/cvs-serv9231/common/cdd/debian Modified Files: changelog Log Message: * Added cdd-dev's Brazilian Portuguese (pt_BR) debconf template translation as requested by Otávio Salvador . Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/common/cdd/debian/changelog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- changelog 29 Jun 2004 16:59:24 -0000 1.14 +++ changelog 30 Jun 2004 01:49:13 -0000 1.15 @@ -14,6 +14,9 @@ - Add support to Pre-Depends field in cdd-gen-control script. - Change the default task prefix from 'education-' to 'test-'. - Include code to stop if exist a task with name 'common'. + * André Luís Lopes + - Added Brazilian Portuguese (pt_BR) cdd-dev debconf template + translation. -- Andreas Tille Wed, 9 Jun 2004 08:20:26 +0200 From debian-custom@lists.debian.org Wed Jun 30 02:49:16 2004 From: debian-custom@lists.debian.org (Andre Luis Lopes) Date: Wed, 30 Jun 2004 01:49:16 +0000 Subject: [Cdd-commits] cdd/common/cdd/templates/po pt_BR.po,NONE,1.1 Update of /cvsroot/cdd/cdd/common/cdd/templates/po In directory haydn:/tmp/cvs-serv9231/common/cdd/templates/po Added Files: pt_BR.po Log Message: * Added cdd-dev's Brazilian Portuguese (pt_BR) debconf template translation as requested by Otávio Salvador . --- NEW FILE: pt_BR.po --- # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to # this format, e.g. by running: # info -n '(gettext)PO Files' # info -n '(gettext)Header Entry' # # Some information specific to po-debconf are available at # /usr/share/doc/po-debconf/README-trans # or http://www.debian.org/intl/l10n/po-debconf/README-trans # # Developers do not need to manually edit POT or PO files. # msgid "" msgstr "" "Project-Id-Version: cdd-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" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect #. Description #: ../common.templates:4 msgid "#CDDNAME# users:" msgstr "Usuários #CDDNAME# : " #. Type: multiselect #. Description #: ../common.templates:4 msgid "" "Please select, among the whole system user list, users who should get a " "#CDDNAME# 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#." #. Type: select #. Choices #: ../common.templates:10 msgid "Each package installation, End of installation, Never" msgstr "A cada instalação de pacote, Ao final da instalação, Nunca" #. Type: select #. Description #: ../common.templates:12 msgid "Build user menus at:" msgstr "Construir menus de usuários :" #. Type: select #. Description #: ../common.templates:12 msgid "" "The meta packages of the #CDDNAME# Custom Debian Distribution 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 " "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" " * Each package installation : Call \"update-menus\" after each meta " "package\n" " (time consuming);\n" " * End of installation : Call \"update-menus\" only once at the end " "of\n" " 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 " "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 " "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" "usuários.\n" " * A cada instalação de pacote : Executa \"update-menus\" após cada meta " "pacote\n" " (consome muito tempo);\n" " * Ao final da instalação : Executa \"update-menus\" uma única vez " "no final\n" " do processo completo de instalação/atualização;\n" " * Nunca : Não executa \"update-menus\"." From debian-custom@lists.debian.org Wed Jun 30 20:35:06 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 30 Jun 2004 19:35:06 +0000 Subject: [Cdd-commits] cdd/doc/common/en 05_inside.sgml,1.2,1.3 06_technology.sgml,1.3,1.4 Update of /cvsroot/cdd/cdd/doc/common/en In directory haydn:/tmp/cvs-serv29399/common/en Modified Files: 05_inside.sgml 06_technology.sgml Log Message: Started quick howto for building meta packages section. Index: 06_technology.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/06_technology.sgml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- 06_technology.sgml 29 Jun 2004 07:28:31 -0000 1.3 +++ 06_technology.sgml 30 Jun 2004 19:35:04 -0000 1.4 @@ -914,6 +914,7 @@ <cdd> user groups (see ).

+ Package cdd-common @@ -1125,6 +1126,137 @@ + + Quick intro into building meta packages + +

+There are several descriptions available how to build Debian packages +in general. The main resource might be the repository of + (especially +). +There are several external packaging HOWTOs for example the one from +. +

+ + + Defining dependencies for meta packages + +

+This howto describes the building of meta packages by using the +cdd-dev package. It is perfectly possible to build +a meta package as any other normal Debian package but this HOWTO +has the only purpose to describe the profit you might gain by using +these tools. + + +~> cp -a /usr/share/doc/cdd-dev/examples/tasks . +~> cat tasks/README +~> edit tasks/task1 +Description: short description + long description as in any debian/control file + +Depends: dependency1, dependency2, ... + + +For each meta package this skeleton of a debian/control +entry is needed. All necessary information is available in the +directory /usr/share/doc/cdd-dev/examples/tasks. +

+ + + + The packaging directory + +

+To build any Debian package you always need a directory named +debian which contains a certain set of files. The +package cdd-dev provides a complete set of example +files which only have to be copied and after editing some place +holders are ready to use. + +~> cp -a /usr/share/doc/cdd-dev/examples/debian . +~> cat debian/README +~> edit debian/control.stub + +Now the variables in the file control.stub change the +variables named _CDD_, _MAINTAINER_ etc. to +match the names of the Custom Debian Distribution to be built. Please +note that the file debian/control is and has to be a +symbolic link to control.stub to let the +cdd-dev tools work. + + +~> edit debian/rules + + +Also in the debian/rules the name of the Custom Debian +Distribution has to be inserted where the template contains +_CDD_. Depending from the way the +sources.list should be scanned the options for the +gen-control call can be adjusted (see ). +

+

+Optionally a source tarball can be created by + +~> make -f debian/rules dist + +This tarball can be moved to any location where the meta packages +should be built or the build process is started directly by calling + +~> debuild + +which also creates a source tarball. +

+

+That's all for the very simple case when the meta packages should not +contain user menus. Even if user menus are suggested they are not +necessary. The following paragraphs describe how to use the +cdd-dev tools to support these menus. +

+ + + + + The common meta package + +

+The creation of a common package is optional but suggested because it +adds some special features like menus, user groups and probably more +in the future. It is automatically built by +cdd-install-helper (which is called in +debian/rules) the common directory exists. +The easiest way to create this is as follows: + +~> cp -a /usr/share/doc/cdd-dev/examples/common . +~> cat common/README +~> edit common/conf common/control common/common.1 + +The variables (_CDD_) in these three files have to be +adjusted to the name of the Custom Debian Distribution in question. +This cdd-common cares for the initialisation +of the role based menu system and might contain adjustments of the +general configuration inside the cdd-common. +

+

+If the meta package cdd-common will be +created according to these rules all other meta packages will depend +automatically from this common package. For the friends of +auto-apt a helper +/usr/bin/<meta-package-name> will be +installed as well which just prints some information about the meta +package. All in all the usage of the common package is strongly +suggested to have a common registry for stuff like user roles and +possibly other things which will be implementd in the future. +

+ + Index: 05_inside.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/05_inside.sgml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- 05_inside.sgml 30 May 2004 22:37:16 -0000 1.2 +++ 05_inside.sgml 30 Jun 2004 19:35:04 -0000 1.3 @@ -203,8 +203,9 @@

Those who might fear this amount of freedom given to every single developer -should realize that there are very strict rules, as laid out in Debian's -policy, which glue everything together. To keep their packages in each new +should realize that there are very strict rules, as laid out in +, +which glue everything together. To keep their packages in each new release, every developer must ensure that their packages abide by that policy.

From debian-custom@lists.debian.org Wed Jun 30 22:53:58 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 30 Jun 2004 21:53:58 +0000 Subject: [Cdd-commits] cdd/doc/common/debian changelog,1.4,1.5 Update of /cvsroot/cdd/cdd/doc/common/debian In directory haydn:/tmp/cvs-serv7546/common/debian Modified Files: changelog Log Message: Increased version number for next release and finished quick meta package building howto. Index: changelog =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/debian/changelog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- changelog 13 May 2004 12:11:54 -0000 1.4 +++ changelog 30 Jun 2004 21:53:55 -0000 1.5 @@ -1,3 +1,12 @@ +cdd-doc (0.3) unstable; urgency=low + + * UNRELEASED + * Several enhancements of contents + * Fixes for spelling grammar and contents provided by several + people especially Ben Armstrong. + + -- Andreas Tille Wed, 30 Jun 2004 23:38:05 +0200 + cdd-doc (0.2) unstable; urgency=low * Fixed typo in description From debian-custom@lists.debian.org Wed Jun 30 22:53:58 2004 From: debian-custom@lists.debian.org (Andreas Tille) Date: Wed, 30 Jun 2004 21:53:58 +0000 Subject: [Cdd-commits] cdd/doc/common/en 06_technology.sgml,1.4,1.5 Update of /cvsroot/cdd/cdd/doc/common/en In directory haydn:/tmp/cvs-serv7546/common/en Modified Files: 06_technology.sgml Log Message: Increased version number for next release and finished quick meta package building howto. Index: 06_technology.sgml =================================================================== RCS file: /cvsroot/cdd/cdd/doc/common/en/06_technology.sgml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- 06_technology.sgml 30 Jun 2004 19:35:04 -0000 1.4 +++ 06_technology.sgml 30 Jun 2004 21:53:56 -0000 1.5 @@ -1256,6 +1256,84 @@ possibly other things which will be implementd in the future.

+ + The meta package menus + +

+As explained in the meta packages can contain +user menus. This optional feature can be implemented easily by using +the template from the cdd-dev in the following way: + + +~> cp -a /usr/share/doc/cdd-dev/examples/menu . +~> cat menu/README +~> edit menu/task1 + Edit the example to legal menu entries of the + dependencies of this meta package +~> cp menu/task1 menu/<meta package name> + + +A menu file for each task should be created containing valid menu +entries for each dependant package. The easiest way to obtain those +menu entries is to simply copy the original menu entry files which are +contained in the packages which the meta package will depend from. +The only thing which has to be changed in these menu entries is the +package field which has to be changed from +<dependant package> to +cdd-task. All other entries +might remain unchanged. This is a good point to check whether the +menu entries of the packages you depend from are formated nicely and +print the necessary information (for instance make use of "hints"). +Here the meta package maintainer has a good chance for quality +assurance work which is also part of the Custom Debian Distributions +issue. +

+

+In principle these menu items could be created automatically either at +meta package build time or even better in the postinst +script of the meta package because it is granted that the needed menu +files are installed on the system (which is not really necessary on +the meta package build machine). This might be implemented in later +versions of cdd-dev. Currently the policy is that +we like to have a little bit of control about the menu entries for the +quality assurance issue mentioned above. Last but not least there are +packages which do not provide a menu entry. If this is the case +because the package maintainer just forgot it a bug report should be +filed. On the other hand there are packages with programs which +provide a command line interface which does not allow a reasonable +menu entry. A solution for this case is provided in the next +paragraph. +

+ + + + Menu for any dependency + +

+The idea of the meta package menu is to provide the user with easily +viewable traces of any installed package which helps solving every day +tasks. So if there are packages which do not contain a menu a screen +with relevant documentation should be provided in a viewer by the +creator of the meta package. Such documentation can be created using +the following templates: + + +~> cp -a /usr/share/doc/cdd-dev/examples/docs . +~> cat docs/README +~> edit docs/task1/dep1 + Provide information about package <dep1> which + depends from meta package <task1> but does not + contain a useful menu entry +~> cp docs/task1/dep1 docs/task1/<dependent pkg> +~> cp -a docs/task1 docs/<meta package name> + + +This ensures that our users become aware of all interesting packages +on their system. The documentation files should contain hints to man +pages to read, URLs which should be visited to learn more about the +package or some short introduction how to get started. +

+