[Pkg-mono-svn-commits] rev 2942 - in non-group/gshare/trunk/debian: . patches

Sebastian Dröge slomo at alioth.debian.org
Wed Feb 7 06:54:57 CET 2007


Author: slomo
Date: 2007-02-07 06:54:56 +0100 (Wed, 07 Feb 2007)
New Revision: 2942

Removed:
   non-group/gshare/trunk/debian/patches/01_delegate-ftbfs.patch
Modified:
   non-group/gshare/trunk/debian/changelog
   non-group/gshare/trunk/debian/control
   non-group/gshare/trunk/debian/rules
Log:
* update gshare to 0.93-1


Modified: non-group/gshare/trunk/debian/changelog
===================================================================
--- non-group/gshare/trunk/debian/changelog	2007-02-06 07:46:41 UTC (rev 2941)
+++ non-group/gshare/trunk/debian/changelog	2007-02-07 05:54:56 UTC (rev 2942)
@@ -1,9 +1,26 @@
+gshare (0.93-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Update build dependencies
+    + Update to use my debian.org address
+  * debian/patches/01_delegate-ftbfs.patch,
+    debian/patches/02_fr.po.patch:
+    + Dropped, merged upstream
+  * debian/rules:
+    + Remove /var/scrollkeeper
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed,  7 Feb 2007 06:12:49 +0100
+
 gshare (0.92-2) unstable; urgency=low
 
+  * debian/patches/02_fr.po.patch:
+    + Update french translation. Thanks to Julien Valroff <julien at kirya.net>
+      for the patch (Closes: #381175)
   * debian/control:
-    + Updated to use my debian.org mail address
+    + Add missing Depends on avahi-daemon (Closes: #381340)
 
- -- Sebastian Dröge <slomo at debian.org>  Mon,  8 Jan 2007 01:18:51 +0100
+ -- Sebastian Dröge <slomo at ubuntu.com>  Tue, 15 Aug 2006 19:31:10 +0200
 
 gshare (0.92-1) unstable; urgency=low
 

Modified: non-group/gshare/trunk/debian/control
===================================================================
--- non-group/gshare/trunk/debian/control	2007-02-06 07:46:41 UTC (rev 2941)
+++ non-group/gshare/trunk/debian/control	2007-02-07 05:54:56 UTC (rev 2942)
@@ -2,12 +2,12 @@
 Section: gnome
 Priority: optional
 Maintainer: Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, cli-common-dev (>= 0.4.0), libmono-dev (>= 1.1.10), mono-mcs (>= 1.0) | c-sharp-compiler, libmono1.0-cil, libgtk2.0-cil (>= 2.8), libgconf2.0-cil (>= 2.8), libglade2.0-cil (>= 2.6), libgnome2.0-cil (>= 2.8), libdbus-1-cil (>= 0.60), libavahi1.0-cil (>= 0.6.9), pkg-config, intltool (>= 0.23)
+Build-Depends: debhelper (>= 5), cdbs, cli-common-dev (>= 0.4.4), libmono-dev (>= 1.1.10), mono-mcs (>= 1.0) | c-sharp-compiler, libmono1.0-cil, libgtk2.0-cil (>= 2.8), libgconf2.0-cil (>= 2.8), libglade2.0-cil (>= 2.6), libgnome2.0-cil (>= 2.8), libdbus-1-cil (>= 0.60), libavahi1.0-cil (>= 0.6.5), pkg-config, intltool (>= 0.23), scrollkeeper
 Standards-Version: 3.7.2
 
 Package: gshare
 Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
+Depends: ${cli:Depends}, ${misc:Depends}, avahi-daemon
 Description: Easy user-level file sharing for GNOME
  GShare is a small GNOME application that allows easy user-level file sharing
  via FTP. DNS-SD is used to publish the share on the local network.

Deleted: non-group/gshare/trunk/debian/patches/01_delegate-ftbfs.patch
===================================================================
--- non-group/gshare/trunk/debian/patches/01_delegate-ftbfs.patch	2007-02-06 07:46:41 UTC (rev 2941)
+++ non-group/gshare/trunk/debian/patches/01_delegate-ftbfs.patch	2007-02-07 05:54:56 UTC (rev 2942)
@@ -1,85 +0,0 @@
---- src/gshared/daemon.cs.old	2006-07-22 20:29:12.206476750 +0200
-+++ src/gshared/daemon.cs	2006-07-22 20:44:49.065026750 +0200
-@@ -308,11 +308,11 @@
-             if (reason == FTPServerShutdownReason.Error)
-             {
-                 Log.ErrorMessage("Shutting down FTP server because of an error");
--                Utility.InvokeLater(delegate
-+                Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                     { 
-                         Utility.ShowGenericFatalErrorDialog(); 
-                         Shutdown(); 
--                    });
-+                    }));
-             }
-         }
-         
-@@ -367,24 +367,24 @@
-             {
-                 case ClientState.Collision:
-                     /*TODO figure out what to do*/
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         { 
-                             StopDaemon();
--                        });
-+                        }));
-                     break;
-                 case ClientState.Failure:
-                     Log.ErrorMessage("Zeroconf client failed to register");
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             Utility.ShowCannotPublishServiceDialog(); 
-                             Shutdown(); 
--                        });
-+                        }));
-                     break;
-                 case ClientState.Running:
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             PublishFTPServer(); 
--                        });
-+                        }));
-                     break;
-             }
- 
-@@ -410,19 +410,19 @@
-                         iAvahiServiceName = EntryGroup.GetAlternativeServiceName(iAvahiServiceName);
-                     }
-                     
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             StartZeroConf(iFtpServer.ServerPort);
--                        });
-+                        }));
-                     
-                     break;
-                 case EntryGroupState.Failure:
-                     Log.ErrorMessage("Failed to publish FTP service on zeroconf network");
--                    Utility.InvokeLater(delegate
-+                    Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate
-                         {
-                             Utility.ShowCannotPublishServiceDialog();
-                             Shutdown(); 
--                        });
-+                        }));
-                     break;
- 
-                 case EntryGroupState.Established:
-@@ -460,11 +460,11 @@
-                                     ex.Message,
-                                     ex.StackTrace);
-                                 
--                Utility.InvokeLater(delegate 
-+                Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate 
-                     {
-                         Utility.ShowCannotPublishServiceDialog(); 
-                         Shutdown(); 
--                    });
-+                    }));
-                 
-             }
- 

Modified: non-group/gshare/trunk/debian/rules
===================================================================
--- non-group/gshare/trunk/debian/rules	2007-02-06 07:46:41 UTC (rev 2941)
+++ non-group/gshare/trunk/debian/rules	2007-02-07 05:54:56 UTC (rev 2942)
@@ -7,6 +7,8 @@
 export MONO_SHARED_DIR=$(CURDIR)
 
 install/gshare::
+	# remove scrollkeeper stuff
+	rm -rf debian/gshare/var
 	# fix permissions of CIL binaries
 	-find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
 	-find debian/ -type f -name "*.exe" | xargs chmod +x




More information about the Pkg-mono-svn-commits mailing list