From da879f225497f3ef41a8390cfd8c76cdbcccd4d3 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 11:25:49 -0700 Subject: [PATCH 1/4] Makefile: Allow lisp installation dir to be overridden (helps debian packaging) --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7bab91a..85e6aa4 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,13 @@ test: .PHONY: test PREFIX=/usr/local +LISPDIR=/share/emacs/site-lisp install: $(ALL) mkdir -p "$(PREFIX)/bin" mkdir -p "$(PREFIX)/share/man/man1" - mkdir -p "$(PREFIX)/share/emacs/site-lisp" + mkdir -p "$(PREFIX)$(LISPDIR)" mkdir -p "$(PREFIX)/share/doc/commit-patch" cp -a $(BIN) "$(PREFIX)/bin" cp -a $(MAN) "$(PREFIX)/share/man/man1" - cp -a $(ELISP) "$(PREFIX)/share/emacs/site-lisp" + cp -a $(ELISP) "$(PREFIX)$(LISPDIR)" cp -a $(DOC) "$(PREFIX)/share/doc/commit-patch" -- 2.51.2 From 47c8b7003a8ebea5bf6eb49e4f874dc626d6e959 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 11:27:09 -0700 Subject: [PATCH 2/4] commit-patch: Don't hardcode vi quite as much (helps debian packaging) --- commit-patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commit-patch b/commit-patch index 9b5b2c9..2861a32 100755 --- a/commit-patch +++ b/commit-patch @@ -4,6 +4,7 @@ # This code can be distributed under the terms of the GNU Public License (Version 2 or greater). my $VERSION = '2.6.1'; +my $FALLBACK_EDITOR = 'vi'; use strict; use Cwd qw(abs_path); @@ -180,7 +181,7 @@ if ($commit_partial) { run([split(/ /,$vc{diff}), @ARGV], '>>', $patch); } - system(($ENV{VISUAL} || $ENV{EDITOR} || 'vi')." ".$patch); + system(($ENV{VISUAL} || $ENV{EDITOR} || $FALLBACK_EDITOR)." ".$patch); my $last_patch = "#last-comit-partial.patch"; unlink "$last_patch.3"; rename "$last_patch.2", "$last_patch.3"; -- 2.51.2 From 20e79df3c1edb0c8da86fa6a329c723bb2bd9dde Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 12:19:52 -0700 Subject: [PATCH 3/4] Version 2.6.2 --- Changes | 6 ++++++ commit-patch | 2 +- commit-patch-buffer.el | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 92324c8..8bd3ced 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,9 @@ +commit-patch (2.6.2) + + * Small changes to help debian packaging. + + -- David Caldwell Mon, 06 Sep 2021 12:19:25 -0700 + commit-patch (2.6.1) * Fixed a bug in `commit-patch-buffer` that caused `vc-annotate` to be diff --git a/commit-patch b/commit-patch index 2861a32..a086ef5 100755 --- a/commit-patch +++ b/commit-patch @@ -3,7 +3,7 @@ # and Jim Radford # This code can be distributed under the terms of the GNU Public License (Version 2 or greater). -my $VERSION = '2.6.1'; +my $VERSION = '2.6.2'; my $FALLBACK_EDITOR = 'vi'; use strict; diff --git a/commit-patch-buffer.el b/commit-patch-buffer.el index e5470d9..c856242 100644 --- a/commit-patch-buffer.el +++ b/commit-patch-buffer.el @@ -4,7 +4,7 @@ ;; and David Caldwell ;; This code can be distributed under the terms of the GNU Public License (Version 2 or greater). ;; -;; Version: 2.5 +;; Version: 2.6.2 ;; ;; Author: Jim Radford ;; David Caldwell -- 2.51.2 From 572ee6af2f8b5e5ef622459f02a9ddcb8109db29 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 12:31:25 -0700 Subject: [PATCH 4/4] Whoops. One more copyright date to fix. --- commit-patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-patch b/commit-patch index a086ef5..592d571 100755 --- a/commit-patch +++ b/commit-patch @@ -386,7 +386,7 @@ Jim Radford =head1 COPYRIGHT AND LICENSE -Copyright © 2003-2015 by David Caldwell and Jim Radford. +Copyright © 2003-2021 by David Caldwell and Jim Radford. B is distributed under the GNU General Public License. See the COPYING file in the distribution for more details. -- 2.51.2