r44071 - in /desktop/unstable/gobject-introspection/debian: changelog patches/Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch patches/Dont_unconditionally_include_config.h_in_regress.c.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Dec 17 09:29:20 2014
New Revision: 44071

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44071
Log:
* Non-maintainer upload.
* Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch:
  new patch, similar to the one applied in the last upload, that fixed
  the same problem in regress.c only (Closes: #764272)
* Non-maintainer upload.
* Dont_unconditionally_include_config.h_in_regress.c.patch: new patch,
  cherry-picked from upstream (Closes: #764272)

Added:
    desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch
    desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch
Modified:
    desktop/unstable/gobject-introspection/debian/changelog
    desktop/unstable/gobject-introspection/debian/patches/series

Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=44071&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog	[utf-8] Wed Dec 17 09:29:20 2014
@@ -1,3 +1,20 @@
+gobject-introspection (1.42.0-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch:
+    new patch, similar to the one applied in the last upload, that fixed
+    the same problem in regress.c only (Closes: #764272)
+
+ -- intrigeri <intrigeri at debian.org>  Wed, 22 Oct 2014 11:20:04 +0200
+
+gobject-introspection (1.42.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Dont_unconditionally_include_config.h_in_regress.c.patch: new patch,
+    cherry-picked from upstream (Closes: #764272)
+
+ -- intrigeri <intrigeri at debian.org>  Tue, 21 Oct 2014 22:09:08 +0200
+
 gobject-introspection (1.42.0-2) unstable; urgency=medium
 
   * dh_girepository: Add a versioned dependency on libgirepository-1.0-1

Added: desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch?rev=44071&op=file
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch	(added)
+++ desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch	[utf-8] Wed Dec 17 09:29:20 2014
@@ -0,0 +1,19 @@
+Author: intrigeri <intrigeri at debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=738989
+Bug-Debian: https://bugs.debian.org/764272
+Origin: vendor, https://bugzilla.gnome.org/attachment.cgi?id=289106
+Subject: Don't unconditionally include config.h in gimashallingtests.c
+
+--- a/tests/gimarshallingtests.c
++++ b/tests/gimarshallingtests.c
+@@ -2,7 +2,10 @@
+  *vim: tabstop=4 shiftwidth=4 expandtab
+  */
+ 
++/* This file gets installed, so we can't assume config.h is available */
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #include "gimarshallingtests.h"
+ 

Added: desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch?rev=44071&op=file
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch	(added)
+++ desktop/unstable/gobject-introspection/debian/patches/Dont_unconditionally_include_config.h_in_regress.c.patch	[utf-8] Wed Dec 17 09:29:20 2014
@@ -0,0 +1,27 @@
+From 578eebd54bd9f2b1677922680701c454f489c895 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 10 Oct 2014 11:36:23 -0400
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=737275
+Bug-Debian: https://bugs.debian.org/764272
+Origin: https://git.gnome.org/browse/gobject-introspection/commit/?id=578eebd54bd9f2b1677922680701c454f489c895
+Subject: Don't unconditionally include config.h in regress.c
+
+This is an installed file, so we can't assume that config.h
+will be around.
+
+diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
+index 3d3cfdd..8a0652f 100644
+--- a/tests/scanner/regress.c
++++ b/tests/scanner/regress.c
+@@ -1,5 +1,8 @@
+ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
++/* This file gets installed, so we can't assume config.h is available */
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #include <string.h>
+ #include <stdlib.h>
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/series?rev=44071&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/patches/series	[utf-8] Wed Dec 17 09:29:20 2014
@@ -1,2 +1,4 @@
 #needed only until all packages are moved to mutliarch paths
 pre_multiarch_compat
+Dont_unconditionally_include_config.h_in_regress.c.patch
+Dont_unconditionally_include_config.h_in_gimarshallingtests.c.patch