[Cdd-commits] r234 - cdd/trunk/cdd

[Andreas Tille]

Author: tille
Date: Sun Jul 11 01:09:40 2004
New Revision: 234

Modified:
   cdd/trunk/cdd/cdd-gen-control
   cdd/trunk/cdd/cdd-install-helper
Log:
Fixes regarding the menu change; Include cdd-dev version in cdd-gen-control


Modified: cdd/trunk/cdd/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/cdd-gen-control	(original)
+++ cdd/trunk/cdd/cdd-gen-control	Sun Jul 11 01:09:40 2004
@@ -23,6 +23,8 @@
 
 my $aptsources = "/etc/cdd/sources.list";
 my $tmpaptsources = "" ;
+# the VERSION variable is replaced in the dist target of debian/rules
+my $version = "#VERSION#" ;
 
 getopts("cdaemis:", \%opts);
 
@@ -90,7 +92,9 @@
 	print "Package: $task\n";
 	print "Architecture: all\n";
 	my $header;
-	for $header (qw(Section XBCS-Task Priority)) {
+# Leave out XBCS-Task for the moment ...
+#	for $header (qw(Section XBCS-Task Priority)) {
+	for $header (qw(Section Priority)) {
 	    print "$header: $taskinfo{$task}{$header}\n"
 		if (defined $taskinfo{$task}{$header});
 	}

Modified: cdd/trunk/cdd/cdd-install-helper
==============================================================================
--- cdd/trunk/cdd/cdd-install-helper	(original)
+++ cdd/trunk/cdd/cdd-install-helper	Sun Jul 11 01:09:40 2004
@@ -20,8 +20,8 @@
 	echo "Control file template tasks/$pkg does not contain 'Task:' field."
 	exit -1
     fi
-    task=`grep -w "^Task:" tasks/$pkg | sed "s/^Task:[[:space:]]*\([^[:space]]*\)/\1/"`
-    mkdir -p debian/"$cdd"-"$pkg"/usr/share/cdd/"$cdd"/
+    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
@@ -53,6 +53,9 @@
     fi
 
     # post{inst/rm} template are appended if some extra scripts are provided or just created
+    # an extra postinst has to be saved (*.stub) and restored by the clean target in
+    # debian/rules
+    [ -s debian/"$cdd"-"$pkg".postinst ] && cp -a debian/"$cdd"-"$pkg".postinst debian/"$cdd"-"$pkg".postinst.stub
     sed -e "s/#CDD#/${cdd}/g" \
         -e "s/#PKG#/${cdd}-${pkg}/g" \
        /usr/share/cdd/templates/postinst >> debian/"$cdd"-"$pkg".postinst
@@ -87,7 +90,11 @@
   done
   # rename apt.conf.d file 
   [ -s debian/${cdd}-apt.conf ] && mv debian/${cdd}-apt.conf debian/90${cdd}-common
-  mkdir -p debian/po
+  if [ -d debian/po ] ; then
+      cp -a debian/po debian/po.stub
+  else
+      mkdir -p debian/po
+  fi
   for po in `ls /usr/share/cdd/templates/po/*` ; do
     poname=`basename $po`
     SubstCDDName po/${poname} po/${poname}