debian/0000755000000000000000000000000012177716100007170 5ustar debian/source/0000755000000000000000000000000012177716100010470 5ustar debian/source/format0000644000000000000000000000001412177715571011711 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000000274712177715571011150 0ustar Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat Upstream-Name: Guilt Upstream-Maintainer: Josef "Jeff" Sipek Upstream-Source: http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ Files: * Copyright: Copyright (c) Josef "Jeff" Sipek, 2006-2011 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. On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL-2'. Files: guilt-files Copyright: Copyright (C) 2007 Yasushi SHOJI Files: Documentation/* Copyright: Copyright (c) Josef "Jeff" Sipek, 2006-2009 Copyright (c) Brandon Philips 2007 License: GPL-2 See above. Files: debian/* Copyright: Copyright (c) Brandon Philips 2007 Copyright (C) 2009-2011 Iulian Udrea License: GPL-2 See above. debian/changelog0000644000000000000000000001442612177716054011061 0ustar guilt (0.35-1.2ubuntu1) saucy; urgency=low * Merge from Debian, remaining changes: - Run regression test suite. - Take a patch from fedora to "workaround" the test-suite with git 1.8. - Add autopkgtest to test against current git. -- Dmitrijs Ledkovs Mon, 05 Aug 2013 13:35:12 +0100 guilt (0.35-1.2) unstable; urgency=low * Non-maintainer upload with maintainer's permission. * Fix unneeded conflict against git >= 1.8 by dropping the (for Debian) unneeded in-program git version check as suggested by Jonathan Nieder in #589708 (Closes: #692884) * Reorder alternative dependencies: prefer git over transitional package git-core. * Set Homepage header to http://repo.or.cz/w/guilt.git (Closes: #692883) * Fix man-page path for "guilt help" (Closes: #712620; LP #1191821) -- Axel Beckert Tue, 18 Jun 2013 01:21:57 +0200 guilt (0.35-1.1) unstable; urgency=low * Non-maintainer upload. * Update maintainer email address (Closes: #698259) -- Jonathan Wiltshire Sun, 20 Jan 2013 18:32:26 +0000 guilt (0.35-1ubuntu2) raring; urgency=low * And actually drop strict git version Depends. -- Dmitrijs Ledkovs Sun, 11 Nov 2012 22:12:31 +0000 guilt (0.35-1ubuntu1) raring; urgency=low * Run regression test suite. * Take a patch from fedora to "workaround" the test-suite with git 1.8. * Drop git version checks. * Add autopkgtest to test against current git. -- Dmitrijs Ledkovs Sat, 10 Nov 2012 14:09:15 +0000 guilt (0.35-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.9.2; no changes required. * Update copyright. * Switch to dpkg-source 3.0 (quilt) format. * Refresh patches. -- Iulian Udrea Fri, 05 Aug 2011 22:31:35 +0100 guilt (0.34-2) unstable; urgency=low * Upload to unstable. -- Iulian Udrea Sun, 06 Feb 2011 15:51:36 +0000 guilt (0.34-1) experimental; urgency=low * New upstream release. + patchbomb: add some patch formatting options to the CLI (upstream commit f833954a61ff01e09e0c) + Make sure the commit time is increasing (upstream commit 429c3a5303616ec3229f) * debian/{control,copyright}: change my email address. -- Iulian Udrea Thu, 23 Sep 2010 11:07:52 +0100 guilt (0.33-2) unstable; urgency=low * Bump Standards-Version to 3.9.1 (no changes required). * Add depends on git (<< 1:1.8). Thanks Jonathan for the patch. Closes: #589708 -- Iulian Udrea Sun, 01 Aug 2010 15:32:06 +0100 guilt (0.33-1) unstable; urgency=low * New upstream release. + Add support for git version 1.7.x.y. Closes: #576937 -- Iulian Udrea Mon, 19 Apr 2010 11:09:06 +0100 guilt (0.32.2-2) unstable; urgency=low * debian/control: - Add Dm-Upload-Allowed: yes. - Bump Standards-Version to 3.8.4 (no changes required). -- Iulian Udrea Fri, 05 Mar 2010 19:51:53 +0000 guilt (0.32.2-1) unstable; urgency=low * New upstream release. + guilt-import-commit doesn't support binary files (Closes: #563962) * debian/control: - bump Standards-Version to 3.8.3 (no changes required) - add ${misc:Depends} * Add README.source. -- Iulian Udrea Fri, 15 Jan 2010 14:05:11 +0000 guilt (0.32.1-1) unstable; urgency=low * New upstream release. - allow guilt to handle binary files - regression: fix output mismatch with git 1.6.2 - select/guard: fix bashism (Closes: #530094) * debian/control: - bump Standards-Version to 3.8.1 (no changes required) -- Iulian Udrea Sat, 30 May 2009 08:02:41 +0100 guilt (0.32-1) unstable; urgency=low * New maintainer (Closes: #519020). * New upstream release. - drop bashisms patch as it's fixed upstream, commit 2ab56864 (Closes: #464983) - make guilt work even after git-sh-setup is moved out of the user's path; upstream commit 7a6e2a53 (Closes: #501952) - docs: handle `git describe` failing; upstream commit e730f590 (Closes: #474628) - guilt-fold: merge headers of the 2 patches; upstream commit 10278340 (Closes: #489884) * debian/control: - bump debhelper version to 7 - bump Standards-Version to 3.8.0 + add Homepage field - add Vcs-* fields - improve Description - package is architecture-independent * Completely rewritten the debian/rules file. * Switch to new debian/copyright format (http://wiki.debian.org/Proposals/CopyrightFormat). * Remove debian/dirs. Those directories are already created on every system. * Remove commented lines from debian/watch file. * Split debian/patches/makefile.patch into two patches: Makefile.patch and DocMakefile.patch. -- Iulian Udrea Tue, 10 Mar 2009 20:10:30 +0000 guilt (0.30-1.1) unstable; urgency=low * Non-maintainer upload. * Fix bashism in guilt-patchbomb (added debian/patches/bashisms) (Closes: #489606) -- Matthew Johnson Sun, 24 Aug 2008 11:34:50 +0000 guilt (0.30-1) unstable; urgency=low * New upstream release -- Brandon Philips Tue, 27 May 2008 07:49:27 -0700 guilt (0.28-1) unstable; urgency=low * New upstream release -- Brandon Philips Mon, 19 Nov 2007 15:44:02 -0800 guilt (0.27-1) unstable; urgency=low * New upstream release -- Brandon Philips Wed, 01 Aug 2007 13:19:31 -0700 guilt (0.26-1) unstable; urgency=low * New upstream release -- Brandon Philips Tue, 24 Jul 2007 08:32:44 -0700 guilt (0.25-1) unstable; urgency=low * New upstream release -- Brandon Philips Tue, 15 May 2007 18:35:14 -0700 guilt (0.24-1) unstable; urgency=low * New upstream release -- Brandon Philips Mon, 23 Apr 2007 10:55:39 -0700 guilt (0.23-1) unstable; urgency=low * New upstream version -- Brandon Philips Tue, 20 Mar 2007 23:43:28 -0700 guilt (0.22-1) unstable; urgency=low * New upstream release -- Brandon Philips Tue, 20 Mar 2007 00:53:31 -0700 guilt (0.20-1) unstable; urgency=low * Initial release (Closes: #412650) -- Brandon Philips Mon, 26 Feb 2007 21:59:56 -0800 debian/control0000644000000000000000000000205612177716076010612 0ustar Source: guilt Section: devel Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Iulian Udrea DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7), git Build-Depends-Indep: asciidoc (>> 7.0.2-3), xmlto, libexpat1-dev Standards-Version: 3.9.2 XS-Testsuite: autopkgtest Homepage: http://repo.or.cz/w/guilt.git Vcs-Browser: http://git.debian.org/?p=collab-maint/guilt.git Vcs-Git: git://git.debian.org/git/collab-maint/guilt.git Package: guilt Architecture: all Depends: ${misc:Depends}, git (>= 1:1.7) | git-core (>= 1.4) Description: quilt for git; similar to Mercurial queues Guilt (Git Quilt) is a series of bash scripts which add a Mercurial queues-like functionality and interface to git. The one distinguishing feature from other quilt-like porcelains, is the format of the patches directory. . All the information is stored as plain text - a series file and the patches (one per file). This easily lends itself to versioning the patches using any number of SCMs. debian/rules0000755000000000000000000000016412177715571010264 0ustar #!/usr/bin/make -f # -*- makefile -*- %: dh $@ override_dh_auto_install: dh_auto_install -- install install-doc debian/watch0000644000000000000000000000013112177715571010227 0ustar version=3 http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/guilt-(.*)\.tar\.gz debian/patches/0000755000000000000000000000000012177716100010617 5ustar debian/patches/Makefile.patch0000644000000000000000000000023612177715571013371 0ustar # Description: Use /usr instead of /usr/local --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PREFIX?=/usr/local +PREFIX?=/usr DESTDIR?= INSTALL?=install debian/patches/fix-guilt-help-man-page-path.patch0000644000000000000000000000072612177715573017135 0ustar Description: Fix "guilt help" man page path Author: Axel Beckert Debian-Bug: 712620 Index: guilt/guilt-help =================================================================== --- guilt.orig/guilt-help 2013-06-17 18:47:39.000000000 +0200 +++ guilt/guilt-help 2013-06-18 01:13:58.000000000 +0200 @@ -34,7 +34,7 @@ ;; esac -MANDIR=`dirname $0`/../man +MANDIR=`dirname $0`/../share/man MANDIR=`(cd "$MANDIR"; pwd)` exec man -M "$MANDIR" "$page" debian/patches/DocMakefile.patch0000644000000000000000000000050312177715571014014 0ustar # Description: Install docs to /usr/share/man instead of /usr/man. --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -12,7 +12,7 @@ prefix?=$(PREFIX) bindir?=$(prefix)/bin htmldir?=$(prefix)/html -mandir?=$(prefix)/man +mandir?=$(prefix)/share/man man1dir=$(mandir)/man1 man7dir=$(mandir)/man7 # DESTDIR= debian/patches/adt.patch0000644000000000000000000000152012177715571012421 0ustar Index: b/regression/scaffold =================================================================== --- a/regression/scaffold +++ b/regression/scaffold @@ -25,7 +25,9 @@ UNAME_S=`uname -s` -if [ -r "$REG_DIR/../os.$UNAME_S" ]; then +if [ "$ADTTMP" ]; then + . "/usr/lib/guilt/os.$UNAME_S" +elif [ -r "$REG_DIR/../os.$UNAME_S" ]; then . "$REG_DIR/../os.$UNAME_S" else die "Unsupported operating system: $UNAME_S" Index: b/regression/bin/dump_reg =================================================================== --- a/regression/bin/dump_reg +++ b/regression/bin/dump_reg @@ -7,7 +7,9 @@ UNAME_S=`uname -s` -if [ -r "$REG_DIR/../os.$UNAME_S" ]; then +if [ "$ADTTMP" ]; then + . "/usr/lib/guilt/os.$UNAME_S" +elif [ -r "$REG_DIR/../os.$UNAME_S" ]; then . "$REG_DIR/../os.$UNAME_S" else die "Unsupported operating system: $UNAME_S" debian/patches/guilt-tests-git-workaround.patch0000644000000000000000000001011512177715571017107 0ustar Description: Newer git doesn't like empty patch files. I don't know if this _breaks_ the tests or not, but at least we build, eh. Author: Eric Sandeen Origin: http://pkgs.fedoraproject.org/cgit/guilt.git/commit/?id=b6859824ab57bf5bf669554d579daf48a437c5ee Index: guilt-0.35/regression/t-025.sh =================================================================== --- guilt-0.35.orig/regression/t-025.sh +++ guilt-0.35/regression/t-025.sh @@ -16,7 +16,7 @@ for pname in file dir/file dir/subdir/fi cmd guilt new "$pname" cmd guilt pop fixup_time_info "$pname" - cmd guilt push + cmd guilt push 2>&1 | grep -v "fatal: unrecognized input" cmd list_files done @@ -26,7 +26,7 @@ cmd guilt push --all cmd guilt new append cmd guilt pop fixup_time_info append -cmd guilt push +cmd guilt push 2>&1 | grep -v "fatal: unrecognized input" cmd list_files @@ -35,7 +35,7 @@ cmd guilt pop --all cmd guilt new prepend cmd guilt pop fixup_time_info prepend -cmd guilt push +cmd guilt push 2>&1 | grep -v "fatal: unrecognized input" cmd list_files Index: guilt-0.35/regression/t-028.sh =================================================================== --- guilt-0.35.orig/regression/t-028.sh +++ guilt-0.35/regression/t-028.sh @@ -19,7 +19,7 @@ cmd guilt push -a cmd guilt new -s -m "blah blah blah" patch-with-some-desc cmd guilt pop fixup_time_info patch-with-some-desc -cmd guilt push +cmd guilt push 2>&1 | grep -v "fatal: unrecognized input" cmd list_files Index: guilt-0.35/regression/t-051.sh =================================================================== --- guilt-0.35.orig/regression/t-051.sh +++ guilt-0.35/regression/t-051.sh @@ -25,13 +25,13 @@ function std_tests # create a couple of dummy (empty) patches strategically placed thoughout # the series cmd guilt new first -cmd guilt push modify +cmd guilt push modify 2>&1 | grep -v "fatal: unrecognized input" cmd guilt new second -cmd guilt push add +cmd guilt push add 2>&1 | grep -v "fatal: unrecognized input" cmd guilt new third -cmd guilt push remove +cmd guilt push remove 2>&1 | grep -v "fatal: unrecognized input" cmd guilt new fourth -cmd guilt push mode +cmd guilt push mode 2>&1 | grep -v "fatal: unrecognized input" cmd guilt new fifth cmd guilt pop -a fixup_time_info first @@ -48,7 +48,7 @@ p=first # no guarded patches; no guards selected cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -56,7 +56,7 @@ cmd list_files # no guarded patches; one guard selected cmd guilt select foo cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -65,7 +65,7 @@ cmd list_files cmd guilt select -n cmd guilt guard $p +foo cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -73,7 +73,7 @@ cmd list_files # one positive guarded patch; that guard selected cmd guilt select foo cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -82,7 +82,7 @@ cmd list_files cmd guilt select -n cmd guilt select bar cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -92,7 +92,7 @@ cmd guilt select -n cmd guilt guard -l cmd guilt guard $p -foo cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -100,7 +100,7 @@ cmd list_files # one negative guarded patch; that guard selected cmd guilt select foo cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files @@ -109,7 +109,7 @@ cmd list_files cmd guilt select -n cmd guilt select bar cmd guilt guard -l -cmd guilt push -a +cmd guilt push -a 2>&1 | grep -v "fatal: unrecognized input" std_tests cmd guilt pop -a cmd list_files debian/patches/no-version-check.patch0000644000000000000000000000066012177715571015027 0ustar Description: no version checks --- guilt-0.35.orig/guilt +++ guilt-0.35/guilt @@ -26,17 +26,6 @@ SUBDIRECTORY_OK=1 . "$(git --exec-path)/git-sh-setup" # -# Git version check -# -gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'` -case "$gitver" in - 1.5.*) ;; # git config - 1.6.*) ;; # git config - 1.7.*) ;; # git config - *) die "Unsupported version of git ($gitver)" ;; -esac - -# # Shell library # usage() debian/patches/series0000644000000000000000000000021312177715741012042 0ustar DocMakefile.patch Makefile.patch drop-dependency-check.patch fix-guilt-help-man-page-path.patch guilt-tests-git-workaround.patch adt.patch debian/patches/drop-dependency-check.patch0000644000000000000000000000117412177715573016013 0ustar Description: Drop in-program git version check Author: Axel Beckert Debian-Bug: 692884 Index: guilt/guilt =================================================================== --- guilt.orig/guilt 2013-06-17 18:47:39.000000000 +0200 +++ guilt/guilt 2013-06-17 22:57:35.000000000 +0200 @@ -26,17 +26,6 @@ . "$(git --exec-path)/git-sh-setup" # -# Git version check -# -gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'` -case "$gitver" in - 1.5.*) ;; # git config - 1.6.*) ;; # git config - 1.7.*) ;; # git config - *) die "Unsupported version of git ($gitver)" ;; -esac - -# # Shell library # usage() debian/docs0000644000000000000000000000011212177715571010050 0ustar Documentation/Contributing Documentation/HOWTO Documentation/Requirements debian/compat0000644000000000000000000000000212177715571010401 0ustar 7 debian/tests/0000755000000000000000000000000012177716100010332 5ustar debian/tests/upstream0000644000000000000000000000011212177715571012122 0ustar #!/bin/sh set -e cp -r regression $ADTTMP make -C $ADTTMP/regression all debian/tests/control0000644000000000000000000000006512177715571011751 0ustar Tests: upstream Depends: guilt, make, git, coreutils