[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.9.4
Modestas Vainius
modax at alioth.debian.org
Sun Feb 20 10:47:35 UTC 2011
The following commit has been merged in the master branch:
commit bdd106c989d178fdee7eae6e4a4b2decb54bc16d
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sun Feb 20 12:39:30 2011 +0200
Use perl API in place of dpkg --compare-versions (kde buildsystem).
---
debian/changelog | 1 +
perllib/Debian/Debhelper/Buildsystem/kde.pm | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6113307..94b829d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pkg-kde-tools (0.9.4) UNRELEASED; urgency=low
* Bump Standards-Verstion to 3.9.1: no changes needed.
* Fix "dpkg: * has bad syntax: invalid character in revision number" error
which debhelper kde buildsystem used to spit (it wasn't fatal though).
+ * Use perl API in place of dpkg --compare-versions (kde buildsystem).
-- Modestas Vainius <modax at debian.org> Tue, 03 Aug 2010 01:44:35 +0300
diff --git a/perllib/Debian/Debhelper/Buildsystem/kde.pm b/perllib/Debian/Debhelper/Buildsystem/kde.pm
index 1f84451..cc4e994 100644
--- a/perllib/Debian/Debhelper/Buildsystem/kde.pm
+++ b/perllib/Debian/Debhelper/Buildsystem/kde.pm
@@ -9,6 +9,8 @@ package Debian::Debhelper::Buildsystem::kde;
use strict;
use warnings;
use Debian::Debhelper::Dh_Lib qw(error);
+use Dpkg::Version qw();
+
use base 'Debian::Debhelper::Buildsystem::cmake';
sub DESCRIPTION {
@@ -51,8 +53,7 @@ sub configure {
# Skip RPATH if kdelibs5-dev is older than 4:4.4.0
my $kdever = `dpkg-query -f='\${Version}' -W kdelibs5-dev 2>/dev/null`;
- if ($kdever &&
- system("dpkg", "--compare-versions", $kdever, "lt", "4:4.4.0") == 0)
+ if ($kdever && Dpkg::Version::version_compare($kdever, "4:4.4.0") < 0)
{
push @flags, "-DCMAKE_SKIP_RPATH:BOOL=ON";
}
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list