[Pkg-cli-apps-commits] [sparkleshare] 02/02: Imported Debian patch 1.2-0.1
Jo Shields
directhex at moszumanska.debian.org
Mon Dec 21 22:06:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to annotated tag debian/1.2-0.1
in repository sparkleshare.
commit 4ea628178e1a23b1f626b19c4a6417597b265f50
Merge: 5815058 89d5f75
Author: Hans-Christoph Steiner <hans at eds.org>
Date: Mon Oct 20 23:31:16 2014 -0400
Imported Debian patch 1.2-0.1
Makefile.in | 337 ++++++------
News.txt | 16 +
README.md | 2 +
SparkleLib/Defines.cs | 4 +-
SparkleLib/Git/Makefile.in | 166 +++++-
SparkleLib/Git/SparkleFetcherGit.cs | 137 +++--
SparkleLib/Git/SparkleGit.cs | 8 +
SparkleLib/Git/SparkleRepoGit.cs | 311 ++++++-----
SparkleLib/Makefile.in | 168 +++++-
SparkleLib/SparkleConfig.cs | 31 +-
SparkleLib/SparkleExtensions.cs | 4 +-
SparkleLib/SparkleFetcherBase.cs | 26 +-
SparkleLib/SparkleFetcherSSH.cs | 17 +-
SparkleLib/SparkleLogger.cs | 9 +-
SparkleLib/SparkleRepoBase.cs | 61 ++-
SparkleLib/SparkleUser.cs | 2 +
SparkleLib/SparkleWrappers.cs | 8 +-
SparkleShare/Common/HTML/Makefile.in | 109 +++-
SparkleShare/Common/HTML/event-log.html | 2 +-
SparkleShare/Common/Makefile.in | 274 +++++-----
SparkleShare/Common/Pixmaps/Makefile.in | 109 +++-
SparkleShare/Common/Pixmaps/about.png | Bin 51184 -> 51159 bytes
SparkleShare/Common/Pixmaps/side-splash.png | Bin 65297 -> 65262 bytes
SparkleShare/Common/Pixmaps/tutorial-slide-1.png | Bin 35855 -> 28133 bytes
SparkleShare/Common/Plugins/._planio.png | Bin 0 -> 181 bytes
SparkleShare/Common/Plugins/Makefile.in | 109 +++-
SparkleShare/Common/Plugins/planio.xml | 2 +-
SparkleShare/Linux/Makefile.am | 1 +
SparkleShare/Linux/Makefile.in | 287 ++++++-----
SparkleShare/Linux/Pixmaps/Makefile.in | 283 +++++-----
SparkleShare/Linux/Pixmaps/icons/Makefile.in | 275 +++++-----
SparkleShare/Linux/Pixmaps/icons/gnome/Makefile.in | 102 +++-
.../Linux/Pixmaps/icons/process-syncing-48.png | Bin 2081 -> 1679 bytes
.../Pixmaps/icons/process-syncing-down-48.png | Bin 2020 -> 1620 bytes
.../Pixmaps/icons/process-syncing-error-48.png | Bin 3082 -> 2699 bytes
.../Linux/Pixmaps/icons/process-syncing-up-48.png | Bin 1991 -> 1588 bytes
.../Linux/Pixmaps/icons/process-working-22.png | Bin 4108 -> 4104 bytes
.../Linux/Pixmaps/icons/sparkleshare-32.png | Bin 1274 -> 1270 bytes
.../Pixmaps/icons/ubuntu-mono-dark/Makefile.in | 102 +++-
.../icons/ubuntu-mono-dark/process-syncing-24.png | Bin 603 -> 268 bytes
.../ubuntu-mono-dark/process-syncing-down-24.png | Bin 599 -> 271 bytes
.../ubuntu-mono-dark/process-syncing-error-24.png | Bin 576 -> 266 bytes
.../ubuntu-mono-dark/process-syncing-idle-24.png | Bin 711 -> 361 bytes
.../ubuntu-mono-dark/process-syncing-up-24.png | Bin 605 -> 271 bytes
.../Pixmaps/icons/ubuntu-mono-light/Makefile.in | 102 +++-
.../icons/ubuntu-mono-light/process-syncing-24.png | Bin 573 -> 252 bytes
.../ubuntu-mono-light/process-syncing-down-24.png | Bin 582 -> 258 bytes
.../ubuntu-mono-light/process-syncing-error-24.png | Bin 556 -> 250 bytes
.../ubuntu-mono-light/process-syncing-idle-24.png | Bin 692 -> 337 bytes
.../ubuntu-mono-light/process-syncing-up-24.png | Bin 590 -> 259 bytes
SparkleShare/Linux/Pixmaps/tutorial-slide-3.png | Bin 46109 -> 36876 bytes
SparkleShare/Linux/SparkleBubbles.cs | 16 +-
SparkleShare/Linux/SparkleEventLog.cs | 32 +-
SparkleShare/Linux/SparkleSetup.cs | 41 +-
SparkleShare/Linux/sparkleshare.desktop | 1 +
SparkleShare/Linux/sparkleshare.in | 5 +-
SparkleShare/Makefile.in | 274 +++++-----
SparkleShare/SparkleAboutController.cs | 15 +-
SparkleShare/SparkleAvatars.cs | 111 ++++
SparkleShare/SparkleBubblesController.cs | 3 +-
SparkleShare/SparkleControllerBase.cs | 229 ++++----
SparkleShare/SparkleEventLogController.cs | 52 +-
SparkleShare/SparkleInvite.cs | 3 +-
SparkleShare/SparkleKeys.cs | 4 +
SparkleShare/SparklePlugin.cs | 2 +-
SparkleShare/SparkleSetupController.cs | 47 +-
SparkleShare/SparkleStatusIconController.cs | 14 +
aclocal.m4 | 574 +++++++++++++--------
build/Makefile.in | 274 +++++-----
build/build.environment.mk | 3 +-
build/m4/Makefile.in | 100 +++-
config.guess | 60 ++-
config.sub | 95 ++--
configure | 483 ++++++++++-------
configure.ac | 2 +-
debian/changelog | 8 +-
debian/control | 9 +-
debian/copyright | 31 +-
debian/patches/build_for_4.5.patch | 47 --
debian/patches/series | 1 -
debian/rules | 5 +-
install-sh | 14 +-
ltmain.sh | 32 +-
missing | 414 ++++++---------
84 files changed, 3693 insertions(+), 2372 deletions(-)
diff --cc debian/changelog
index 137dfa8,0000000..7312759
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,203 -1,0 +1,203 @@@
- sparkleshare (1.1.0-2) unstable; urgency=medium
++sparkleshare (1.2-0.1) unstable; urgency=low
+
- * [d5b3cf1] --with no longer takes an =
- * [03139ab] Force build with 4.5 libraries (Closes: 808684)
++ * Non-maintainer upload
++ * [6f73085] Imported Upstream version 1.2 (#730491)
+
- -- Jo Shields <directhex at apebox.org> Mon, 21 Dec 2015 20:57:42 +0000
++ -- Hans-Christoph Steiner <hans at eds.org> Mon, 20 Oct 2014 23:31:16 -0400
+
+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-2) unstable; urgency=low
+
+ [ Chow Loong Jin ]
+ * [bcdc7ef] Fix watch file
+
+ [ Iain Lane ]
+ * [40dd1a8] Add missing epoch to git versioned dependency
+
+ [ Carlos Martín Nieto ]
+ * [1cf4989] debian/patches: add
+ 0001-linux-statusicon-Fix-statusicon-animation.-Closes-84.patch. Fill the
+ status icon array correctly so the in-progress animation gets shown
+ instead of blinking.
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Mon, 23 Jul 2012 21:43:27 +0100
+
+sparkleshare (0.9.0-1) unstable; urgency=low
+
+ * [50bd5da] Imported Upstream version 0.9.0
+ * [02f9752] debian/patches: Remove both patches.
+ They are now upstream.
+ * [6423c35] debian/docs: Re-add README.md and fix location of TRADEMARK
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Sat, 30 Jun 2012 04:31:27 +0800
+
+sparkleshare (0.8.4-1) unstable; urgency=low
+
+ [ Jo Shields ]
+ * [9a423ce] Imported Upstream version 0.8.4
+
+ [ Carlos Martín Nieto ]
+ * [bd3c9bd] There's no autogen anymore, use ./configure as usual.
+ It looks like we do have tarball releases again.
+ * [264b24c] Add
+ 0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
+ * [7ff3ad5] Remove README.md and add TRADEMARK to the installed docs
+ * [2661826] Add patch
+ 0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
+ * [f9780f2] Use the packaged jquery
+ * [4dbf480] Bump Standards-Version to 3.9.3
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Mon, 11 Jun 2012 14:13:52 +0100
+
+sparkleshare (0.8.2-1) unstable; urgency=low
+
+ * [272b12a] Imported Upstream version 0.8.2
+ + No longer messes with SSH config (Closes: #656107)
+ * [96a15af] Re-add README.md to debian/docs. It's in the tarball again.
+ * [770c73b] Use dh-autoreconf to call ./autogen.sh.
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Thu, 23 Feb 2012 22:47:40 +0000
+
+sparkleshare (0.6.0-2) unstable; urgency=low
+
+ * Team upload.
+ * Rebuild for CLR 4.0 transition
+ * [52a530b] Re-add python-nautilus build-dependency.
+ This reverts commit f19ee730334cfa69de74f5373c960d8317f1b9a9.
+ (Closes: #645858)
+ * [873e9f1] Drop deprecated cli.make
+
+ -- Chow Loong Jin <hyperair at debian.org> Thu, 19 Jan 2012 04:19:03 +0800
+
+sparkleshare (0.6.0-1) unstable; urgency=low
+
+ [ Carlos Martín Nieto ]
+ * [e7facf8] Imported Upstream version 0.6.0
+ * [3605835] Don't install README, it's no longer in the tarball
+ * [c33134b] Do run distcheck, it works now
+
+ [ Motiejus Jakštys ]
+ * [db5b74e] Add gawk to build-depends
+
+ [ Chow Loong Jin ]
+ * [62b82a9] Replace Iain Lane with Carlos Martin Nieto in Uploaders
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Sat, 14 Jan 2012 06:02:24 +0800
+
+sparkleshare (0.4.2-1) experimental; urgency=low
+
+ * [f4116ff] Imported Upstream version 0.4.0
+ * [2e25c2c] Imported Upstream version 0.4.1
+ * [080f6f3] Remove 0001-Add-missing-shebang-to-nautilus-extension.patch.
+ Merged upstream
+ * [0ffa880] Imported Upstream version 0.4.2
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Fri, 02 Dec 2011 16:57:23 +0000
+
+sparkleshare (0.4.0-2) experimental; urgency=low
+
+ * [2ac5762] Depend on gnome-icon-theme.
+ SparkleShare unconditionally uses GNOME icons and crashes when they are
+ not available. (Closes: #650209)
+ * [21c88c5] Fix syntax errors in d/copyright, thanks Lintian
+ * [f19ee73] Remove BD on nautlius-python since it is currently broken in Debian.
+ When #649910 is fixed we can look at enabling it again.
+
+ -- Iain Lane <laney at debian.org> Mon, 28 Nov 2011 14:43:14 +0000
+
+sparkleshare (0.4.0-1) experimental; urgency=low
+
+ * [8a32190] Imported Upstream version 0.4.0
+ * [53a5447] Remove
+ 0002-Use-SparkleHelpers-method-instead-of-4.0-only-librar.patch
+ * [e9f220f] Don't run 'make check'
+ * [d6970b8] Add shebang to the nautilus3 extension
+
+ -- Carlos Martín Nieto <carlos at cmartin.tk> Wed, 23 Nov 2011 22:23:41 +0000
+
+sparkleshare (0.2.5-2) experimental; urgency=low
+
+ * [c19513a] New patch to use SparkleHelpers method instead of 4.0 only
+ library one. This restores compatibility with older Mono versions.
+ * [173ef62] Rename patch to
+ 0001-Add-missing-shebang-to-nautilus-extension.patch.
+ * [47aa816] Relax mono and cli-common versioned BDs now that we don't need
+ them any more
+
+ -- Iain Lane <laney at debian.org> Thu, 28 Jul 2011 11:02:32 +0100
+
+sparkleshare (0.2.5-1) experimental; urgency=low
+
+ * [f320fef] Imported Upstream version 0.2.5
+ + Reimplement notes to be less buggy and backend independent. Polish
+ about dialog and event log html. Fix a bug where large collections of
+ files weren't being synced when adding them at the same time. The
+ event log now collapses huge change sets and squashes events together
+ by day when they are on the same day and in the same folder.
+ * [8f862d6] Require mono 2.10 and cli-common-dev 0.8.
+ New upstream release uses some CLR 4.0 APIs and so we need to bump the
+ BDs
+
+ -- Iain Lane <laney at debian.org> Tue, 26 Jul 2011 09:32:28 +0100
+
+sparkleshare (0.2.4-1) experimental; urgency=low
+
+ * [7aa8901] Imported Upstream version 0.2.4
+ * [584cf39] Remove 0001-Check-for-both-2.0-and-4.0-libs.patch, merged upstream.
+ Also no longer need to reautogen.
+ * [cf1e91c] Make sparkleshare arch:all.
+ Contains only managed code.
+ * [cb99676] Depend on git >= 1.7.1 per upstream
+
+ -- Iain Lane <laney at debian.org> Sat, 16 Jul 2011 18:57:00 +0100
+
+sparkleshare (0.2.2-1) experimental; urgency=low
+
+ * Initial upload to Debian, adapted from packages by Andrea Colangelo
+ <warp10 at ubuntu.com> (Closes: #597053)
+ * [f8efff7] Imported Upstream version 0.2.2
+ * [5e50d80] Run wrap-and-sort
+ * [944e7aa] Clean up build dependencies and use CLI packaging helpers
+ * [cccd3b7] Set maintainer to CLI applications team
+ * [84c59dd] Rewrap long description
+ * [d30ebf1] Depend on git & gvfs, and recommend python-nautilus.
+ Required for a reasonable amount of functionality
+ * [3a47a7b] Update copyright
+ * [e350f34] Add watch file
+ * [bf42781] Update package description
+ * [6640d37] Add new patch to check for both 2.0 and 4.0 libs.
+ This is to be compatible with mono 2.6 and 2.10. Also autoreconf to pick
+ this up.
+ * [1ea4e93] Add new patch introducing shebang into Nautilus extension
+ * [85651a2] Recommend python for the script (thanks, Lintian)
+
+ -- Iain Lane <laney at debian.org> Wed, 15 Jun 2011 22:59:01 +0100
+
+sparkleshare (0.2.1-0ppa2) oneiric; urgency=low
+
+ * debian/control: add dependency on libwebkit1.1-cil to fix crash on
+ startup (thanks to Alin Andrei for reporting and fixing this bug).
+ * debian/copyright: update.
+
+ -- Andrea Colangelo <warp10 at ubuntu.com> Wed, 15 Jun 2011 11:53:00 +0200
+
+sparkleshare (0.2.1-0ppa1) oneiric; urgency=low
+
+ * Initial release.
+
+ -- Andrea Colangelo <warp10 at ubuntu.com> Thu, 09 Jun 2011 08:53:08 +0200
diff --cc debian/control
index baa0cb8,0000000..dc93715
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,40 -1,0 +1,39 @@@
+Source: sparkleshare
+Section: utils
+Priority: optional
+Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Uploaders: Carlos Martín Nieto <carlos at cmartin.tk>
+Build-Depends: cli-common-dev (>= 0.5.7~), debhelper (>= 7.0.50~)
+Build-Depends-Indep: intltool,
+ libglib2.0-cil-dev (>= 2.12.2),
+ libgtk2.0-cil-dev (>= 2.12.2),
+ libnotify-cil-dev,
+ libwebkit-cil-dev,
- mono-devel (>= 3.2.8),
- dh-autoreconf,
++ mono-devel (>= 2.10),
+ python-nautilus
- Standards-Version: 3.9.3
++Standards-Version: 3.9.6
+Homepage: http://sparkleshare.org/
- Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/sparkleshare.git
- Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/sparkleshare.git
++Vcs-Git: git://anonscm.debian.org/pkg-cli-apps/packages/sparkleshare.git
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-cli-apps/packages/sparkleshare.git
+
+Package: sparkleshare
+Architecture: all
+Depends: gnome-icon-theme,
+ git (>= 1:1.7.1),
+ gvfs (>= 1.3),
+ libjs-jquery,
+ ${cli:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: python, python-nautilus
+Description: distributed collaboration and sharing tool
+ SparkleShare is a collaboration and sharing tool that is designed to keep
+ things simple and to stay out of your way. It allows you to instantly sync
+ with any Git repository you have access to.
+ .
+ SparkleShare can be used as a rough alternative to web services such as
+ Dropbox or Ubuntu One.
+ .
+ Though SparkleShare is not made to be a graphical frontend for git or a backup
+ tool, it may be useful for other kinds of purposes as well, like backing up
+ small files or monitoring your favourite project.
diff --cc debian/copyright
index 7e2e6f2,0000000..e475705
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,75 -1,0 +1,52 @@@
- Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: sparkleshare
+Source: http://sparkleshare.org/
+
+Files: *
+Copyright: 2010 Hylke Bons <hylkebons at gmail.com>
- License: GPL-3.0+
++License: GPL-3
+
+Files: debian/*
+Copyright: 2011 Andrea Colangelo <warp10 at ubuntu.com>
- License: GPL-3.0+
++License: GPL-3
+
+Files: build/m4/shave/*
+Copyright: 2009 Damien Lespiau
+License: Expat
+
- Files: SmartIrc4net/*
- Copyright: 2003-2009 Mirco Bauer 2008-2009 Thomas Bruderer
- License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
- Files: SmartIrc4net/src/StarkSoftProxy/*
- Copyright: 2007-2009 Starksoft
- License: Expat
+
- License: GPL-3.0+
++License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --cc debian/rules
index b244442,0000000..b42ff71
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,0 +1,7 @@@
+#!/usr/bin/make -f
+
+override_dh_auto_configure:
+ dh_auto_configure -- MCS=/usr/bin/mono-csc
+
- override_dh_autoreconf:
- dh_autoreconf autoreconf -- -f -I build/m4/shamrock/ -I build/m4/shave/ -I build/m4/sparkleshare/ -i .
-
+%:
- dh $@ --with cli,autoreconf
++ dh $@ --with=cli
--
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