[Pkg-xfce-commits] r7500 - in goodies/trunk/xfburn: . debian debian/patches

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-22 05:39:29 +0000 (Wed, 22 May 2013)
New Revision: 7500

Added:
   goodies/trunk/xfburn/debian/patches/03_fix-missing-include.patch
Modified:
   goodies/trunk/xfburn/
   goodies/trunk/xfburn/debian/changelog
   goodies/trunk/xfburn/debian/patches/series
Log:
merge changes from experimental



Property changes on: goodies/trunk/xfburn
___________________________________________________________________
Modified: svn:mergeinfo
   - /goodies/branches/experimental/xfburn:4729-5247
   + /goodies/branches/experimental/xfburn:4729-5247,7024-7496

Modified: goodies/trunk/xfburn/debian/changelog
===================================================================
--- goodies/trunk/xfburn/debian/changelog	2013-05-22 05:36:04 UTC (rev 7499)
+++ goodies/trunk/xfburn/debian/changelog	2013-05-22 05:39:29 UTC (rev 7500)
@@ -1,3 +1,10 @@
+xfburn (0.4.3-6) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 03_fix-missing-include.patch: added, fix FTBFS with recent glib and
+      libxfce4util versions.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 19 May 2012 21:46:23 +0200
 xfburn (0.4.3-5) unstable; urgency=low
 
   * debian/patches:

Copied: goodies/trunk/xfburn/debian/patches/03_fix-missing-include.patch (from rev 7496, goodies/branches/experimental/xfburn/debian/patches/03_fix-missing-include.patch)
===================================================================
--- goodies/trunk/xfburn/debian/patches/03_fix-missing-include.patch	                        (rev 0)
+++ goodies/trunk/xfburn/debian/patches/03_fix-missing-include.patch	2013-05-22 05:39:29 UTC (rev 7500)
@@ -0,0 +1,15 @@
+Description: Fix build with newer glib and libxfce4util versions
+Author: David Mohr <david at mcbf.net>
+Origin: backport, http://git.xfce.org/apps/xfburn/commit/?id=b6470e6407bc4a72ebe5957aa59e589b2fc02903
+Forwarded: not-needed
+
+--- xfburn-0.4.3.orig/xfburn/xfburn-settings.h
++++ xfburn-0.4.3/xfburn/xfburn-settings.h
+@@ -24,6 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+ 
+ #include <glib.h>
++#include <glib-object.h>
+ 
+ G_BEGIN_DECLS
+ 

Modified: goodies/trunk/xfburn/debian/patches/series
===================================================================
--- goodies/trunk/xfburn/debian/patches/series	2013-05-22 05:36:04 UTC (rev 7499)
+++ goodies/trunk/xfburn/debian/patches/series	2013-05-22 05:39:29 UTC (rev 7500)
@@ -2,3 +2,4 @@
 xfburn-ui.patch
 es-translation-update.patch
 0001-Don-t-check-source-file-for-user-created-directories.patch
+03_fix-missing-include.patch