r23525 - in /desktop/unstable/gnome-user-share/debian: changelog control control.in patches/03_NAUTILUS_IS_USER_SHARE.patch patches/series

[dktrkranz at users.alioth.debian.org]

Author: dktrkranz
Date: Sun Apr  4 16:23:40 2010
New Revision: 23525

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23525
Log:
* debian/patches/03_NAUTILUS_IS_USER_SHARE.patch:
  - Fix use of undefined macro NAUTILUS_IS_SHARE.

Added:
    desktop/unstable/gnome-user-share/debian/patches/03_NAUTILUS_IS_USER_SHARE.patch
Modified:
    desktop/unstable/gnome-user-share/debian/changelog
    desktop/unstable/gnome-user-share/debian/control
    desktop/unstable/gnome-user-share/debian/control.in
    desktop/unstable/gnome-user-share/debian/patches/series

Modified: desktop/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/changelog?rev=23525&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog [utf-8] Sun Apr  4 16:23:40 2010
@@ -1,4 +1,4 @@
-gnome-user-share (2.30.0-1) UNRELEASED; urgency=low
+gnome-user-share (2.30.0-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * debian/watch:
@@ -11,11 +11,13 @@
     - 90_relibtoolize.patch
   * debian/patches/03_makefile_error.patch:
     - Removed, fixed upstream.
+  * debian/patches/03_NAUTILUS_IS_USER_SHARE.patch:
+    - Fix use of undefined macro NAUTILUS_IS_SHARE.
   * debian/control.in:
     - Build-depend on libnautilus-extension-dev.
     - Bump Standards-Version to 3.8.4, no changes required.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 03 Apr 2010 18:24:34 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 04 Apr 2010 18:05:30 +0200
 
 gnome-user-share (2.28.2-4) unstable; urgency=low
 

Modified: desktop/unstable/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control?rev=23525&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/control [utf-8] Sun Apr  4 16:23:40 2010
@@ -27,7 +27,7 @@
                libselinux1-dev | not+linux-gnu,
                libgnome-bluetooth-dev (>= 2.27.7.2) | not+linux-gnu,
                libunique-dev,
-               libnautilus-extension-dev (>= 2.30.0)
+               libnautilus-extension-dev
 Standards-Version: 3.8.4
 
 Package: gnome-user-share

Modified: desktop/unstable/gnome-user-share/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control.in?rev=23525&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/control.in [utf-8] Sun Apr  4 16:23:40 2010
@@ -22,7 +22,7 @@
                libselinux1-dev | not+linux-gnu,
                libgnome-bluetooth-dev (>= 2.27.7.2) | not+linux-gnu,
                libunique-dev,
-               libnautilus-extension-dev (>= 2.30.0)
+               libnautilus-extension-dev
 Standards-Version: 3.8.4
 
 Package: gnome-user-share

Added: desktop/unstable/gnome-user-share/debian/patches/03_NAUTILUS_IS_USER_SHARE.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/03_NAUTILUS_IS_USER_SHARE.patch?rev=23525&op=file
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/03_NAUTILUS_IS_USER_SHARE.patch (added)
+++ desktop/unstable/gnome-user-share/debian/patches/03_NAUTILUS_IS_USER_SHARE.patch [utf-8] Sun Apr  4 16:23:40 2010
@@ -1,0 +1,15 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=614817
+
+Index: gnome-user-share-2.30.0/src/share-extension.c
+===================================================================
+--- gnome-user-share-2.30.0.orig/src/share-extension.c	2010-04-04 18:02:20.608291778 +0200
++++ gnome-user-share-2.30.0/src/share-extension.c	2010-04-04 18:03:06.900291737 +0200
+@@ -208,7 +208,7 @@
+         NautilusUserShare *share;
+ 
+         g_return_if_fail (object != NULL);
+-        g_return_if_fail (NAUTILUS_IS_SHARE (object));
++        g_return_if_fail (NAUTILUS_IS_USER_SHARE (object));
+ 
+         share = NAUTILUS_USER_SHARE (object);
+ 

Modified: desktop/unstable/gnome-user-share/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/series?rev=23525&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/series [utf-8] Sun Apr  4 16:23:40 2010
@@ -1,3 +1,4 @@
 01_apache-config.patch
 02_bluetooth_optional.patch
+03_NAUTILUS_IS_USER_SHARE.patch
 90_relibtoolize.patch