[Pkg-cli-apps-commits] [sparkleshare] 01/02: * Merge with Debian unstable. Remaining Ubuntu changes: - Add build-dep on libappindicator for libappindicator0.1-cil-dev indicator support.
Andrew Starr-Bochicchio
asb at moszumanska.debian.org
Thu Feb 13 05:06:23 UTC 2014
This is an automated email from the git hooks/post-receive script.
asb pushed a commit to branch ubuntu
in repository sparkleshare.
commit 3231db5cf3eb19281e0dc4b427ca302be470cc12
Merge: 7110090 115c5b8
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date: Wed Feb 12 23:44:01 2014 -0500
* Merge with Debian unstable. Remaining Ubuntu changes:
- Add build-dep on libappindicator for libappindicator0.1-cil-dev
indicator support.
Makefile.am | 8 +-
Makefile.in | 52 +-
NEWS | 196 ---
News.txt | 335 +++++
README.md | 14 +-
SparkleLib/AssemblyInfo.cs | 11 -
SparkleLib/AssemblyInfo.cs.in | 11 -
SparkleLib/Defines.cs | 19 +-
SparkleLib/Defines.cs.in | 19 +-
SparkleLib/Git/Makefile.am | 2 +
SparkleLib/Git/Makefile.in | 52 +-
SparkleLib/Git/SparkleFetcherGit.cs | 408 +++---
SparkleLib/Git/SparkleGit.cs | 135 +-
SparkleLib/Git/SparkleRepoGit.cs | 1068 +++++++++-------
SparkleLib/Makefile.am | 7 +-
SparkleLib/Makefile.in | 66 +-
SparkleLib/SparkleAnnouncement.cs | 34 -
SparkleLib/SparkleBackend.cs | 14 +-
SparkleLib/SparkleConfig.cs | 175 ++-
SparkleLib/SparkleExceptions.cs | 37 -
SparkleLib/SparkleExtensions.cs | 47 +-
SparkleLib/SparkleFetcherBase.cs | 372 ++----
SparkleLib/SparkleFetcherSSH.cs | 143 +++
SparkleLib/SparkleHelpers.cs | 114 --
SparkleLib/SparkleListenerBase.cs | 100 +-
SparkleLib/SparkleListenerFactory.cs | 47 +-
SparkleLib/SparkleListenerTcp.cs | 247 ++--
SparkleLib/SparkleLogger.cs | 99 ++
SparkleLib/SparkleRepoBase.cs | 573 ++++-----
SparkleLib/SparkleUser.cs | 4 +
SparkleLib/SparkleWatcher.cs | 27 +-
SparkleLib/SparkleWrappers.cs | 35 +-
SparkleShare/Common/HTML/Makefile.in | 36 +-
SparkleShare/Common/HTML/day-entry.html | 8 +-
SparkleShare/Common/HTML/event-entry.html | 21 +-
SparkleShare/Common/HTML/event-log.html | 254 ++--
SparkleShare/Common/Makefile.in | 42 +-
SparkleShare/Common/Pixmaps/Makefile.am | 15 +-
SparkleShare/Common/Pixmaps/Makefile.in | 51 +-
SparkleShare/Common/Pixmaps/about.png | Bin 66411 -> 51184 bytes
SparkleShare/Common/Pixmaps/avatar-a.png | Bin 650 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-b.png | Bin 751 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-c.png | Bin 989 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-d.png | Bin 720 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-e.png | Bin 753 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-f.png | Bin 912 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-g.png | Bin 771 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-h.png | Bin 780 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-i.png | Bin 666 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-j.png | Bin 735 -> 0 bytes
SparkleShare/Common/Pixmaps/avatar-k.png | Bin 669 -> 0 bytes
SparkleShare/Common/Pixmaps/side-splash.png | Bin 76527 -> 65297 bytes
SparkleShare/Common/Pixmaps/tutorial-slide-1.png | Bin 0 -> 35855 bytes
SparkleShare/Common/Pixmaps/tutorial-slide-2.png | Bin 0 -> 24161 bytes
SparkleShare/Common/Pixmaps/tutorial-slide-4.png | Bin 4532 -> 0 bytes
SparkleShare/Common/Pixmaps/user-icon-default.png | Bin 0 -> 594 bytes
SparkleShare/Common/Plugins/Makefile.am | 21 +-
SparkleShare/Common/Plugins/Makefile.in | 56 +-
SparkleShare/Common/Plugins/bitbucket.png | Bin 1591 -> 1202 bytes
SparkleShare/Common/Plugins/bitbucket.xml | 35 +-
SparkleShare/Common/Plugins/bitbucket.xml.in | 22 -
SparkleShare/Common/Plugins/github.png | Bin 1724 -> 1578 bytes
SparkleShare/Common/Plugins/github.xml | 25 +-
SparkleShare/Common/Plugins/github.xml.in | 21 -
SparkleShare/Common/Plugins/gitorious.png | Bin 1359 -> 1238 bytes
SparkleShare/Common/Plugins/gitorious.xml | 52 +-
SparkleShare/Common/Plugins/gitorious.xml.in | 21 -
SparkleShare/Common/Plugins/gnome.png | Bin 1415 -> 0 bytes
SparkleShare/Common/Plugins/gnome.xml | 69 -
SparkleShare/Common/Plugins/gnome.xml.in | 21 -
SparkleShare/Common/Plugins/own-server.png | Bin 1363 -> 1161 bytes
SparkleShare/Common/Plugins/own-server.xml | 39 +-
SparkleShare/Common/Plugins/own-server.xml.in | 19 -
SparkleShare/Common/Plugins/planio.png | Bin 0 -> 3232 bytes
SparkleShare/Common/Plugins/planio.xml | 20 +
SparkleShare/Common/Plugins/ssnet.png | Bin 1545 -> 1438 bytes
SparkleShare/Common/Plugins/ssnet.xml | 13 +-
SparkleShare/Common/Plugins/ssnet.xml.in | 20 -
SparkleShare/Linux/Makefile.am | 8 +-
SparkleShare/Linux/Makefile.in | 107 +-
SparkleShare/Linux/Nautilus/Makefile.am | 15 -
SparkleShare/Linux/Nautilus/Makefile.in | 474 -------
.../Nautilus/sparkleshare-nautilus-extension.py | 173 ---
.../Nautilus/sparkleshare-nautilus-extension.py.in | 173 ---
.../Nautilus/sparkleshare-nautilus3-extension.py | 200 ---
.../sparkleshare-nautilus3-extension.py.in | 200 ---
SparkleShare/Linux/Pixmaps/Makefile.am | 2 -
SparkleShare/Linux/Pixmaps/Makefile.in | 49 +-
SparkleShare/Linux/Pixmaps/icons/Makefile.am | 35 +-
SparkleShare/Linux/Pixmaps/icons/Makefile.in | 77 +-
.../Linux/Pixmaps/icons/document-added-12.png | Bin 498 -> 193 bytes
.../Linux/Pixmaps/icons/document-deleted-12.png | Bin 314 -> 117 bytes
.../Linux/Pixmaps/icons/document-edited-12.png | Bin 665 -> 428 bytes
.../Linux/Pixmaps/icons/document-moved-12.png | Bin 3214 -> 445 bytes
.../Linux/Pixmaps/icons/folder-sparkleshare-16.png | Bin 766 -> 0 bytes
.../Linux/Pixmaps/icons/folder-sparkleshare-22.png | Bin 1004 -> 0 bytes
.../Linux/Pixmaps/icons/folder-sparkleshare-24.png | Bin 997 -> 0 bytes
.../Pixmaps/icons/folder-sparkleshare-256.png | Bin 53184 -> 0 bytes
.../Linux/Pixmaps/icons/folder-sparkleshare-32.png | Bin 1404 -> 0 bytes
.../Linux/Pixmaps/icons/folder-sparkleshare-48.png | Bin 2372 -> 0 bytes
SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.am | 20 +
.../icons/{ubuntu-mono-light => gnome}/Makefile.in | 56 +-
.../Pixmaps/icons/gnome/sparkleshare-symbolic.svg | 17 +
SparkleShare/Linux/Pixmaps/icons/list-point-16.png | Bin 676 -> 575 bytes
.../Linux/Pixmaps/icons/process-syncing-24.png | Bin 2560 -> 831 bytes
.../Linux/Pixmaps/icons/process-syncing-48.png | Bin 0 -> 2081 bytes
.../Pixmaps/icons/process-syncing-down-24.png | Bin 0 -> 768 bytes
.../Pixmaps/icons/process-syncing-down-48.png | Bin 0 -> 2020 bytes
.../Pixmaps/icons/process-syncing-error-24.png | Bin 1354 -> 1017 bytes
.../Pixmaps/icons/process-syncing-error-48.png | Bin 0 -> 3082 bytes
.../Linux/Pixmaps/icons/process-syncing-i-24.png | Bin 994 -> 0 bytes
.../Linux/Pixmaps/icons/process-syncing-ii-24.png | Bin 1002 -> 0 bytes
.../Linux/Pixmaps/icons/process-syncing-iii-24.png | Bin 990 -> 0 bytes
.../Pixmaps/icons/process-syncing-iiii-24.png | Bin 989 -> 0 bytes
.../Pixmaps/icons/process-syncing-iiiii-24.png | Bin 993 -> 0 bytes
.../Linux/Pixmaps/icons/process-syncing-up-24.png | Bin 0 -> 768 bytes
.../Linux/Pixmaps/icons/process-syncing-up-48.png | Bin 0 -> 1991 bytes
.../Linux/Pixmaps/icons/process-working-22.png | Bin 7061 -> 4108 bytes
.../Linux/Pixmaps/icons/sparkleshare-16.png | Bin 0 -> 689 bytes
.../Linux/Pixmaps/icons/sparkleshare-22.png | Bin 0 -> 926 bytes
.../Linux/Pixmaps/icons/sparkleshare-24.png | Bin 0 -> 926 bytes
.../Linux/Pixmaps/icons/sparkleshare-256.png | Bin 0 -> 47701 bytes
.../Linux/Pixmaps/icons/sparkleshare-32.png | Bin 0 -> 1274 bytes
.../Linux/Pixmaps/icons/sparkleshare-48.png | Bin 0 -> 2182 bytes
.../Pixmaps/icons/ubuntu-mono-dark/Makefile.am | 9 +-
.../Pixmaps/icons/ubuntu-mono-dark/Makefile.in | 40 +-
.../icons/ubuntu-mono-dark/process-syncing-24.png | Bin 0 -> 603 bytes
.../ubuntu-mono-dark/process-syncing-down-24.png | Bin 0 -> 599 bytes
.../ubuntu-mono-dark/process-syncing-error-24.png | Bin 605 -> 576 bytes
.../ubuntu-mono-dark/process-syncing-i-24.png | Bin 806 -> 0 bytes
.../ubuntu-mono-dark/process-syncing-idle-24.png | Bin 0 -> 711 bytes
.../ubuntu-mono-dark/process-syncing-ii-24.png | Bin 837 -> 0 bytes
.../ubuntu-mono-dark/process-syncing-iii-24.png | Bin 829 -> 0 bytes
.../ubuntu-mono-dark/process-syncing-iiii-24.png | Bin 831 -> 0 bytes
.../ubuntu-mono-dark/process-syncing-iiiii-24.png | Bin 838 -> 0 bytes
.../ubuntu-mono-dark/process-syncing-up-24.png | Bin 0 -> 605 bytes
.../Pixmaps/icons/ubuntu-mono-light/Makefile.am | 9 +-
.../Pixmaps/icons/ubuntu-mono-light/Makefile.in | 40 +-
.../icons/ubuntu-mono-light/process-syncing-24.png | Bin 0 -> 573 bytes
.../ubuntu-mono-light/process-syncing-down-24.png | Bin 0 -> 582 bytes
.../ubuntu-mono-light/process-syncing-error-24.png | Bin 586 -> 556 bytes
.../ubuntu-mono-light/process-syncing-i-24.png | Bin 795 -> 0 bytes
.../ubuntu-mono-light/process-syncing-idle-24.png | Bin 0 -> 692 bytes
.../ubuntu-mono-light/process-syncing-ii-24.png | Bin 825 -> 0 bytes
.../ubuntu-mono-light/process-syncing-iii-24.png | Bin 807 -> 0 bytes
.../ubuntu-mono-light/process-syncing-iiii-24.png | Bin 833 -> 0 bytes
.../ubuntu-mono-light/process-syncing-iiiii-24.png | Bin 822 -> 0 bytes
.../ubuntu-mono-light/process-syncing-up-24.png | Bin 0 -> 590 bytes
SparkleShare/Linux/Pixmaps/tutorial-slide-1.png | Bin 36569 -> 0 bytes
SparkleShare/Linux/Pixmaps/tutorial-slide-2.png | Bin 30380 -> 0 bytes
SparkleShare/Linux/Pixmaps/tutorial-slide-3.png | Bin 3960 -> 46109 bytes
SparkleShare/Linux/SparkleAbout.cs | 127 +-
SparkleShare/Linux/SparkleBubbles.cs | 3 +
SparkleShare/Linux/SparkleController.cs | 140 +--
SparkleShare/Linux/SparkleEventLog.cs | 113 +-
SparkleShare/Linux/SparkleSetup.cs | 1325 +++++++++-----------
SparkleShare/Linux/SparkleSetupWindow.cs | 5 +
SparkleShare/Linux/SparkleSpinner.cs | 77 +-
SparkleShare/Linux/SparkleStatusIcon.cs | 320 ++---
SparkleShare/Linux/SparkleUI.cs | 31 +-
SparkleShare/Linux/SparkleUIHelpers.cs | 38 +-
SparkleShare/Linux/sparkleshare.desktop | 2 +-
SparkleShare/Linux/sparkleshare.in | 5 +-
SparkleShare/Makefile.am | 27 -
SparkleShare/Makefile.in | 283 +----
SparkleShare/Program.cs | 73 +-
SparkleShare/SparkleAboutController.cs | 94 +-
SparkleShare/SparkleBubblesController.cs | 45 +-
SparkleShare/SparkleControllerBase.cs | 1231 +++++++-----------
SparkleShare/SparkleEventLogController.cs | 588 +++++++--
SparkleShare/SparkleExtensions.cs | 2 +-
SparkleShare/SparkleInvite.cs | 115 +-
SparkleShare/SparkleKeys.cs | 100 ++
SparkleShare/SparklePlugin.cs | 103 +-
SparkleShare/SparkleSetupController.cs | 317 +++--
SparkleShare/SparkleStatusIconController.cs | 246 ++--
aclocal.m4 | 11 +-
build/Makefile.in | 42 +-
build/build.environment.mk | 10 +-
build/build.rules.mk | 9 +-
build/m4/Makefile.in | 31 +-
build/m4/sparkleshare/nautilus-python.m4 | 34 -
config.sub | 11 +-
configure | 493 ++------
configure.ac | 21 +-
debian/changelog | 24 +
debian/control | 2 +-
debian/docs | 4 +-
...sicon-Fix-statusicon-animation.-Closes-84.patch | 30 -
debian/patches/series | 1 -
debian/watch | 2 +-
legal/{AUTHORS => Authors.txt} | 1 -
legal/{LICENSE => License.txt} | 0
legal/{TRADEMARK => Trademark.txt} | 0
ltmain.sh | 4 +-
195 files changed, 5207 insertions(+), 7989 deletions(-)
diff --cc debian/changelog
index b57dcf2,a1b60e7..1f05f50
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,19 +1,37 @@@
++sparkleshare (1.1.0-1ubuntu1) UNRELEASED; urgency=medium
++
++ * Merge with Debian unstable. Remaining Ubuntu changes:
++ - Add build-dep on libappindicator for libappindicator0.1-cil-dev
++ indicator support.
++
++ -- Andrew Starr-Bochicchio <a.starr.b at gmail.com> Wed, 12 Feb 2014 23:41:22 -0500
++
+ sparkleshare (1.1.0-1) unstable; urgency=low
+
+ * [e45ec00] Imported Upstream version 1.1.0
+ * [914d4f9] debian/watch: downloads moved to bitbucket
+
+ -- Carlos Martín Nieto <cmn at dwim.me> Mon, 27 May 2013 15:15:33 +0100
+
+ sparkleshare (1.0.0-1) unstable; urgency=low
+
+ * [9b28584] Imported Upstream version 1.0.0
+ * [7943d0f] Remove patch
+ * [4e04623] Fix the name of the news and trademark files
+ * [29653a9] Increase mono build dependency to 2.10 (Closes: #686006)
+
+ -- Carlos Martín Nieto <cmn at dwim.me> Tue, 14 May 2013 08:33:16 +0100
+
+sparkleshare (0.9.0-2ubuntu1) quantal; urgency=low
+
+ * Merge with Debian unstable, remaining changes:
+ + Add gbp.conf for Ubuntu branch. Ubuntu sources are stored as a branch
+ in Debian's git repository. Please try to use this if possible (contact
+ the Debian maintainers for merges).
+ + Add BD on libappindicator# to enable app indicator support
+
+ -- Iain Lane <laney at debian.org> Tue, 24 Jul 2012 13:41:26 +0100
+
sparkleshare (0.9.0-2) unstable; urgency=low
[ Chow Loong Jin ]
--
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