[Cdd-commits] r483 - in cdd/trunk/cdd: debian devtools share/menu

[CDD Subversion Commit]

Author: tille
Date: Sat Oct 20 09:27:59 2007
New Revision: 483

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/devtools/cdd-gen-control
   cdd/trunk/cdd/share/menu/cdd-menu
Log:
Fix reading names of CDD and meta package prefix


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Sat Oct 20 09:27:59 2007
@@ -3,6 +3,7 @@
   * 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
+  * Make use of cdd-get-names also in cdd-gen-control script
 
  -- Andreas Tille <tille at debian.org>  Fri, 19 Oct 2007 16:12:51 +0200
 

Modified: cdd/trunk/cdd/devtools/cdd-gen-control
==============================================================================
--- cdd/trunk/cdd/devtools/cdd-gen-control	(original)
+++ cdd/trunk/cdd/devtools/cdd-gen-control	Sat Oct 20 09:27:59 2007
@@ -29,6 +29,7 @@
 
 my $aptsourcesdefaultlocation = "/etc/cdd";
 my $aptsources = $aptsourcesdefaultlocation . "/sources.list";
+my $cdd_dev_dir = "/usr/share/cdd-dev";
 
 my %commondepends ;
 $commondepends{"adduser"}    = "0" ;
@@ -121,7 +122,8 @@
                    "Dir::State=$aptdir/state",
                    "Dir::Cache=$aptdir/cache",
                    "Dir::State::Status=/dev/null",
-                   "Debug::NoLocking=true");
+                   "Debug::NoLocking=true",
+                   "APT::Get::AllowUnauthenticated=true");
 
     # Stupid apt-get and apt-cache do not understand the same arguments!
     # I have to map them to different formats to get both working.
@@ -605,23 +607,14 @@
 	mkdir("debian") || die "mkdir debian: $!";
     }
 
-    unless ( open(STUB, "debian/control.stub" ) ) {
+    unless ( -e "debian/control.stub" ) {
         print STDERR "No template debian/control.stub.  Use test prefix.\n" ;
     } else {
-        while ( <STUB> ) {
-            if ( /^Package: (\w+)/) {
-                $prefix  = $1."-";
-		$cddname = "debian-".$cddshortname ;
-		if ( /^Package:\s.*-tasks$/) {
-		    $tasksname = $prefix . "tasks";
-		}
-		last ;
-            }
-            if ( /^Source:\s+debian-(.+)$/) {
-		$cddshortname = $1 ;
-            }
-        }
-	close(STUB) ;
+        chomp($prefix = `$cdd_dev_dir/cdd-get-names metapackageprefix`) ;
+        $prefix = $prefix . "-" ;
+	$tasksname    = $prefix . "tasks";
+	chomp($cddshortname = `$cdd_dev_dir/cdd-get-names cddshortname`);
+	chomp($cddname      = `$cdd_dev_dir/cdd-get-names cddname`);
     }
     if  ( -d "config" && -e "config/control" ) {
 	$hasconfig = 1;

Modified: cdd/trunk/cdd/share/menu/cdd-menu
==============================================================================
--- cdd/trunk/cdd/share/menu/cdd-menu	(original)
+++ cdd/trunk/cdd/share/menu/cdd-menu	Sat Oct 20 09:27:59 2007
@@ -3,12 +3,7 @@
 # Script to handle menu profiles for CDD subsystem, installed by your system
 # administrator via cdd-common package.
 #
-# this script should be put in ${HOME}./menu/cdd-menu and is executed by
-# update-menus when run by user (not root)
-#
 # It prints on STDOUT Debian menu entries for user
-#
-# DO NOT REMOVE IT UNLESS YOU KNOW WHAT YOU ARE DOING
 
 CONFBASE=${CONFBASE:-/etc/cdd}