[Cdd-commits] r467 - in cdd/trunk/cdd: debian devtools

[CDD Subversion Commit]

Author: tille
Date: Sun Sep 30 13:58:54 2007
New Revision: 467

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/devtools/cdd-install-helper
Log:
Do not force tasksel mechanism via /usr/share/cdd/tasks


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Sun Sep 30 13:58:54 2007
@@ -2,6 +2,9 @@
 
   * Moved documentation package cdd-doc into same source package
   * Reworked debian/copyright
+  * devtools/cdd-install-helper: If "Task:" keyword is missing in
+    a task control file just do not put it into tasksel area under
+    /usr/share/cdd/tasks/CDD
 
  -- Andreas Tille <tille at debian.org>  Fri, 31 Aug 2007 19:01:52 +0200
 

Modified: cdd/trunk/cdd/devtools/cdd-install-helper
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-install-helper	(original)
+++ cdd/trunk/cdd/devtools/cdd-install-helper	Sun Sep 30 13:58:54 2007
@@ -18,11 +18,14 @@
     # registration
     if ! grep -q -w "^Task:" tasks/$pkg ; then
 	echo "Control file template tasks/$pkg does not contain 'Task:' field."
-	exit -1
+	# I'm sure there are more clever ways to make the first letter upper case ...
+	# task=`echo $pkg | sed 's/^\(.\).*/\1/' | tr "^[a-z]" "^[A-Z]"``echo $pkg | sed 's/^.//'`
+	# For the moment disable tasksel if there is no "Task:" tag given
+    else
+	task=`grep -w "^Task:" tasks/"$pkg" | sed "s/^Task:[[:space:]]*\([^[:space:]]*\)/\1/"`
+	mkdir -p debian/"$cdd"-"$pkg"/usr/share/cdd/tasks/"$cdd"/
+	echo "$task" > debian/"$cdd"-"$pkg"/usr/share/cdd/tasks/"$cdd"/"$pkg"
     fi
-    task=`grep -w "^Task:" tasks/"$pkg" | sed "s/^Task:[[:space:]]*\([^[:space:]]*\)/\1/"`
-    mkdir -p debian/"$cdd"-"$pkg"/usr/share/cdd/tasks/"$cdd"/
-    echo "$task" > debian/"$cdd"-"$pkg"/usr/share/cdd/tasks/"$cdd"/"$pkg"
 
     # if we provide an extra menu which overrides some menus provided by
     # the maintainers of the dependand packages move them now to the right