Merge lp:~dobey/ubuntu/raring/gtk-doc/fix-type-init into lp:ubuntu/raring/gtk-doc

[dobey]

[Martin Pitt (pitti)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-19 07:23:56 +0000
+++ debian/changelog	2013-01-23 23:25:27 +0000
@@ -1,3 +1,12 @@
+gtk-doc (1.18-2ubuntu2) raring; urgency=low
+
+  * debian/patches/01_type_init.patch:
+    - Generate code to deal with g_type_init being deprecated. (LP: #1103744)
+  * debian/control.in:
+    - Update standards version to 3.9.4.
+
+ -- Rodney Dawes <[e-mail]>  Wed, 23 Jan 2013 18:15:32 -0500
+
 gtk-doc (1.18-2ubuntu1) precise; urgency=low
 
   * Merge with Debian unstable. Remaining Ubuntu changes:

=== modified file 'debian/control'
--- debian/control	2012-03-19 07:23:56 +0000
+++ debian/control	2013-01-23 23:25:27 +0000
@@ -9,7 +9,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Loic Minier <[e-mail]>
 Uploaders: Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Sebastian Dröge <[e-mail]>, Sjoerd Simons <[e-mail]>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Build-Depends: cdbs,
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),

=== modified file 'debian/control.in'
--- debian/control.in	2012-03-19 07:23:56 +0000
+++ debian/control.in	2013-01-23 23:25:27 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Loic Minier <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Build-Depends: cdbs,
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),

=== added file 'debian/patches/01_type_init.patch'
--- debian/patches/01_type_init.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_type_init.patch	2013-01-23 23:25:27 +0000
@@ -0,0 +1,16 @@
+=== modified file 'gtkdoc-scangobj.in'
+--- old/gtkdoc-scangobj.in	2012-03-19 07:23:56 +0000
++++ new/gtkdoc-scangobj.in	2013-01-23 23:07:13 +0000
+@@ -38,7 +38,10 @@ my $OUTPUT_DIR;
+ my $VERBOSE;
+ my $PRINT_VERSION;
+ my $PRINT_HELP;
+-my $TYPE_INIT_FUNC="g_type_init(); g_type_class_ref(G_TYPE_OBJECT)";
++my $TYPE_INIT_FUNC="#ifndef GLIB_VERSION_2_36
++    g_type_init();
++#endif
++    g_type_class_ref(G_TYPE_OBJECT)";
+ my $QUERY_CHILD_PROPERTIES;
+ 
+ # --nogtkinit is deprecated, as it is the default now anyway.
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-19 07:23:56 +0000
+++ debian/patches/series	2013-01-23 23:25:27 +0000
@@ -0,0 +1,1 @@
+01_type_init.patch