[Pkg-cli-apps-commits] [sparkleshare] 01/04: Add more changes from the upstream.
Andrew Shadura
bugzilla at tut.by
Sat May 14 11:39:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
andrewsh pushed a commit to branch master
in repository sparkleshare.
commit ef98655883e61065496146322f27f2828901a9e8
Author: Andrew Shadura <andrew.shadura at collabora.co.uk>
Date: Tue May 10 18:13:56 2016 +0100
Add more changes from the upstream.
---
debian/dirs | 1 +
debian/install | 1 +
debian/patches/05-changes-from-master.patch | 208 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 211 insertions(+)
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..d5c61ee
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+/usr/share/metainfo/
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..cfea0c8
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+SparkleShare/Linux/sparkleshare.appdata.xml /usr/share/metainfo/
diff --git a/debian/patches/05-changes-from-master.patch b/debian/patches/05-changes-from-master.patch
new file mode 100644
index 0000000..3c7b566
--- /dev/null
+++ b/debian/patches/05-changes-from-master.patch
@@ -0,0 +1,208 @@
+From fdfb44aa0103bf6d02bef1c834f7961a391183c6 Mon Sep 17 00:00:00 2001
+From: Hylke Bons <hylkebons at gmail.com>
+Date: Mon, 4 Jan 2016 18:56:14 +0000
+Subject: [PATCH 1/8] Update Authors.txt
+
+---
+ legal/Authors.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/legal/Authors.txt b/legal/Authors.txt
+index b15e2ec..186ac29 100755
+--- a/legal/Authors.txt
++++ b/legal/Authors.txt
+@@ -12,7 +12,7 @@ Code:
+ Chris Magee <chris.magee at gametheworld.com>
+ Gabriel Burt <gabriel.burt at gmail.com>
+ Garrett LeSage <garrett at novell.com>
+- Hylke Bons <hylkebons at gmail.com>
++ Hylke Bons <hi at planetpeanut.uk>
+ Jonathan Haines <jonno.haines at gmail.com>
+ Kristi Tsukida <kristi.tsukida at gmail.com>
+ Konstantinos Vaggelakos <kozze89 at gmail.com>
+@@ -39,7 +39,7 @@ Design:
+
+ Andreas Nilsson <andreasn at gnome.org>
+ Jakub Steiner <jimmac at redhat.com>
+- Hylke Bons <hylkebons at gmail.com>
++ Hylke Bons <hi at planetpeanut.uk>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Sam Hewitt <hewittsamuel at gmail.com>
+
+
+From 8eb0eb3f2caffe093ea26607add816838bd2857b Mon Sep 17 00:00:00 2001
+From: Hylke Bons <hylkebons at gmail.com>
+Date: Tue, 26 Jan 2016 02:44:33 +0000
+Subject: [PATCH 2/8] windows setup: Keep cool on errors
+
+---
+ SparkleShare/Windows/SparkleSetup.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs
+index d51d69e..cbf306b 100644
+--- a/SparkleShare/Windows/SparkleSetup.cs
++++ b/SparkleShare/Windows/SparkleSetup.cs
+@@ -509,7 +509,7 @@ public SparkleSetup ()
+
+ help_block.Inlines.Add (new Bold (new Run (Controller.PreviousUrl)));
+ help_block.Inlines.Add (" is the address we’ve compiled. Does this look alright?\n\n");
+- help_block.Inlines.Add ("Is this computer’s Client ID known by the host??");
++ help_block.Inlines.Add ("Is this computer’s Client ID known by the host?");
+
+ if (warnings.Length > 0) {
+ bullets_block.Text += "\n\n•";
+
+From 555591ef0619fb3155e359d46fdcdf47a81fb1bf Mon Sep 17 00:00:00 2001
+From: Hylke Bons <hylkebons at gmail.com>
+Date: Tue, 26 Jan 2016 03:26:13 +0000
+Subject: [PATCH 3/8] event log: Disable plugins in WebView. Fixes #1638
+
+---
+ SparkleShare/Linux/SparkleEventLog.cs | 1 +
+ SparkleShare/Mac/SparkleEventLog.cs | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs
+index db6ff3f..8fcac27 100755
+--- a/SparkleShare/Linux/SparkleEventLog.cs
++++ b/SparkleShare/Linux/SparkleEventLog.cs
+@@ -70,6 +70,7 @@ public SparkleEventLog () : base ("Recent Changes")
+ new Gdk.RGBA () { Red = 1, Green = 1, Blue=1, Alpha = 1 });
+
+ this.web_view = new WebView () { Editable = false };
++ this.web_view.Settings.EnablePlugins = false;
+ this.web_view.NavigationRequested += WebViewNavigationRequested;
+
+ this.scrolled_window.Add (this.web_view);
+diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs
+index 6ea3c73..6859e1f 100755
+--- a/SparkleShare/Mac/SparkleEventLog.cs
++++ b/SparkleShare/Mac/SparkleEventLog.cs
+@@ -76,6 +76,8 @@ public SparkleEventLog () : base ()
+ new SizeF (ContentView.Frame.Width, ContentView.Frame.Height - 39))
+ };
+
++ this.web_view.Preferences.PlugInsEnabled = false;
++
+ this.cover = new NSBox () {
+ Frame = new RectangleF (
+ new PointF (-1, -1),
+
+From 101a29552f87ad36423cfc80c402f8e5f7eefcaa Mon Sep 17 00:00:00 2001
+From: Hylke Bons <hylkebons at gmail.com>
+Date: Wed, 27 Jan 2016 13:50:56 +0000
+Subject: [PATCH 4/8] linux: Update app data spec
+
+---
+ SparkleShare/Linux/sparkleshare.appdata.xml | 26 ---------------------
+ .../Linux/sparkleshare.desktop.appdata.xml | 27 ++++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 26 deletions(-)
+ delete mode 100644 SparkleShare/Linux/sparkleshare.appdata.xml
+ create mode 100644 SparkleShare/Linux/sparkleshare.desktop.appdata.xml
+
+diff --git a/SparkleShare/Linux/sparkleshare.desktop.appdata.xml b/SparkleShare/Linux/sparkleshare.desktop.appdata.xml
+new file mode 100644
+index 0000000..6df28d1
+--- /dev/null
++++ b/SparkleShare/Linux/sparkleshare.desktop.appdata.xml
+@@ -0,0 +1,27 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop">
++ <id type="desktop">sparkleshare.desktop</id>
++ <metadata_licence>CC0-1.0</metadata_licence>
++ <project_license>GPL-3.0</project_license>
++ <name>SparkleShare</name>
++ <summary>Self hosted, instant, secure file sync</summary>
++ <description>
++ <p>SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or "projects") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file.</p>
++ <p>SparkleShare was made to cover certain use cases, but doesn't handle every scenario well. To help you decide if SparkleShare is right for you, here's a few examples of what it does well and less well:</p>
++ <p>Great:</p>
++ <ul>
++ <li>Frequently changing project files, like text, office documents, and images</li>
++ <li>Tracking and syncing files edited by multiple people</li>
++ <li>Reverting a file to any point in its history</li>
++ <li>Preventing spying on your files on the server using encryption</li>
++ </ul>
++ <p>Not so great:</p>
++ <ul>
++ <li>Full computer backups</li>
++ <li>Storing your photo or music collection</li>
++ <li>Large binary files that change often, like video editing projects</li>
++ </ul>
++ <p>Have fun!</p>
++ </description>
++ <url type="homepage">http://www.sparkleshare.org/</url>
++</component>
+
+From aaed7c8e884b587f5278cea373db0c68f288cbce Mon Sep 17 00:00:00 2001
+From: payalord <payalord at gmail.com>
+Date: Fri, 29 Jan 2016 17:21:50 -0500
+Subject: [PATCH 6/8] Corrected msysGit link
+
+Old link(http://msysgit.github.io/) redirects to Git 2.x now, and there is issue to run SparkleShare with it. SparkleShare works fine with Git 1.x
+"Git for Windows 1.x was retired on August 18th, 2015, superseded by Git for Windows 2.x": https://github.com/msysgit/msysgit
+---
+ SparkleShare/Windows/README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SparkleShare/Windows/README.md b/SparkleShare/Windows/README.md
+index 17ff4a6..e53fdf8 100644
+--- a/SparkleShare/Windows/README.md
++++ b/SparkleShare/Windows/README.md
+@@ -6,7 +6,7 @@ You can choose to build SparkleShare from source or to run the Windows installer
+
+ Install version 4.0 of the [.NET Framework](http://www.microsoft.com/download/en/details.aspx?id=17851) if you haven't already.
+
+-Install [msysGit](http://msysgit.github.io/) and copy the contents of the install folder
++Install [msysGit](https://github.com/msysgit/msysgit/releases) and copy the contents of the install folder
+ (`C:\Program Files (x86)\Git` by default) to `C:\path\to\SparkleShare-sources\bin\msysgit\` (create the "bin"-folder in the SparkleShare source directory).
+
+ Open a command prompt and execute the following:
+
+From fc1368ba1bafbcc400b4ae2cae1e084d00993d5c Mon Sep 17 00:00:00 2001
+From: Hylke Bons <hylkebons at gmail.com>
+Date: Mon, 29 Feb 2016 16:39:28 +0000
+Subject: [PATCH 7/8] Update Program.cs
+
+---
+ SparkleShare/Program.cs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/SparkleShare/Program.cs b/SparkleShare/Program.cs
+index db3431b..1dfe811 100644
+--- a/SparkleShare/Program.cs
++++ b/SparkleShare/Program.cs
+@@ -46,8 +46,7 @@ public static void Main (string [] args)
+ string n = Environment.NewLine;
+
+ Console.WriteLine (n +
+- "SparkleShare is a collaboration and sharing tool that is" + n +
+- "designed to keep things simple and to stay out of your way." + n +
++ "Share and collaborate by syncing with any Git repository instantly." + n +
+ n +
+ "Version: " + SparkleLib.SparkleBackend.Version + n +
+ "Copyright (C) 2010 Hylke Bons and others" + n +
+
+From 2c598a24d01b0fe6a6f38c850800f07377f1c952 Mon Sep 17 00:00:00 2001
+From: Hylke Bons <hylkebons at gmail.com>
+Date: Wed, 16 Mar 2016 11:57:45 +0000
+Subject: [PATCH 8/8] Update README.md
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index f029e78..a2908d7 100644
+--- a/README.md
++++ b/README.md
+@@ -25,7 +25,7 @@ Here are instructions to build SparkleShare on [Linux distributions](SparkleShar
+
+
+ ## Useful links
+-[Website](http://www.sparkleshare.org/), [Twitter](https://www.twitter.com/SparkleShare), [Wiki](https://www.github.com/hbons/SparkleShare/wiki), and [Source Code](https://www.github.com/hbons/SparkleShare). Join the chat: #sparkleshare on irc.gnome.org.
++[Website](http://www.sparkleshare.org/), [Twitter](https://www.twitter.com/SparkleShare), [Wiki](https://www.github.com/hbons/SparkleShare/wiki), and [Source Code](https://www.github.com/hbons/SparkleShare). Join the chat: `#sparkleshare` on `irc.gnome.org`.
+
+
+ ## Finally
diff --git a/debian/patches/series b/debian/patches/series
index e3a1660..5c6b913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
02-m4_macro_dir.patch
03-add_stop_command.patch
04-glib_application_run.diff
+05-changes-from-master.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/sparkleshare.git
More information about the Pkg-cli-apps-commits
mailing list