[SCM] dpkg's main repository branch, master, updated. 1.14.15-103-g5884d15

[Raphael Hertzog]

The branch, master has been updated
       via  5884d153fb6d94cb5af2fbcc809b83e5d47297cb (commit)
      from  13d8e82ac2cb730fddf075af9ae67eec544befc9 (commit)


- Shortlog ------------------------------------------------------------
5884d15 dpkg-buildpackage: use parse_changelog() instead of calling 
dpkg-parsechangelog

Summary of changes:
 ChangeLog                    |    6 ++++++
 scripts/dpkg-buildpackage.pl |   19 +++++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5884d153fb6d94cb5af2fbcc809b83e5d47297cb
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date:   Sat Jan 19 19:00:00 2008 +0100

    dpkg-buildpackage: use parse_changelog() instead of calling 
dpkg-parsechangelog

diff --git a/ChangeLog b/ChangeLog
index 40d9a10..d70be27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-19  Raphael Hertzog  <[EMAIL PROTECTED]>
+
+       * scripts/dpkg-buildpackage.pl: Use
+       Dpkg::Changelog::parse_changelog() instead of calling
+       dpkg-parsechangelog.
+
 2008-01-18  Raphael Hertzog  <[EMAIL PROTECTED]>
 
        * scripts/Dpkg/Shlibs/SymbolFile.pm,
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 9ff387c..a841e3d 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -13,6 +13,7 @@ use Dpkg::ErrorHandling qw(warning error failure syserr 
subprocerr usageerr
 use Dpkg::BuildOptions;
 use Dpkg::Compression;
 use Dpkg::Version qw(check_version);
+use Dpkg::Changelog qw(parse_changelog);
 
 textdomain("dpkg-dev");
 
@@ -256,17 +257,7 @@ if ($parallel) {
 my $cwd = cwd();
 my $dir = basename($cwd);
 
-my %changes;
-open CHANGELOG, '-|', 'dpkg-parsechangelog' or 
subprocerr('dpkg-parsechangelog');
-# until we have a better parsecdata function this
-# should suffice
-while ($_ = <CHANGELOG>) {
-    chomp;
-    /^(\S+):\s*(.*)$/ && do {
-       $changes{lc $1} = $2;
-    };
-}
-close CHANGELOG or subprocerr('dpkg-parsechangelog');
+my $changelog = parse_changelog();
 
 sub mustsetvar {
     my ($var, $text) = @_;
@@ -278,8 +269,8 @@ sub mustsetvar {
     return $var;
 }
 
-my $pkg = mustsetvar($changes{source}, _g('source package'));
-my $version = mustsetvar($changes{version}, _g('source version'));
+my $pkg = mustsetvar($changelog->{source}, _g('source package'));
+my $version = mustsetvar($changelog->{version}, _g('source version'));
 check_version($version);
 
 my $maintainer;
@@ -288,7 +279,7 @@ if ($changedby) {
 } elsif ($maint) {
     $maintainer = $maint;
 } else {
-    $maintainer = mustsetvar($changes{maintainer}, _g('source changed by'));
+    $maintainer = mustsetvar($changelog->{maintainer}, _g('source changed 
by'));
 }
 
 open my $arch_env, '-|', 'dpkg-architecture', "-a$targetarch",

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]