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

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-08 18:30:31 +0000 (Sat, 08 Mar 2008)
New Revision: 1381

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/get-oct-pkg-src.pl
Log:
+ Fix regular expression for extracting the upstream version number
  from debian/changelog
+ Correct logic for testing the output of dpkg --compare-versions

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-03-08 17:41:39 UTC (rev 1380)
+++ octave-pkg-dev/trunk/debian/changelog	2008-03-08 18:30:31 UTC (rev 1381)
@@ -1,5 +1,14 @@
-octave-pkg-dev (0.2) UNRELEASED; urgency=low
+octave-pkg-dev (0.2.1) UNRELEASED; urgency=low
 
+  * get-oct-pkg-src.pl:
+    + Fix regular expression for extracting the upstream version number
+      from debian/changelog
+    + Correct logic for testing the output of dpkg --compare-versions
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 08 Mar 2008 19:26:05 +0100
+
+octave-pkg-dev (0.2) unstable; urgency=low
+
   * octave-pkg-dev.mk.in: Run the unit testing debian/check.m script (if it
     exists) after installation of the package
 

Modified: octave-pkg-dev/trunk/get-oct-pkg-src.pl
===================================================================
--- octave-pkg-dev/trunk/get-oct-pkg-src.pl	2008-03-08 17:41:39 UTC (rev 1380)
+++ octave-pkg-dev/trunk/get-oct-pkg-src.pl	2008-03-08 18:30:31 UTC (rev 1381)
@@ -79,7 +79,7 @@
 ### Read the most recent version in debain/changelog
 my $debver;
 while (<CHGLOG>) {
-    if (/\((.*)\)/) {
+    if (/\((.+)-.+\)/) {
         $debver = $1;
         last;
     }
@@ -87,7 +87,7 @@
 
 ### Warn the user whether the dowloaded version is diferent from that
 ### in debian/changelog
-system ("dpkg --compare-versions $version lt $debver") == 0
+system ("dpkg --compare-versions $version lt $debver") != 0
   or print "$prog:W: Version in debian/changelog is lower than upstream\n";
-system ("dpkg --compare-versions $version gt $debver") == 0
+system ("dpkg --compare-versions $version gt $debver") != 0
   or print "$prog:W: Version in debian/changelog is higher than upstream\n";