r46840 - in /desktop/unstable/glib2.0/debian: ./ patches/
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Mon Nov 2 20:43:03 UTC 2015
Author: smcv
Date: Mon Nov 2 20:43:03 2015
New Revision: 46840
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46840
Log:
* Team upload.
* Cherry-pick patches from upstream glib-2-46 branch to fix incomplete
documentation (Closes: #659977)
* debian/gdbus-example-objectmanager-server.c: add missing example file
from upstream git; it was accidentally omitted from upstream tarballs
Added:
desktop/unstable/glib2.0/debian/gdbus-example-objectmanager-server.c
desktop/unstable/glib2.0/debian/patches/Build-gdbus-example-objectmanager-server-again.patch
desktop/unstable/glib2.0/debian/patches/Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch
desktop/unstable/glib2.0/debian/patches/Doc-copy-included-example-files.patch
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/0001-GDateTime-test-fix-occasional-failures.patch
desktop/unstable/glib2.0/debian/patches/series
desktop/unstable/glib2.0/debian/rules
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=46840&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Mon Nov 2 20:43:03 2015
@@ -1,3 +1,13 @@
+glib2.0 (2.46.1-2) unstable; urgency=medium
+
+ * Team upload.
+ * Cherry-pick patches from upstream glib-2-46 branch to fix incomplete
+ documentation (Closes: #659977)
+ * debian/gdbus-example-objectmanager-server.c: add missing example file
+ from upstream git; it was accidentally omitted from upstream tarballs
+
+ -- Simon McVittie <smcv at debian.org> Mon, 02 Nov 2015 17:31:00 +0000
+
glib2.0 (2.46.1-1) unstable; urgency=medium
[ Michael Biebl ]
Added: desktop/unstable/glib2.0/debian/gdbus-example-objectmanager-server.c
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/gdbus-example-objectmanager-server.c?rev=46840&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/gdbus-example-objectmanager-server.c (added)
+++ desktop/unstable/glib2.0/debian/gdbus-example-objectmanager-server.c [utf-8] Mon Nov 2 20:43:03 2015
@@ -0,0 +1,160 @@
+
+#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static GDBusObjectManagerServer *manager = NULL;
+
+static gboolean
+on_animal_poke (ExampleAnimal *animal,
+ GDBusMethodInvocation *invocation,
+ gboolean make_sad,
+ gboolean make_happy,
+ gpointer user_data)
+{
+ if ((make_sad && make_happy) || (!make_sad && !make_happy))
+ {
+ g_dbus_method_invocation_return_dbus_error (invocation,
+ "org.gtk.GDBus.Examples.ObjectManager.Error.Failed",
+ "Exactly one of make_sad or make_happy must be TRUE");
+ goto out;
+ }
+
+ if (make_sad)
+ {
+ if (g_strcmp0 (example_animal_get_mood (animal), "Sad") == 0)
+ {
+ g_dbus_method_invocation_return_dbus_error (invocation,
+ "org.gtk.GDBus.Examples.ObjectManager.Error.SadAnimalIsSad",
+ "Sad animal is already sad");
+ goto out;
+ }
+
+ example_animal_set_mood (animal, "Sad");
+ example_animal_complete_poke (animal, invocation);
+ goto out;
+ }
+
+ if (make_happy)
+ {
+ if (g_strcmp0 (example_animal_get_mood (animal), "Happy") == 0)
+ {
+ g_dbus_method_invocation_return_dbus_error (invocation,
+ "org.gtk.GDBus.Examples.ObjectManager.Error.HappyAnimalIsHappy",
+ "Happy animal is already happy");
+ goto out;
+ }
+
+ example_animal_set_mood (animal, "Happy");
+ example_animal_complete_poke (animal, invocation);
+ goto out;
+ }
+
+ g_assert_not_reached ();
+
+ out:
+ return TRUE; /* to indicate that the method was handled */
+}
+
+
+static void
+on_bus_acquired (GDBusConnection *connection,
+ const gchar *name,
+ gpointer user_data)
+{
+ ExampleObjectSkeleton *object;
+ guint n;
+
+ g_print ("Acquired a message bus connection\n");
+
+ /* Create a new org.freedesktop.DBus.ObjectManager rooted at /example/Animals */
+ manager = g_dbus_object_manager_server_new ("/example/Animals");
+
+ for (n = 0; n < 10; n++)
+ {
+ gchar *s;
+ ExampleAnimal *animal;
+
+ /* Create a new D-Bus object at the path /example/Animals/N where N is 000..009 */
+ s = g_strdup_printf ("/example/Animals/%03d", n);
+ object = example_object_skeleton_new (s);
+ g_free (s);
+
+ /* Make the newly created object export the interface
+ * org.gtk.GDBus.Example.ObjectManager.Animal (note
+ * that @object takes its own reference to @animal).
+ */
+ animal = example_animal_skeleton_new ();
+ example_animal_set_mood (animal, "Happy");
+ example_object_skeleton_set_animal (object, animal);
+ g_object_unref (animal);
+
+ /* Cats are odd animals - so some of our objects implement the
+ * org.gtk.GDBus.Example.ObjectManager.Cat interface in addition
+ * to the .Animal interface
+ */
+ if (n % 2 == 1)
+ {
+ ExampleCat *cat;
+ cat = example_cat_skeleton_new ();
+ example_object_skeleton_set_cat (object, cat);
+ g_object_unref (cat);
+ }
+
+ /* Handle Poke() D-Bus method invocations on the .Animal interface */
+ g_signal_connect (animal,
+ "handle-poke",
+ G_CALLBACK (on_animal_poke),
+ NULL); /* user_data */
+
+ /* Export the object (@manager takes its own reference to @object) */
+ g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
+ g_object_unref (object);
+ }
+
+ /* Export all objects */
+ g_dbus_object_manager_server_set_connection (manager, connection);
+}
+
+static void
+on_name_acquired (GDBusConnection *connection,
+ const gchar *name,
+ gpointer user_data)
+{
+ g_print ("Acquired the name %s\n", name);
+}
+
+static void
+on_name_lost (GDBusConnection *connection,
+ const gchar *name,
+ gpointer user_data)
+{
+ g_print ("Lost the name %s\n", name);
+}
+
+
+gint
+main (gint argc, gchar *argv[])
+{
+ GMainLoop *loop;
+ guint id;
+
+ loop = g_main_loop_new (NULL, FALSE);
+
+ id = g_bus_own_name (G_BUS_TYPE_SESSION,
+ "org.gtk.GDBus.Examples.ObjectManager",
+ G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
+ G_BUS_NAME_OWNER_FLAGS_REPLACE,
+ on_bus_acquired,
+ on_name_acquired,
+ on_name_lost,
+ loop,
+ NULL);
+
+ g_main_loop_run (loop);
+
+ g_bus_unown_name (id);
+ g_main_loop_unref (loop);
+
+ return 0;
+}
Modified: desktop/unstable/glib2.0/debian/patches/0001-GDateTime-test-fix-occasional-failures.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/0001-GDateTime-test-fix-occasional-failures.patch?rev=46840&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/0001-GDateTime-test-fix-occasional-failures.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/0001-GDateTime-test-fix-occasional-failures.patch [utf-8] Mon Nov 2 20:43:03 2015
@@ -23,7 +23,8 @@
This is based on a similar patch from Iain Lane, but it uses
g_get_real_time() instead of g_get_current_time().
-https://bugzilla.gnome.org/show_bug.cgi?id=754994
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=754994
+Origin: upstream, 2.46.2, commit:d46166e6e9019d3a4456fb258fc95ee6202452a3
---
glib/tests/gdatetime.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Added: desktop/unstable/glib2.0/debian/patches/Build-gdbus-example-objectmanager-server-again.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/Build-gdbus-example-objectmanager-server-again.patch?rev=46840&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/Build-gdbus-example-objectmanager-server-again.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/Build-gdbus-example-objectmanager-server-again.patch [utf-8] Mon Nov 2 20:43:03 2015
@@ -0,0 +1,31 @@
+From 275c1d81b4ee6d1fc81c27f5d586df2d76cf8af9 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Mon, 2 Nov 2015 17:17:55 +0000
+Subject: [PATCH] Build gdbus-example-objectmanager-server again
+
+It was removed, apparently accidentally, in commit 5b48dc4.
+This had the side-effect that it wasn't included in tarball releases,
+which means that commit ab7b4be doesn't work when building a package.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=734469
+---
+ gio/tests/Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
+index 868873f..894cf43 100644
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
+@@ -375,6 +375,9 @@ gdbus_non_socket_SOURCES = \
+ uninstalled_test_extra_programs += gdbus-example-objectmanager-client
+ gdbus_example_objectmanager_client_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD)
+
++uninstalled_test_extra_programs += gdbus-example-objectmanager-server
++gdbus_example_objectmanager_server_LDADD = gdbus-object-manager-example/libgdbus-example-objectmanager.la $(LDADD)
++
+ test_extra_programs += gsubprocess-testprog
+
+ uninstalled_test_extra_programs += gdbus-test-fixture
+--
+2.6.2
+
Added: desktop/unstable/glib2.0/debian/patches/Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch?rev=46840&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch [utf-8] Mon Nov 2 20:43:03 2015
@@ -0,0 +1,82 @@
+From 59bfb6be5f91e36088ad4217a44c5f68d469bf81 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens at collabora.com>
+Date: Mon, 2 Nov 2015 09:36:47 -0500
+Subject: [PATCH 11/11] Doc: Fix missing glibconfig.h when builddir!=srcdir
+
+Currently the doc is incomplete when builddir!=srcdir
+(e.g. debian package) because glibconfig.h is generared from
+configure.ac and is thus missing from srcdir. This leads to
+missing doc for symbols like G_GINT64_FORMAT.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=734469
+Origin: upstream, 2.46.2, commit:59bfb6be5f91e36088ad4217a44c5f68d469bf81
+---
+ docs/reference/gio/Makefile.am | 7 ++++---
+ docs/reference/glib/Makefile.am | 11 ++++++++---
+ docs/reference/gobject/Makefile.am | 2 +-
+ 3 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index b17b50d..07fe6e6 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -13,10 +13,11 @@ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
+ --ignore-decorators="G_GNUC_WARN_UNUSED_RESULT"
+
+ # The directory containing the source code. Relative to $(srcdir)
+-DOC_SOURCE_DIR=$(top_srcdir)/gio
++DOC_SOURCE_DIR =$(top_srcdir)/gio $(top_builddir)/gio
+
+-BUILT_HFILES=gioenumtypes.h
+-HFILE_GLOB=$(top_srcdir)/gio/*.h
++HFILE_GLOB= \
++ $(top_srcdir)/gio/*.h \
++ $(top_builddir)/gio/gioenumtypes.h
+ CFILE_GLOB=$(top_srcdir)/gio/*.c
+
+ IGNORE_HFILES = \
+diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
+index 67de7fe..8dbb069 100644
+--- a/docs/reference/glib/Makefile.am
++++ b/docs/reference/glib/Makefile.am
+@@ -9,7 +9,9 @@ DOC_MODULE=glib
+ DOC_MAIN_SGML_FILE=glib-docs.xml
+
+ # The directory containing the source code. Relative to $(srcdir)
+-DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule
++DOC_SOURCE_DIR = \
++ $(top_srcdir)/glib $(top_srcdir)/gmodule \
++ $(top_builddir)/glib $(top_builddir)/gmodule
+
+ # Extra options to supply to gtkdoc-scan
+ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR|G_GNUC_WARN_UNUSED_RESULT"
+@@ -18,8 +20,11 @@ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLI
+ MKDB_OPTIONS=--output-format=xml --name-space=g
+
+ # Used for dependencies
+-HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h
+-CFILE_GLOB=$(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c
++HFILE_GLOB = \
++ $(top_srcdir)/glib/*.h \
++ $(top_srcdir)/gmodule/*.h \
++ $(top_builddir)/glib/glibconfig.h
++CFILE_GLOB= $(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c
+
+ # Ignore some private headers
+ IGNORE_HFILES = \
+diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
+index 1ca6158..50b239b 100644
+--- a/docs/reference/gobject/Makefile.am
++++ b/docs/reference/gobject/Makefile.am
+@@ -9,7 +9,7 @@ DOC_MODULE=gobject
+ DOC_MAIN_SGML_FILE=gobject-docs.xml
+
+ # The directory containing the source code. Relative to $(srcdir)
+-DOC_SOURCE_DIR=$(top_srcdir)/gobject
++DOC_SOURCE_DIR =$(top_srcdir)/gobject $(top_builddir)/gobject
+
+ # Extra options to supply to gtkdoc-scan
+ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
+--
+2.6.2
+
Added: desktop/unstable/glib2.0/debian/patches/Doc-copy-included-example-files.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/Doc-copy-included-example-files.patch?rev=46840&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/Doc-copy-included-example-files.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/Doc-copy-included-example-files.patch [utf-8] Mon Nov 2 20:43:03 2015
@@ -0,0 +1,93 @@
+From ab7b4bebe09f30fd441a2b3c879f7af5695761b3 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens at collabora.com>
+Date: Fri, 30 Oct 2015 14:59:11 -0400
+Subject: [PATCH 10/11] Doc: copy included example files
+
+This fix missing files when src_dir != build_dir.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=734469
+Origin: upstream, 2.46.2, commit:ab7b4bebe09f30fd441a2b3c879f7af5695761b3
+---
+ docs/reference/gio/Makefile.am | 19 ++++++++++++++++++-
+ docs/reference/gio/migrating-gdbus.xml | 10 +++++-----
+ 2 files changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
+index 64e227a..b17b50d 100644
+--- a/docs/reference/gio/Makefile.am
++++ b/docs/reference/gio/Makefile.am
+@@ -126,6 +126,22 @@ HTML_IMAGES = \
+ menu-example.png \
+ menu-model.png
+
++example_files = \
++ gdbus-example-objectmanager.xml \
++ gdbus-example-objectmanager-server.c \
++ gdbus-example-objectmanager-client.c \
++ gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml \
++ gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \
++ $(NULL)
++
++gdbus-example-objectmanager.xml: %: $(top_srcdir)/gio/tests/gdbus-object-manager-example/%
++gdbus-example-objectmanager-server.c: %: $(top_srcdir)/gio/tests/%
++gdbus-example-objectmanager-client.c: %: $(top_srcdir)/gio/tests/%
++gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml: %: $(top_builddir)/gio/tests/gdbus-object-manager-example/%
++gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml: %: $(top_builddir)/gio/tests/gdbus-object-manager-example/%
++$(example_files):
++ cp $< $@
++
+ content_files = \
+ version.xml \
+ overview.xml \
+@@ -141,6 +157,7 @@ content_files = \
+ gresource.xml \
+ gdbus.xml \
+ gdbus-codegen.xml \
++ $(example_files) \
+ $(NULL)
+
+ expand_content_files = \
+@@ -192,7 +209,7 @@ XSLTPROC_FLAGS = \
+ endif
+
+ CLEANFILES ?=
+-CLEANFILES += $(man_MANS)
++CLEANFILES += $(man_MANS) $(example_files)
+
+ EXTRA_DIST += $(man_MANS)
+
+diff --git a/docs/reference/gio/migrating-gdbus.xml b/docs/reference/gio/migrating-gdbus.xml
+index 423ad16..d46f98c 100644
+--- a/docs/reference/gio/migrating-gdbus.xml
++++ b/docs/reference/gio/migrating-gdbus.xml
+@@ -254,7 +254,7 @@ on_name_acquired (GDBusConnection *connection,
+ linkend="gdbus-codegen">gdbus-codegen</link></command> is used and like
+ its counterpart, it also takes D-Bus Introspection XML as input:
+ </para>
+- <example id="gdbus-example-codegen-input"><title>Example D-Bus Introspection XML</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager.xml"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
++ <example id="gdbus-example-codegen-input"><title>Example D-Bus Introspection XML</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../gdbus-example-objectmanager.xml"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
+ <para>
+ If this XML is processed like this
+ <informalexample><programlisting><![CDATA[
+@@ -291,14 +291,14 @@ gdbus-codegen --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ #ExampleObjectManagerClient pages for documentation.
+ </para>
+
+- <example id="gdbus-example-codegen-server"><title>Server-side application using generated code</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-example-objectmanager-server.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
++ <example id="gdbus-example-codegen-server"><title>Server-side application using generated code</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../gdbus-example-objectmanager-server.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
+
+- <example id="gdbus-example-codegen-client"><title>Client-side application using generated code</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-example-objectmanager-client.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
++ <example id="gdbus-example-codegen-client"><title>Client-side application using generated code</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../gdbus-example-objectmanager-client.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
+
+ </section>
+
+- <xi:include href="../../../../gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml"/>
+- <xi:include href="../../../../gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml"/>
++ <xi:include href="../gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml"/>
++ <xi:include href="../gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml"/>
+ <xi:include href="../gdbus-object-manager-example/xml/ExampleAnimal.xml"/>
+ <xi:include href="../gdbus-object-manager-example/xml/ExampleCat.xml"/>
+ <xi:include href="../gdbus-object-manager-example/xml/ExampleObject.xml"/>
+--
+2.6.2
+
Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=46840&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Mon Nov 2 20:43:03 2015
@@ -13,3 +13,6 @@
skip-broken-timer-test.patch
0001-Fix-trashing-on-overlayfs.patch
0001-GDateTime-test-fix-occasional-failures.patch
+Doc-copy-included-example-files.patch
+Doc-Fix-missing-glibconfig.h-when-builddir-srcdir.patch
+Build-gdbus-example-objectmanager-server-again.patch
Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=46840&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Mon Nov 2 20:43:03 2015
@@ -108,6 +108,9 @@
pre-build::
mkdir -p debian/stamp-makefile-check \
debian/tmp-xdg-runtime-dir
+ # this file was missed out of tarballs upstream
+ test -e gio/tests/gdbus-example-objectmanager-server.c || \
+ cp debian/gdbus-example-objectmanager-server.c gio/tests/
binary-install/libglib2.0-0::
set -e; for script in postinst postrm; do \
More information about the pkg-gnome-commits
mailing list