[devscripts] 01/01: have git-deborig use Dpkg::Changelog::Parse
Sean Whitton
spw-guest at moszumanska.debian.org
Mon Dec 19 14:10:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
spw-guest pushed a commit to branch master
in repository devscripts.
commit bce34b8d7fa410e64c411bd780f8e21603167ae7
Author: Sean Whitton <spwhitton at spwhitton.name>
Date: Mon Dec 19 14:10:10 2016 +0000
have git-deborig use Dpkg::Changelog::Parse
---
README | 3 +--
debian/control | 5 +----
scripts/git-deborig.pl | 10 ++++------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/README b/README
index dea909e..2e514c1 100644
--- a/README
+++ b/README
@@ -176,8 +176,7 @@ And now, in mostly alphabetical order, the scripts:
- getbuildlog: download package build logs from Debian auto-builders [wget]
- git-deborig: try to produce Debian orig.tar using git-archive(1)
- [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl,
- libparse-debianchangelog-perl]
+ [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl]
- grep-excuses: grep the update_excuses.html file to find out what is
happening to your packages. [libterm-size-perl, wget, w3m]
diff --git a/debian/control b/debian/control
index 8c31a7f..1df21ee 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Build-Depends: bash-completion,
libfile-desktopentry-perl,
libgit-wrapper-perl,
liblist-compare-perl,
- libparse-debianchangelog-perl,
libtimedate-perl,
liburi-perl,
libwww-perl,
@@ -64,7 +63,6 @@ Recommends: apt,
libencode-locale-perl,
libgit-wrapper-perl,
liblist-compare-perl,
- libparse-debianchangelog-perl,
liburi-perl,
libwww-perl,
licensecheck,
@@ -188,8 +186,7 @@ Description: scripts to make the life of a Debian Package maintainer easier
[quilt | dpatch | cdbs]
- getbuildlog: download package build logs from Debian auto-builders [wget]
- git-deborig: try to produce Debian orig.tar using git-archive(1)
- [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl,
- libparse-debianchangelog-perl]
+ [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl]
- grep-excuses: grep the update_excuses.html file for your packages
[libterm-size-perl, wget, w3m]
- list-unreleased: search for unreleased packages
diff --git a/scripts/git-deborig.pl b/scripts/git-deborig.pl
index c0107fe..a2ff3db 100755
--- a/scripts/git-deborig.pl
+++ b/scripts/git-deborig.pl
@@ -63,8 +63,8 @@ use strict;
use warnings;
no warnings "experimental::smartmatch";
-use Parse::DebianChangelog;
use Git::Wrapper;
+use Dpkg::Changelog::Parse;
use Dpkg::Version;
use List::Compare;
@@ -86,12 +86,10 @@ foreach my $arg ( @ARGV ) {
}
# Extract source package name and version from d/changelog
-my $changelog = Parse::DebianChangelog->init();
-$changelog->parse( { infile => "debian/changelog" } );
-my $changelog_data = $changelog->dpkg();
-my $version = Dpkg::Version->new($changelog_data->{"Version"});
+my $changelog = Dpkg::Changelog::Parse->changelog_parse({});
+my $version = $changelog->{Version};
+my $source = $changelog->{Source};
my $upstream_version = $version->version();
-my $source = $changelog_data->{"Source"};
# Sanity check #2
die "this looks like a native package .." if $version->is_native();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list