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

[CDD Subversion Commit]

Author: tille
Date: Fri Oct 19 22:46:37 2007
New Revision: 482

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/devtools/cdd-get-names
Log:
Enable finding a metapackage prefix if no task package is builded


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Fri Oct 19 22:46:37 2007
@@ -1,6 +1,16 @@
+cdd (0.4.4) unstable; urgency=low
+
+  * Remove old useless comment in share/menu/cdd-menu
+  * If there is no tasksel package wanted, just obtain the
+    meta package prefix from the CDD short name
+
+ -- Andreas Tille <tille at debian.org>  Fri, 19 Oct 2007 16:12:51 +0200
+
 cdd (0.4.3) unstable; urgency=low
 
   * Add a newline after adding config/control to debian/control
+  * If a CDD provides an auto-apt helper name it CDD-config instead
+    of CDD-common
 
  -- Andreas Tille <tille at debian.org>  Thu, 18 Oct 2007 20:14:16 +0200
 

Modified: cdd/trunk/cdd/devtools/cdd-get-names
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-get-names	(original)
+++ cdd/trunk/cdd/devtools/cdd-get-names	Fri Oct 19 22:46:37 2007
@@ -10,6 +10,11 @@
 
 CONTROLFILE=debian/control.stub
 
+GetShortName () {
+    grep '^Source:[[:space:]]*debian-' $CONTROLFILE | \
+	sed 's/^Source:[[:space:]]*debian-//'
+}
+
 if [ ! -e "$CONTROLFILE" ] ; then
 	echo "Missing control file $CONTROLFILE"
 	exit 72   # EX_OSFILE
@@ -28,13 +33,17 @@
 	exit 0
 	;;
     cddshortname)
-        grep '^Source:[[:space:]]*debian-' "$CONTROLFILE" | \
-	    sed 's/^Source:[[:space:]]*debian-//'
+	GetShortName
 	exit 0
 	;;
     metapackageprefix)
-	grep '^Package:[[:space:]]*' "$CONTROLFILE" | \
-	    sed 's/^Package:[[:space:]]*\([[:alnum:]]\+\)-*.*/\1/'
+	mprefix=`grep '^Package:[[:space:]]*' "$CONTROLFILE" | \
+	    sed 's/^Package:[[:space:]]*\([[:alnum:]]\+\)-*.*/\1/'`
+	if [ -z $mprefix ] ; then
+	    GetShortName
+	else
+	    echo $mprefix
+	fi
 	exit 0
 	;;
     *)