[Cdd-commits] cdd/common/cdd cdd-install-helper,1.7,1.8

Andreas Tille debian-custom@lists.debian.org
Tue, 29 Jun 2004 20:02:13 +0000


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