[Cdd-commits] r256 - in cdd/trunk/cdd: . debian share/menu

[Andreas Tille]

Author: tille
Date: Thu Jul 15 03:16:31 2004
New Revision: 256

Modified:
   cdd/trunk/cdd/cdd-install-helper
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/share/menu/cdd-menu
Log:
Included changes for 0.3.4 in changelog; minor fixes in cdd-menu and cdd-install-helper.


Modified: cdd/trunk/cdd/cdd-install-helper
==============================================================================
--- cdd/trunk/cdd/cdd-install-helper	(original)
+++ cdd/trunk/cdd/cdd-install-helper	Thu Jul 15 03:16:31 2004
@@ -6,7 +6,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 > \
+        -e "s/#CDDNAME#/${CDDNAME}/g" /usr/share/cdd/templates/$1 >> \
 	debian/$2
 }
 

Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Thu Jul 15 03:16:31 2004
@@ -11,7 +11,17 @@
     - User menus now are created from installed dependency menus
       if they are not explicitely overriden by the meta package maintainer
 
- -- Andreas Tille <tille@debian.org>  Wed, 14 Jul 2004 21:38:31 +0200
+ -- Andreas Tille <tille@debian.org>  Thu, 15 Jul 2004 11:13:22 +0200
+
+cdd (0.3.4) unstable; urgency=high
+
+  * Fixed common.postinst template which finally fixed bug #259412.
+  * Removed contrib non-free and non-US from the templates - we want
+    to build packages for main by default, others should be added
+    manually by local maintainers.
+  * Urgency set to high because it *really* fixes a grave bug.
+
+ -- Andreas Tille <tille@debian.org>  Thu, 15 Jul 2004 10:51:44 +0200
 
 cdd (0.3.3) unstable; urgency=high
 

Modified: cdd/trunk/cdd/share/menu/cdd-menu
==============================================================================
--- cdd/trunk/cdd/share/menu/cdd-menu	(original)
+++ cdd/trunk/cdd/share/menu/cdd-menu	Thu Jul 15 03:16:31 2004
@@ -84,7 +84,7 @@
 		RET=64 # EX_USAGE
 		return ${RET}
 	fi
-	PKG=$1
+	PKG="$CDD"-$1
 	TASK=`GetTaskTitle $PKG`
 	SECTION=`NameToUpper "$CDD"`/`NameToUpper "$TASK"`