r30717 - in /packages/unstable/gamin/debian: changelog patches/17_deprecated_const_return.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Oct 18 14:12:20 2011
New Revision: 30717

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30717
Log:
Add 17_deprecated_const_return.patch: Don't use deprecated G_CONST_RETURN.
Fixes building with newer glib versions.

Added:
    packages/unstable/gamin/debian/patches/17_deprecated_const_return.patch
Modified:
    packages/unstable/gamin/debian/changelog
    packages/unstable/gamin/debian/patches/series

Modified: packages/unstable/gamin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/changelog?rev=30717&op=diff
==============================================================================
--- packages/unstable/gamin/debian/changelog [utf-8] (original)
+++ packages/unstable/gamin/debian/changelog [utf-8] Tue Oct 18 14:12:20 2011
@@ -1,3 +1,10 @@
+gamin (0.1.10-4) UNRELEASED; urgency=low
+
+  * Add 17_deprecated_const_return.patch: Don't use deprecated G_CONST_RETURN.
+    Fixes building with newer glib versions.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 18 Oct 2011 16:10:17 +0200
+
 gamin (0.1.10-3) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Added: packages/unstable/gamin/debian/patches/17_deprecated_const_return.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/patches/17_deprecated_const_return.patch?rev=30717&op=file
==============================================================================
--- packages/unstable/gamin/debian/patches/17_deprecated_const_return.patch (added)
+++ packages/unstable/gamin/debian/patches/17_deprecated_const_return.patch [utf-8] Tue Oct 18 14:12:20 2011
@@ -1,0 +1,56 @@
+Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
+Author: Matthias Klose <doko at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/829504
+
+Index: gamin/server/gam_node.c
+===================================================================
+--- gamin.orig/server/gam_node.c	2011-10-18 16:09:04.873780685 +0200
++++ gamin/server/gam_node.c	2011-10-18 16:09:01.965780543 +0200
+@@ -122,7 +122,7 @@
+  * it has finished with the string.  If it must keep it longer, it
+  * should makes its own copy.  The returned string must not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+     g_assert(node);
+Index: gamin/server/gam_node.h
+===================================================================
+--- gamin.orig/server/gam_node.h	2011-10-18 16:09:04.729780677 +0200
++++ gamin/server/gam_node.h	2011-10-18 16:09:01.961780544 +0200
+@@ -58,7 +58,7 @@
+ void                  gam_node_set_is_dir          (GamNode         *node,
+ 						   gboolean        is_dir);
+ 	
+-G_CONST_RETURN char  *gam_node_get_path            (GamNode         *node);
++const char  *gam_node_get_path            (GamNode         *node);
+ 
+ GList                *gam_node_get_subscriptions   (GamNode         *node);
+ 
+Index: gamin/server/gam_subscription.c
+===================================================================
+--- gamin.orig/server/gam_subscription.c	2011-10-18 16:09:04.817780682 +0200
++++ gamin/server/gam_subscription.c	2011-10-18 16:09:01.965780543 +0200
+@@ -141,7 +141,7 @@
+  * @param sub the GamSubscription
+  * @returns The path being monitored.  It should not be freed.
+  */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+     if (sub == NULL)
+Index: gamin/server/gam_subscription.h
+===================================================================
+--- gamin.orig/server/gam_subscription.h	2011-10-18 16:09:04.929780687 +0200
++++ gamin/server/gam_subscription.h	2011-10-18 16:09:01.965780543 +0200
+@@ -21,7 +21,7 @@
+ 
+ int                  gam_subscription_get_reqno    (GamSubscription *sub);
+ 
+-G_CONST_RETURN char *gam_subscription_get_path     (GamSubscription *sub);
++const char *gam_subscription_get_path     (GamSubscription *sub);
+ 
+ GamListener         *gam_subscription_get_listener (GamSubscription *sub);
+ 

Modified: packages/unstable/gamin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/patches/series?rev=30717&op=diff
==============================================================================
--- packages/unstable/gamin/debian/patches/series [utf-8] (original)
+++ packages/unstable/gamin/debian/patches/series [utf-8] Tue Oct 18 14:12:20 2011
@@ -1,4 +1,5 @@
 01_python_detection.patch
 15_kfreebsd.patch
 16_armel-gnueabi.patch
+17_deprecated_const_return.patch
 90_autoreconf.patch