r52696 - in /desktop/experimental/gobject-introspection: ./ debian/changelog debian/dh_girepository

[laney at users.alioth.debian.org]

Author: laney
Date: Tue Jul 25 17:23:44 2017
New Revision: 52696

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52696
Log:
Merge dh_girepository change from unstable

Modified:
    desktop/experimental/gobject-introspection/   (props changed)
    desktop/experimental/gobject-introspection/debian/changelog
    desktop/experimental/gobject-introspection/debian/dh_girepository

Propchange: desktop/experimental/gobject-introspection/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Tue Jul 25 17:23:44 2017
@@ -1 +1,2 @@
 /desktop/experimental/gobject-introspection:35308-37635
+/desktop/unstable/gobject-introspection:52000-52694

Modified: desktop/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/changelog?rev=52696&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/changelog	[utf-8] Tue Jul 25 17:23:44 2017
@@ -1,3 +1,13 @@
+gobject-introspection (1.53.2-3) UNRELEASED; urgency=medium
+
+  * Merge from unstable.
+  * 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.53.2-2) experimental; urgency=medium
 
   * debian/patches/0001-When-handling-errors-according-to-errno-catch-both-I.patch:

Modified: desktop/experimental/gobject-introspection/debian/dh_girepository
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gobject-introspection/debian/dh_girepository?rev=52696&op=diff
==============================================================================
--- desktop/experimental/gobject-introspection/debian/dh_girepository	[utf-8] (original)
+++ desktop/experimental/gobject-introspection/debian/dh_girepository	[utf-8] Tue Jul 25 17:23:44 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="(.*?)"\/>/) {