r12353 - in /packages/unstable/gamin/debian: changelog control control.in patches/14_nfs-fix.patch rules

mbanck at users.alioth.debian.org mbanck at users.alioth.debian.org
Sun Aug 19 17:23:14 UTC 2007


Author: mbanck
Date: Sun Aug 19 17:23:13 2007
New Revision: 12353

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12353
Log:
Sync subversion repo back to actual package state

Added:
    packages/unstable/gamin/debian/patches/14_nfs-fix.patch
Modified:
    packages/unstable/gamin/debian/changelog
    packages/unstable/gamin/debian/control
    packages/unstable/gamin/debian/control.in
    packages/unstable/gamin/debian/rules

Modified: packages/unstable/gamin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/changelog?rev=12353&op=diff
==============================================================================
--- packages/unstable/gamin/debian/changelog (original)
+++ packages/unstable/gamin/debian/changelog Sun Aug 19 17:23:13 2007
@@ -1,8 +1,10 @@
-gamin (0.1.8-2) UNRELEASED; urgency=low
-
-  * Add a get-orig-source target to retrieve the upstream tarball.
-
- -- Loic Minier <lool at dooz.org>  Sat, 13 Jan 2007 23:53:28 +0100
+gamin (0.1.8-2) unstable; urgency=high
+
+  * debian/control: Improve long description. (Closes: #405347)
+  * debian/patches/14_nfs-fix.patch: Fix gam_server startup for Thunar.
+    Thanks to Maximiliano Curia. (Closes: #403247)
+
+ -- Michael Banck <mbanck at debian.org>  Fri, 23 Mar 2007 14:43:49 +0100
 
 gamin (0.1.8-1) unstable; urgency=low
 

Modified: packages/unstable/gamin/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/control?rev=12353&op=diff
==============================================================================
--- packages/unstable/gamin/debian/control (original)
+++ packages/unstable/gamin/debian/control Sun Aug 19 17:23:13 2007
@@ -12,8 +12,20 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, libgamin0 (= ${Source-Version})
 Conflicts: fam
 Description: File and directory monitoring system
- Gamin is a file and directory monitoring system defined to be a
- subset of the FAM (File Alteration Monitor) system.
+ Gamin is a file and directory monitoring system which allows
+ applications to detect when a file or a directory has been added,
+ removed or modified by somebody else.
+ .
+ It can be used by desktops like KDE, GNOME or XFCE to have their
+ virtual file systems keep track of changes to files and directories.
+ For example, if a file manager displays a directory to the user, and
+ the user removes one of the files via the command-line, gamin will
+ notify the file manager of this change so that it can update the
+ directory display.
+ .
+ Gamin has been designed as a drop-in replacement for FAM with security
+ and maintainability in mind and can use Linux's advanced inotify
+ service when available.
 
 Package: libgamin0
 Section: libs

Modified: packages/unstable/gamin/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/control.in?rev=12353&op=diff
==============================================================================
--- packages/unstable/gamin/debian/control.in (original)
+++ packages/unstable/gamin/debian/control.in Sun Aug 19 17:23:13 2007
@@ -12,8 +12,20 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, libgamin0 (= ${Source-Version})
 Conflicts: fam
 Description: File and directory monitoring system
- Gamin is a file and directory monitoring system defined to be a
- subset of the FAM (File Alteration Monitor) system.
+ Gamin is a file and directory monitoring system which allows
+ applications to detect when a file or a directory has been added,
+ removed or modified by somebody else.
+ .
+ It can be used by desktops like KDE, GNOME or XFCE to have their
+ virtual file systems keep track of changes to files and directories.
+ For example, if a file manager displays a directory to the user, and
+ the user removes one of the files via the command-line, gamin will
+ notify the file manager of this change so that it can update the
+ directory display.
+ .
+ Gamin has been designed as a drop-in replacement for FAM with security
+ and maintainability in mind and can use Linux's advanced inotify
+ service when available.
 
 Package: libgamin0
 Section: libs

Added: packages/unstable/gamin/debian/patches/14_nfs-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/patches/14_nfs-fix.patch?rev=12353&op=file
==============================================================================
--- packages/unstable/gamin/debian/patches/14_nfs-fix.patch (added)
+++ packages/unstable/gamin/debian/patches/14_nfs-fix.patch Sun Aug 19 17:23:13 2007
@@ -1,0 +1,82 @@
+diff -ruNa debian/gamin-0.1.8/server/gam_inotify.c gamin/server/gam_inotify.c
+--- debian/gamin-0.1.8/server/gam_inotify.c	2006-10-25 13:13:46.000000000 -0300
++++ gamin/server/gam_inotify.c	2007-03-29 20:53:03.000000000 -0300
+@@ -154,6 +154,7 @@
+ gboolean
+ gam_inotify_init (void)
+ {
++	gam_poll_basic_init ();
+ 	gam_server_install_kernel_hooks (GAMIN_K_INOTIFY2, 
+ 					 gam_inotify_add_subscription,
+ 					 gam_inotify_remove_subscription,
+diff -ruNa debian/gamin-0.1.8/server/gam_poll_basic.c gamin/server/gam_poll_basic.c
+--- debian/gamin-0.1.8/server/gam_poll_basic.c	2005-09-21 13:21:04.000000000 -0300
++++ gamin/server/gam_poll_basic.c	2007-03-29 20:53:03.000000000 -0300
+@@ -46,6 +46,8 @@
+ static GaminEventType gam_poll_basic_poll_file(GamNode * node);
+ static gboolean gam_poll_basic_scan_callback(gpointer data);
+ 
++static gboolean scan_callback_running = FALSE;
++
+ gboolean
+ gam_poll_basic_init ()
+ {
+@@ -56,7 +58,6 @@
+ 				       gam_poll_basic_remove_all_for,
+ 				       gam_poll_basic_poll_file);
+ 
+-	g_timeout_add(1000, gam_poll_basic_scan_callback, NULL);
+ 	GAM_DEBUG(DEBUG_INFO, "basic poll backend initialized\n");
+ 	return TRUE;
+ }
+@@ -116,6 +117,12 @@
+ 
+ 	gam_poll_generic_add (node);
+ 
++	if (!scan_callback_running)
++	{
++	  scan_callback_running = TRUE;
++	  g_timeout_add (1000, gam_poll_basic_scan_callback, NULL);
++	}
++	
+ 	GAM_DEBUG(DEBUG_INFO, "Poll: added subscription for %s\n", path);
+ 	return TRUE;
+ }
+@@ -356,6 +363,7 @@
+ gam_poll_basic_scan_callback(gpointer data)
+ {
+ 	int idx;
++	gboolean did_something = FALSE;
+ 
+ 	gam_poll_generic_update_time ();
+ 
+@@ -371,6 +379,8 @@
+ 
+ 		g_assert (node);
+ 
++		did_something = TRUE;
++		
+ 		if (node->is_dir) {
+ 			gam_poll_generic_scan_directory_internal(node);
+ 		} else {
+@@ -391,6 +401,8 @@
+ 
+ 		g_assert (node);
+ 
++		did_something = TRUE;
++		
+ #ifdef VERBOSE_POLL
+ 		GAM_DEBUG(DEBUG_INFO, "Checking missing file %s\n", node->path);
+ #endif
+@@ -412,5 +424,10 @@
+ 		}
+ 	}
+ 
++	if (!did_something) {
++	  scan_callback_running = FALSE;
++	  return FALSE;
++	}
++	
+ 	return TRUE;
+ }
+

Modified: packages/unstable/gamin/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gamin/debian/rules?rev=12353&op=diff
==============================================================================
--- packages/unstable/gamin/debian/rules (original)
+++ packages/unstable/gamin/debian/rules Sun Aug 19 17:23:13 2007
@@ -2,11 +2,6 @@
 
 # Gnome Team
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-
-# get-orig-source target
-GNOME_DOWNLOAD_URL = http://www.gnome.org/~veillard/gamin/sources/$(GNOME_TARBALL)
-
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk




More information about the pkg-gnome-commits mailing list