r52694 - in /desktop/unstable/gobject-introspection/debian: changelog dh_girepository
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Tue Jul 25 15:49:39 UTC 2017
Author: laney
Date: Tue Jul 25 15:49:38 2017
New Revision: 52694
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52694
Log:
debian/dh_girepository: Be a bit more forgiving when finding out the
version gir format in use. We're seeing files that have <repository> and
<include> on the same line, and our greedy regex was finding the version
attribute of the <include> when we want the one from <repository>.
Modified:
desktop/unstable/gobject-introspection/debian/changelog
desktop/unstable/gobject-introspection/debian/dh_girepository
Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=52694&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog [utf-8] Tue Jul 25 15:49:38 2017
@@ -1,3 +1,12 @@
+gobject-introspection (1.50.0-2) UNRELEASED; urgency=medium
+
+ * debian/dh_girepository: Be a bit more forgiving when finding out the
+ version gir format in use. We're seeing files that have <repository> and
+ <include> on the same line, and our greedy regex was finding the version
+ attribute of the <include> when we want the one from <repository>.
+
+ -- Iain Lane <laney at debian.org> Tue, 25 Jul 2017 16:48:11 +0100
+
gobject-introspection (1.50.0-1) unstable; urgency=medium
[ Andreas Henriksson ]
Modified: desktop/unstable/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/dh_girepository?rev=52694&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/dh_girepository [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/dh_girepository [utf-8] Tue Jul 25 15:49:38 2017
@@ -276,7 +276,7 @@
while (<$f>) {
# "Parse" the XML file
chomp;
- if (/<repository.+version="(.*?)"/) {
+ if (/<repository.+?version="(.*?)"/) {
# gir format version
$format="$1";
} elsif (/<include\s+name="(.*?)"\s+version="(.*?)"\/>/) {
More information about the pkg-gnome-commits
mailing list