--- git-cola-1.4.0.4.orig/debian/copyright +++ git-cola-1.4.0.4/debian/copyright @@ -0,0 +1,61 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Name: Git Cola +Upstream-Maintainer: David Aguilar +Upstream-Source: http://cola.tuxfamily.org/ + +Files: * +Copyright: Copyright 2008 David Aguilar +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. + +Files: debian/* +Copyright: Copyright 2008-2009 Iulian Udrea +License: GPL-2 + See above. + +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/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 License, Version 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/cola/icons/staged.png +Copyright: Copyright 2003 Sean Parsons +License: GPL-any + Unspecified GPL license. + +Files: cola/git.py +Copyright: Copyright 2008 Michael Trier and contributors +License: BSD + Please see `/usr/share/common-licenses/BSD' --- git-cola-1.4.0.4.orig/debian/compat +++ git-cola-1.4.0.4/debian/compat @@ -0,0 +1 @@ +7 --- git-cola-1.4.0.4.orig/debian/changelog +++ git-cola-1.4.0.4/debian/changelog @@ -0,0 +1,176 @@ +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 + --- git-cola-1.4.0.4.orig/debian/menu +++ git-cola-1.4.0.4/debian/menu @@ -0,0 +1,2 @@ +?package(git-cola):needs="X11" section="Applications/Programming"\ + title="Cola" command="/usr/bin/git-cola" --- git-cola-1.4.0.4.orig/debian/links +++ git-cola-1.4.0.4/debian/links @@ -0,0 +1,2 @@ +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 --- git-cola-1.4.0.4.orig/debian/control +++ git-cola-1.4.0.4/debian/control @@ -0,0 +1,26 @@ +Source: git-cola +Section: vcs +Priority: optional +Maintainer: Iulian Udrea +Build-Depends: debhelper (>= 7) +Build-Depends-Indep: python, python-support (>= 0.5.3), pyqt4-dev-tools (>= 4.3), python-sphinx, rsync, git-core (>= 1.5), gettext, asciidoc (>= 8.2), xmlto +Standards-Version: 3.8.3 +Homepage: http://cola.tuxfamily.org/ +XS-Python-Version: all +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}, python-qt4, git-core (>= 1.5) +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. It + includes a custom git command called git-difftool that allows you + to stage changes using the standard git merge tools. + . + 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. --- git-cola-1.4.0.4.orig/debian/rules +++ git-cola-1.4.0.4/debian/rules @@ -0,0 +1,51 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +package=git-cola + +build: 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_pysupport + dh_link + dh_strip + dh_compress + 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 --- git-cola-1.4.0.4.orig/debian/watch +++ git-cola-1.4.0.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://cola.tuxfamily.org/releases/cola-(.*)-src\.tar\.gz