[Pkg-cli-apps-commits] [SCM] sparkleshare branch, master, updated. debian/0.8.4-1-4-g6423c35
Carlos Martín Nieto
carlos at cmartin.tk
Tue Jun 26 21:32:26 UTC 2012
The following commit has been merged in the master branch:
commit 02f9752cf81517521e598606243409a2eb21d577
Author: Carlos Martín Nieto <carlos at cmartin.tk>
Date: Tue Jun 26 23:20:59 2012 +0200
debian/patches: Remove both patches
They are now upstream.
diff --git a/debian/patches/0001-Don-t-call-update-desktop-database-from-the-Makefile.patch b/debian/patches/0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
deleted file mode 100644
index ef8249e..0000000
--- a/debian/patches/0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Carlos Martín Nieto <carlos at cmartin.tk>
-Date: Sun, 22 Apr 2012 19:52:57 +0200
-Subject: Don't call update-desktop-database from the Makefile
-
-Triggers take care of that when installing
----
- SparkleShare/Makefile.am | 6 +++---
- SparkleShare/Makefile.in | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
-index 26452b7..dbbd42e 100755
---- a/SparkleShare/Makefile.am
-+++ b/SparkleShare/Makefile.am
-@@ -24,6 +24,6 @@ SOURCES = \
-
- include $(top_srcdir)/build/build.mk
-
--install-data-hook:
-- update-desktop-database $(datadir)/applications
-- echo "Installed protocol handler sparkleshare://"
-+#install-data-hook:
-+# update-desktop-database $(datadir)/applications
-+# echo "Installed protocol handler sparkleshare://"
-diff --git a/SparkleShare/Makefile.in b/SparkleShare/Makefile.in
-index 20e1922..4ec0d7f 100644
---- a/SparkleShare/Makefile.in
-+++ b/SparkleShare/Makefile.in
-@@ -785,9 +785,9 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
- cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
- fi;
-
--install-data-hook:
-- update-desktop-database $(datadir)/applications
-- echo "Installed protocol handler sparkleshare://"
-+#install-data-hook:
-+# update-desktop-database $(datadir)/applications
-+# echo "Installed protocol handler sparkleshare://"
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---
-1.7.10.rc0.17.g74595
-
diff --git a/debian/patches/0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch b/debian/patches/0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
deleted file mode 100644
index ecacf11..0000000
--- a/debian/patches/0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Hylke Bons <hbons at thinkpad.(none)>
-Date: Thu, 17 May 2012 23:09:18 +0100
-Subject: Fix event log not loading on Ubuntu. Closes #729
-
----
- SparkleShare/Linux/SparkleEventLog.cs | 36 ++++++++++++++---------------
- SparkleShare/SparkleEventLogController.cs | 3 +++
- 2 files changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs
-index 12c76e5..e0da807 100755
---- a/SparkleShare/Linux/SparkleEventLog.cs
-+++ b/SparkleShare/Linux/SparkleEventLog.cs
-@@ -40,7 +40,6 @@ namespace SparkleShare {
- private ScrolledWindow scrolled_window;
- private WebView web_view;
- private SparkleSpinner spinner;
-- private string link_status;
-
-
- // Short alias for the translations
-@@ -89,18 +88,8 @@ namespace SparkleShare {
- Editable = false
- };
-
-- this.web_view.HoveringOverLink += delegate (object o, WebKit.HoveringOverLinkArgs args) {
-- this.link_status = args.Link;
-- };
--
-- this.web_view.NavigationRequested += delegate (object o, WebKit.NavigationRequestedArgs args) {
-- if (args.Request.Uri == this.link_status)
-- Controller.LinkClicked (args.Request.Uri);
-
-- // Don't follow HREFs (as this would cause a page refresh)
-- if (!args.Request.Uri.Equals ("file:"))
-- args.RetVal = 1;
-- };
-+ this.web_view.NavigationRequested += WebViewNavigationRequested;
-
- this.scrolled_window.Add (this.web_view);
- this.content_wrapper.Add (this.spinner);
-@@ -170,6 +159,15 @@ namespace SparkleShare {
- });
- };
- }
-+
-+
-+ private void WebViewNavigationRequested (object o, WebKit.NavigationRequestedArgs args) {
-+ Controller.LinkClicked (args.Request.Uri.Substring (7));
-+
-+ // Don't follow HREFs (as this would cause a page refresh)
-+ if (!args.Request.Uri.Equals ("file:"))
-+ args.RetVal = 1;
-+ }
-
-
- public void UpdateChooser (string [] folders)
-@@ -260,21 +258,23 @@ namespace SparkleShare {
- html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
-
- html = html.Replace ("<!-- $document-added-background-image -->",
-- "file://" + IO.Path.Combine (icons_path + "document-added.png"));
--
-+ "file://" + IO.Path.Combine (icons_path, "document-added.png"));
-+
- html = html.Replace ("<!-- $document-edited-background-image -->",
-- "file://" + IO.Path.Combine (icons_path + "document-edited.png"));
-+ "file://" + IO.Path.Combine (icons_path, "document-edited.png"));
-
- html = html.Replace ("<!-- $document-deleted-background-image -->",
-- "file://" + IO.Path.Combine (icons_path + "document-deleted.png"));
-+ "file://" + IO.Path.Combine (icons_path, "document-deleted.png"));
-
- html = html.Replace ("<!-- $document-moved-background-image -->",
-- "file://" + IO.Path.Combine (icons_path + "document-moved.png"));
-+ "file://" + IO.Path.Combine (icons_path, "document-moved.png"));
-
-
- Application.Invoke (delegate {
- this.spinner.Stop ();
-- this.web_view.LoadString (html, null, null, "file://");
-+ this.web_view.NavigationRequested -= WebViewNavigationRequested;
-+ this.web_view.LoadHtmlString (html, "file://");
-+ this.web_view.NavigationRequested += WebViewNavigationRequested;
- this.content_wrapper.Remove (this.content_wrapper.Child);
- this.content_wrapper.Add (this.scrolled_window);
- this.content_wrapper.ShowAll ();
-diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
-index ea8a248..53606a3 100755
---- a/SparkleShare/SparkleEventLogController.cs
-+++ b/SparkleShare/SparkleEventLogController.cs
-@@ -199,9 +199,12 @@ namespace SparkleShare {
-
- public void LinkClicked (string url)
- {
-+ url = url.Replace ("%20", " ");
-+
- if (url.StartsWith (Path.VolumeSeparatorChar.ToString ()) ||
- url.Substring (1, 1).Equals (":")) {
-
-+ Console.WriteLine ("opening " + url);
- Program.Controller.OpenFile (url);
- }
- }
---
-1.7.10.2.1.g8c77c3c
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4ac163b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
-0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
--
sparkleshare
More information about the Pkg-cli-apps-commits
mailing list