Index: /trunk/debbuild
===================================================================
--- /trunk/debbuild	(revision 110)
+++ /trunk/debbuild	(revision 111)
@@ -188,5 +188,7 @@
     $pkgdata{$pkg}{name} =~ tr/_/-/;
 
-    my $pkgfullname = "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb";
+    my $pkgfullname = "$pkgdata{$pkg}{name}_".
+	(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+	"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb";
 
     print "$pkgfullname\n" if $filelist{$pkg};
@@ -194,5 +196,7 @@
   }
   # Source package
-  print "$pkgdata{main}{name}-$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb\n";
+  print "$pkgdata{main}{name}-".
+	(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+	"$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb\n";
   exit 0;
 }
@@ -797,4 +801,6 @@
       } elsif (/^name:\s+(.+)/i) {
         $pkgdata{main}{name} = expandmacros($1,'g');
+      } elsif (/^epoch:\s+(.+)/i) {
+        $pkgdata{main}{epoch} = expandmacros($1,'g');
       } elsif (/^version:\s+(.+)/i) {
         $pkgdata{main}{version} = expandmacros($1,'g');
@@ -1036,10 +1042,14 @@
     print DEBSCRIPT $scriptletbase;
     print DEBSCRIPT "fakeroot dpkg-deb -b $buildroot/$pkg $topdir/DEBS/$pkgdata{$pkg}{arch}/".
-	"$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb\n";
+	"$pkgdata{$pkg}{name}_".
+	(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+	"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb\n";
       # %$&$%@#@@#%@@@ Debian and their horrible ugly package names.  >:(
     close DEBSCRIPT;
 
     my $control = "Package: $pkgdata{$pkg}{name}\n".
-	"Version: $pkgdata{$pkg}{version}-$pkgdata{main}{release}\n".
+	"Version: ".
+	(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+	"$pkgdata{$pkg}{version}-$pkgdata{main}{release}\n".
 	"Section: $pkgdata{$pkg}{group}\n".
 	"Priority: optional\n".
@@ -1111,5 +1121,7 @@
 
     $finalmessages .= "Wrote binary package ".
-	"$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb".
+	"$pkgdata{$pkg}{name}_".
+	(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+	"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb".
 	" in $topdir/DEBS/$pkgdata{$pkg}{arch}\n";
     # and clean up
@@ -1129,5 +1141,7 @@
   # In case we were called with -bs.
   $pkgdata{main}{name} =~ tr/_/-/;
-  my $pkgsrcname = "$pkgdata{main}{name}-$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb";
+  my $pkgsrcname = "$pkgdata{main}{name}-".
+	(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+	"$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb";
 
   my $paxcmd;