[Cdd-commits] cdd/common/cdd BUGS,1.2,1.3 cdd-install-helper,1.6,1.7 cdd-update-usermenus,1.1,1.2

[Andreas Tille]

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.