Index: /trunk/debbuild
===================================================================
--- /trunk/debbuild	(revision 61)
+++ /trunk/debbuild	(revision 62)
@@ -375,8 +375,8 @@
       }
 
-      if (/^\%description(?:\s+(?:-n\s+)?([a-zA-Z0-9_.-]+))?/) {
+      if (/^\%description(?:\s+(?:-n\s+)?(.+))?/) {
 	my $subname = "main";
 	if ($1) {
-	  my $tmp = $1;
+	  my $tmp = expandmacros("$1", 'g');
 	  if (/-n/) { $subname = $tmp; } else { $subname = "$pkgdata{main}{name}-$tmp"; }
 	}
@@ -387,6 +387,7 @@
         }
       }
-      if (/^\%package\s+(?:-n\s+)?([a-zA-Z0-9_.-]+)/) {
-	my $subname = $1;
+      if (/^\%package\s+(?:-n\s+)?(.+)/) {
+	# gotta expand %defines here.  Whee.
+	my $subname = expandmacros("$1", 'g');
 	if (! /-n/) { $subname = "$pkgdata{main}{name}-$1"; }
 	push @pkglist, $subname;
@@ -397,5 +398,5 @@
 	  if (my ($dname,$dvalue) = (/^(Summary|Group|Version|Requires|Provides):\s+(.+)$/i)) {
 	    $dname =~ tr/[A-Z]/[a-z]/;
-	    $pkgdata{$subname}{$dname} = $dvalue;
+	    $pkgdata{$subname}{$dname} = expandmacros($dvalue, 'g');
 	  }
 	}
@@ -505,8 +506,8 @@
     # done %pre/%post scripts
 
-      if (/^\%files(?:\s+(?:-n\s+)?([a-zA-z0-9.-]+))?/) {
+      if (/^\%files(?:\s+(?:-n\s+)?(.+))?/) {
 	my $pkgname = 'main';
 	if ($1) {	# Magic to add entries to the right list of files
-	  my $tmp = $1;
+	  my $tmp = expandmacros("$1", 'g');
 	  if (/-n/) { $pkgname = $tmp; } else { $pkgname = "$pkgdata{main}{name}-$tmp"; }
 	}
@@ -606,5 +607,5 @@
 	$buildreq .= ", $1";
       } elsif (/^requires:\s+(.+)/i) {
-	$pkgdata{main}{requires} .= ", $1";
+	$pkgdata{main}{requires} .= ", ".expandmacros("$1", 'g');
       } elsif (/^provides:\s+(.+)/i) {
 	$pkgdata{main}{provides} .= ", $1";