debian/0000755000000000000000000000000012256367340007176 5ustar debian/changelog0000644000000000000000000003135612256364754011066 0ustar git-cola (1.9.3-1) unstable; urgency=low * New upstream release. * Update copyright. -- Laszlo Boszormenyi (GCS) Tue, 24 Dec 2013 21:02:42 +0100 git-cola (1.9.2-1) unstable; urgency=low * New upstream release. * Update Standards-Version to 3.9.5 . -- Laszlo Boszormenyi (GCS) Wed, 04 Dec 2013 20:26:33 +0100 git-cola (1.8.3-1) unstable; urgency=low * New upstream release. * Fixes FTBFS with Shinx 1.2 due to UnicodeDecodeError (closes: #706580). -- Laszlo Boszormenyi (GCS) Tue, 07 May 2013 14:20:42 +0200 git-cola (1.8.2-1) unstable; urgency=low * New upstream release. * Update Standards-Version to 3.9.4 , no changes needed. -- Laszlo Boszormenyi (GCS) Sat, 02 Mar 2013 17:46:29 +0100 git-cola (1.8.1-1) unstable; urgency=low * New upstream release. [ Bart Martens ] * Refine watch file. -- Laszlo Boszormenyi (GCS) Sat, 15 Dec 2012 01:37:55 +0100 git-cola (1.8.0-1) unstable; urgency=low * New maintainer (closes: #690182). * New upstream release (closes: #688669). * Move from dh_pysupport to dh_python2 . * Update homepage field, watch file and Standards-Version to 3.9.3 . * Use the packaged jQuery and Underscore javascript libraries. -- Laszlo Boszormenyi (GCS) Tue, 16 Oct 2012 20:37:56 +0200 git-cola (1.4.3.5-1) unstable; urgency=low * New upstream release. * Update debian/copyright years. -- Iulian Udrea Thu, 01 Sep 2011 23:56:15 +0100 git-cola (1.4.3.4-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.9.2; no changes required. -- Iulian Udrea Tue, 05 Jul 2011 20:20:28 +0100 git-cola (1.4.3.2-1) unstable; urgency=low * New upstream release. + setup.py: Fix installation of translations. Closes: #619087. -- Iulian Udrea Mon, 18 Apr 2011 19:46:22 +0100 git-cola (1.4.3-2) unstable; urgency=low * Upload to unstable. -- Iulian Udrea Sun, 06 Feb 2011 16:21:23 +0000 git-cola (1.4.3-1) experimental; urgency=low * New upstream release. + git-dag beta™ now has a separate display area for displaying commit metadata. This area will soon grow additional functionality such as cherry-picking, branching, etc. + Fixed tests from a previous refactoring. + Guard against ‘diff.external’ configuration by always calling ‘git diff’ with the ‘–no-ext-diff’ option (http://github.com/davvid/git-cola/issues/closed#issue/67). + Respect ‘gui.diffcontext’ so that cola’s diff display shows the correct number of context lines. * Use JQuery from the Debian package: - Add libjs-jquery as a dependency. - Add symlink from /usr/share/javascript/jquery/jquery.js to /usr/share/doc/git-cola/html/_static/jquery.js. * Don't compress objects.inv. Thanks Michael Fladischer (Closes: #608752). -- Iulian Udrea Mon, 03 Jan 2011 13:48:51 +0000 git-cola (1.4.2.5-1) experimental; urgency=low * New upstream release. + Clicking on paths in the status widget copies them into the copy/paste buffer for easy middle-clicking into terminals. + Ctrl+C in diff viewer copies the selected diff to the clipboard. + Fixed the disappearing actions buttons on PyQt 4.7.4 as reported by Arch and Ubuntu 10.10. (Launchpad: #660363, #656539) (http://github.com/davvid/git-cola/issues/closed#issue/62). + Fixed mouse interaction with the status widget where some items could not be de-selected. + Removed hard-coded reference to lib/ when calculating Python’s site-packages directory. -- Iulian Udrea Thu, 28 Oct 2010 16:25:52 +0100 git-cola (1.4.2.4-1) experimental; urgency=low * New upstream release. + Removed “single-click to (un)stage” in the status view. + Added ability to create unsigned, annotated tags. + Updated documentation to use cola.git instead of cola.gitcmd. * Change my e-mail address. * Include BSD license text in debian/copyright rather than referencing /usr/share/common-licenses/BSD. -- Iulian Udrea Sun, 05 Sep 2010 13:31:34 +0100 git-cola (1.4.2.3-1) unstable; urgency=low * New upstream version. * debian/control: single line synopsis: gui -> GUI. Closes: #585947. * Bump Standards-Version to 3.9.1 (no changes required). -- Iulian Udrea Tue, 15 Jun 2010 19:17:53 +0100 git-cola (1.4.2.1-1) unstable; urgency=low * New upstream version. -- Iulian Udrea Tue, 25 May 2010 21:10:29 +0100 git-cola (1.4.2-1) unstable; urgency=low * New upstream version. + See share/doc/relnotes.rst for more information. * Drop setuppy.patch (merged upstream). * Rewrite debian/rules. * Switch to 3.0 (quilt) source format. * Remove README.source. It is not needed anymore (3.0 (quilt) source format). * Remove quilt build-dependency. * Update debian/copyright years. * Drop fix_doc_file.patch (merged upstream). * Add python-nose to Build-Depends. * Override dh_auto_test. * Bump debhelper version to 7.0.50. -- Iulian Udrea Sat, 24 Apr 2010 09:17:19 +0100 git-cola (1.4.1.2-4) unstable; urgency=low * Drop the version from the git-core run-time dependency. Closes: #568586 (The dependency on git-core (>= 1.5) is intended to exclude git from etch, for example, but unfortunately git from etch has a version number including an epoch. Since Debian does not support etch-to-squeeze upgrades anyway, it is simpler and more obvious to drop the version from the dependency.) + Thanks Jonathan Nieder for the patch. -- Iulian Udrea Wed, 07 Apr 2010 15:44:23 +0100 git-cola (1.4.1.2-3) unstable; urgency=low * debian/control: - git-difftool has been included in git-core and so it's irrelevant to mention it in the package description. + Thanks Jonathan Nieder for spotting this. * Add fix_doc_file.patch (Closes: #565766); (LP: #539269). + cola/resources.py:26: use git-cola.txt instead of the non-existing git-cola.html file. -- Iulian Udrea Fri, 19 Mar 2010 18:01:00 +0000 git-cola (1.4.1.2-2) unstable; urgency=low * debian/control: - Drop the version from the git-core dependency (Closes: #568586). + Thanks Jonathan Nieder - Add ${misc:Depends}. - DM-Upload-Allowed: yes - Bump Std-Ver to 3.8.4 (no changes required). -- Iulian Udrea Sun, 28 Feb 2010 19:59:22 +0000 git-cola (1.4.1.2-1) unstable; urgency=low * New upstream version. * debian/watch: remove "-src" * Update debian/copyright. * Add quilt. * Add setuppy.patch. -- Iulian Udrea Sun, 03 Jan 2010 13:30:17 +0000 git-cola (1.4.1-1) unstable; urgency=low * New upstream version. + Loads of fixes. See the ChangeLog for details. * Update debian/copyright. -- Iulian Udrea Sat, 05 Dec 2009 11:02:56 +0000 git-cola (1.4.0.4-1) unstable; urgency=low * New upstream version. * Fixed: - W: git-cola: non-standard-dir-in-usr usr/libexec/ - W: git-cola: file-in-unusual-dir usr/libexec/git-cola/ssh-askpass * debian/control: - Remove XB-Python-Version: ${python:Versions} as it's not needed with pysupport. - B-D-I on python instead of python-all-dev. -- Iulian Udrea Sun, 15 Nov 2009 16:14:41 +0000 git-cola (1.4.0-1) unstable; urgency=low * New upstream version (Closes: #554849). - Updates since v1.3.9 + The main GUI is flexible and user-configurable + Individual widgets can be detached and rearranged arbitrarily + Add an interface for creating tags + Provide a fallback SSH_ASKPASS implementation to prompt for SSH passwords on fetch/push/pull + Inherit the window manager's font settings + The commit message editor displays the current row/column and warns when lines get too long + The cola classic widget displays upstream changes + 'git cola --classic' launches cola classic in standalone mode + Provide more information in log messages + Miscellaneous PyQt4 bug fixes and workarounds -- Iulian Udrea Sat, 31 Oct 2009 15:15:31 +0000 git-cola (1.3.9.14-1) unstable; urgency=low * New upstream version. * debian/control: - Bump Standards-Version to 3.8.3; no changes required. -- Iulian Udrea Sat, 15 Aug 2009 23:37:40 +0100 git-cola (1.3.8-1) unstable; urgency=low * New upstream version. + setup.py: launch `pyuic4` with 'sh -c' to work around old pyuic4 bugs. Older versions of pyuic4 were implemented as a shell script instead of as python script. Interestingly, an older version existed that didn't have a '#!/bin/sh' shebang line. Use 'sh -c' to accommodate both current and older, buggy pyuic4s. * debian/control: - Add xxdiff to Recommends (LP: #386259). - Add python-sphinx and rsync to Build-Depends-Indep. -- Iulian Udrea Sat, 14 Jun 2009 11:11:00 +0100 git-cola (1.3.7.45-2) unstable; urgency=low * Remove git-difftool.1 symlink. dpkg is trying to overwrite `/usr/share/man/man1/git-difftool.1.gz', which is also in package git-core (Closes: #528128). -- Iulian Udrea Mon, 11 May 2009 06:34:40 +0100 git-cola (1.3.7.45-1) unstable; urgency=low * New upstream version. + inotify: fix a bug when exiting cola + docs: remove git-difftool.txt and update git-cola.txt + models: do not flag deleted files as modified + setup.py: add the private cola.models module + observable: use the current model's notify value when cloning + models: fix a bug in clone() * Remove {cola,git-difftool}.pod and manpages. * Add links file. * Update rules. -- Iulian Udrea Thu, 07 May 2009 06:44:29 +0100 git-cola (1.3.7.21-1) unstable; urgency=low * New upstream version. * Fix symlink (/usr/bin/git-difftool--helper). -- Iulian Udrea Tue, 28 Apr 2009 18:28:44 +0100 git-cola (1.3.7.6-1) unstable; urgency=low * New upstream version. + install private modules to /usr/share (Closes: #519972) * debian/control: - change Section to vcs -- Iulian Udrea Thu, 23 Apr 2009 06:37:14 +0100 git-cola (1.3.5.44-1) unstable; urgency=low * New upstream version. + cola.jsonpickle wasn't exception-safe and was breaking help('modules') (Closes: #519971) * Remove debian/dirs. -- Iulian Udrea Wed, 18 Mar 2009 05:51:51 +0000 git-cola (1.3.5.42-1) unstable; urgency=low * New upstream version. * debian/control: - Bump Standards-Version to 3.8.1.0 (no changes needed). -- Iulian Udrea Sun, 15 Mar 2009 19:39:37 +0000 git-cola (1.3.5.28-1) unstable; urgency=low * New upstream version. -- Iulian Udrea Sat, 21 Feb 2009 17:01:32 +0000 git-cola (1.3.5-1) unstable; urgency=low * New upstream version. + git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher. It supports kdiff3, tkdiff, xxdiff, meld, opendiff, emerge, ecmerge, vimdiff, gvimdiff, and custom user-configurable tools. * debian/rules: - make git-difftool-helper.1 be a symlink to git-difftool.1 -- Iulian Udrea Fri, 23 Jan 2009 07:12:28 +0000 git-cola (1.3.4.4-1) unstable; urgency=low * New upstream version. -- Iulian Udrea Fri, 02 Jan 2009 15:01:00 +0000 git-cola (1.3.2.5-1) unstable; urgency=low * New upstream version. - inotify: fix a bug introduced when removing the defaults module (Closes: #506993) -- Iulian Udrea Thu, 27 Nov 2008 06:48:00 +0000 git-cola (1.3.2-1) unstable; urgency=low * New upstream version. * debian/rules: - merge 'rm -f' into dh_clean - rename build-indep target to build-stamp - call dh_install in the install target instead of binary-indep - remove commented lines -- Iulian Udrea Sat, 18 Nov 2008 19:10:10 +0000 git-cola (1.3.0.3-1) unstable; urgency=low * New upstream version. * debian/patches: drop 01_cola-desktop.dpatch (included upstream) * debian/control: - add Vcs-* fields - add Recommends: gitk - remove dpatch from Build-Depends (not needed anymore) -- Iulian Udrea Fri, 07 Nov 2008 18:34:52 +0000 git-cola (1.2.68-1) unstable; urgency=low * New upstream version. -- Iulian Udrea Sat, 01 Nov 2008 13:08:13 +0000 git-cola (1.2.0-1) unstable; urgency=low * Initial release (Closes: #498656) -- Iulian Udrea Thu, 11 Sep 2008 22:21:30 +0100 debian/compat0000644000000000000000000000000211630006607010363 0ustar 7 debian/control0000644000000000000000000000174512247702225010603 0ustar Source: git-cola Section: vcs Priority: optional Maintainer: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 7.0.50), python-nose Build-Depends-Indep: python (>= 2.6.6-3~), pyqt4-dev-tools (>= 4.3), python-sphinx, rsync, git-core, gettext, asciidoc (>= 8.2), xmlto Standards-Version: 3.9.5 Homepage: http://git-cola.github.com/ Vcs-Git: git://git.debian.org/git/collab-maint/git-cola.git Vcs-Browser: http://git.debian.org/?p=collab-maint/git-cola.git Package: git-cola Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python-qt4, git-core, libjs-jquery, libjs-underscore Recommends: gitk, xxdiff Suggests: python-pyinotify, python-simplejson Description: highly caffeinated git GUI Git-cola is a git GUI optimized for working with the git index. . Git-cola can compare arbitrary commits using standard merge tools. With it you can search commit messages, content, authors, paths, data ranges etc. and it makes it easy to interactively edit the index. debian/copyright0000644000000000000000000001037512256367041011135 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Git Cola Upstream-Contact: David Aguilar Upstream-Source: http://cola.tuxfamily.org/ Files: * Copyright: Copyright (C) 2007-2012 David Aguilar and contributors License: GPL-2 Files: debian/* Copyright: Copyright (C) 2012- Laszlo Boszormenyi (GCS) , Copyright (C) 2008-2012 Iulian Udrea License: GPL-2 Files: bin/git-difftool Copyright: Copyright 2006 Theodore Y. Ts'o License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 or (at your option) any later version as published by the Free Software Foundation. . This program 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. Files: share/git-cola/icons/{binary.png,c.png,dir.png,generic.png,git.png,image.png,removed.png,script.png,untracked.png} Copyright: Copyright 2008 The Apache Software Foundation License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at `/usr/share/common-licenses/Apache-2.0' . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Files: share/git-cola/icons/{add.svg,edit-clear.svg,edit-copy.svg,edit-select-all.svg,open.svg,options.svg,remove.svg,undo.svg,view-refresh.svg,zoom-in.png,zoom-out.png} Copyright: Tango Desktop Project License: public-domain Files: share/cola/icons/staged.png Copyright: Copyright 2003 Sean Parsons License: GPL-any Unspecified GPL license. Files: cola/git.py Copyright: Copyright 2008, 2009 Michael Trier and contributors License: BSD Copyright (c) The Regents of the University of California. All rights reserved. . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. . This program 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, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. debian/links0000644000000000000000000000021011630006607010221 0ustar usr/share/man/man1/git-cola.1 usr/share/man/man1/git-difftool--helper.1 usr/share/man/man1/git-cola.1 usr/share/man/man1/cola.1 debian/menu0000644000000000000000000000015611630006607010056 0ustar ?package(git-cola):needs="X11" section="Applications/Programming"\ title="Cola" command="/usr/bin/git-cola" debian/rules0000755000000000000000000000260312037377524010261 0ustar #!/usr/bin/make -f # -*- makefile -*- # Sample debian/rules that uses debhelper. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 package=git-cola override_dh_auto_test: build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: dh_testdir $(MAKE) all doc touch $@ clean: dh_testdir dh_testroot dh_clean build-stamp [ ! -f Makefile ] || $(MAKE) clean install: build dh_testdir dh_testroot dh_install dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/$(package) prefix=/usr install install-doc install-html find . -name "*.pyc" -delete # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs dh_installexamples dh_installman dh_installmenu dh_python2 # dh_link /usr/share/javascript/jquery/jquery.js \ # /usr/share/doc/git-cola/html/_static/jquery.js dh_link /usr/share/javascript/jquery/jquery.js \ /usr/share/doc/git-cola/html/static/jquery.js dh_link /usr/share/javascript/underscore/underscore.js \ /usr/share/doc/git-cola/html/static/underscore.js dh_strip dh_compress -Xobjects.inv dh_fixperms dh_perl dh_installdeb dh_gencontrol dh_md5sums dh_builddeb # Build architecture-dependent files here. binary-arch: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install override_dh_auto_test debian/source/0000755000000000000000000000000011630006607010465 5ustar debian/source/format0000644000000000000000000000001411630006607011673 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000023712062743413010223 0ustar version=3 https://github.com/git-cola/git-cola/tags .*/v?(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz)) # Bart Martens Thu, 22 Nov 2012 14:17:58 +0000