version 0.0.10: compute version number from lisp source.

1 files changed, 21 insertions, 17 deletions

diff --git a/dh_elpa b/dh_elpa
index 32ad303..c1cdb5c 100755
--- a/dh_elpa
+++ b/dh_elpa
@@ -152,10 +152,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
   my $pkg_file;
   if (scalar(@files) == 1) {
-    $pkg_file=$files[0];
+      my $pkg_file=$files[0];
+
+      doit_quietly(qw{emacs -batch -Q -l package},
+		   '--eval',"(add-to-list 'package-directory-list \"$dhelpadir\")",
+		   '--eval',"(add-to-list 'package-directory-list \"$elpadir\")",
+		   qw{-f package-initialize -l dh-elpa.el},
+		   qw{-f dhelpa-batch-install-file}, "$tmp/$elpadir", $pkg_file);
+      
   } else {
     my $cwd = getcwd();
     my $tempdir = "${cwd}/debian/.debhelper/elpa";
+    my $stagedir = "$tempdir/$elpapkg";
     {
       require File::Path;
       File::Path::rmtree $tempdir ||
@@ -163,30 +171,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
       File::Path::make_path $tempdir ||
 	  error "creating $tempdir";
-    }
-    my $version = $dh{VERSION} or error "version not found!";
-    $version =~ s/-[^-]+//;  # strip Debian version
-    my $pkg_dir = "$elpapkg-$version";
 
-    $pkg_file = "$tempdir/$pkg_dir.tar";
-    mkdir "$tempdir/$pkg_dir" or error "$!";
+      File::Path::make_path $stagedir ||
+	  error "creating $stagedir";
+    }
 
-    # copy files into tempdir, flattening hierarchy
+    # copy files into stagedir, flattening hierarchy
     # TODO: do this more correctly
     foreach my $el_file (@files) {
-      doit("cp", "-a", $el_file, "$tempdir/$pkg_dir");
+      doit("cp", "-a", $el_file, "$stagedir");
     }
 
-    chdir $tempdir or die "$!";
-    doit("tar","cf",$pkg_file,$pkg_dir);
-    chdir $cwd or die "$!";
+    doit_quietly(qw{emacs -batch -Q -l package},
+		 '--eval',"(add-to-list 'package-directory-list \"$dhelpadir\")",
+		 '--eval',"(add-to-list 'package-directory-list \"$elpadir\")",
+		 qw{-f package-initialize -l dh-elpa.el},
+		 qw{-f dhelpa-batch-install-directory},
+		 "$tmp/$elpadir", $stagedir, $tempdir);
+
   }
 
-  doit_quietly(qw{emacs -batch -Q -l package},
-               '--eval',"(add-to-list 'package-directory-list \"$dhelpadir\")",
-               '--eval',"(add-to-list 'package-directory-list \"$elpadir\")",
-       qw{-f package-initialize -l dh-elpa.el},
-       qw{-f dhelpa-batch-install-file}, "$tmp/$elpadir", $pkg_file);
 }
 
 =head1 EXAMPLES