[Pkg-octave-commit] r1508 - in octave-pkg-dev/trunk: . debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-25 20:57:28 +0000 (Tue, 25 Mar 2008)
New Revision: 1508

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg-dev.pl.in
Log:
Get information directly from file DESCRIPTION, no need to unpack the
tarball anymore

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-25 17:28:18 UTC (rev 1507)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-25 20:57:28 UTC (rev 1508)
@@ -10,8 +10,10 @@
       tarball now.
     + Added a clean rule
     + Drop the setting of the DEB_TARBALL variable, which is obsolete now
+  * octave-pkg-dev.pl.in: Get information directly from file DESCRIPTION,
+    no need to unpack the tarball anymore
 
- -- Rafael Laboissiere <rafael at debian.org>  Tue, 25 Mar 2008 13:19:34 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 25 Mar 2008 21:56:44 +0100
 
 octave-pkg-dev (0.4) unstable; urgency=low
 

Modified: octave-pkg-dev/trunk/octave-pkg-dev.pl.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg-dev.pl.in	2008-03-25 17:28:18 UTC (rev 1507)
+++ octave-pkg-dev/trunk/octave-pkg-dev.pl.in	2008-03-25 20:57:28 UTC (rev 1508)
@@ -27,29 +27,24 @@
 
 init ();
 
-my $description = qx {tar tfz *.tar.gz | grep DESCRIPTION};
 my %depends = ();
 
-if ($description ne "") {
-    my $deps;
-    system "tar xfz *.tar.gz --strip=1 $description";
-    if (open (DESC, "< DESCRIPTION")) {
-        while (<DESC>) {
-            if (/Depends: (.*)/) {
-                $deps = $1;
-                last;
-            }
+my $deps;
+if (open (DESC, "< DESCRIPTION")) {
+    while (<DESC>) {
+        if (/Depends: (.*)/) {
+            $deps = $1;
+            last;
         }
-        close DESC;
-        unlink "DESCRIPTION";
-        map {
-            if (/([^ ]+) \((.*)\)/) {
-                $depends {"octave-$1"} = $2;
-            } else {
-                $depends {"octave-$_"} = "";
-            }
-        } grep {not /^octave/} split (", ", $deps);
     }
+    close DESC;
+    map {
+        if (/([^ ]+) \((.*)\)/) {
+            $depends {"octave-$1"} = $2;
+        } else {
+            $depends {"octave-$_"} = "";
+        }
+    } grep {not /^octave/} split (", ", $deps);
 }
 
 foreach my $package (@{$dh{DOPACKAGES}}) {