Replace debian/patches with makefile overrides and hacky sed script
David Caldwell
2 years ago
debian/patches/makefile-install_el_files_to_correct_dir.patch
less
more
| 0 | |
Description: Fix elisp install location
|
| 1 | |
Author: David Caldwell <david@porkrind.org>
|
| 2 | |
|
| 3 | |
Index: commit-patch/Makefile
|
| 4 | |
===================================================================
|
| 5 | |
--- commit-patch.orig/Makefile 2019-02-13 23:14:06.678581982 -0800
|
| 6 | |
+++ commit-patch/Makefile 2019-02-13 23:14:06.646581248 -0800
|
| 7 | |
@@ -42,9 +42,9 @@
|
| 8 | |
install: $(ALL)
|
| 9 | |
mkdir -p "$(PREFIX)/bin"
|
| 10 | |
mkdir -p "$(PREFIX)/share/man/man1"
|
| 11 | |
- mkdir -p "$(PREFIX)/share/emacs/site-lisp"
|
| 12 | |
+ mkdir -p "$(PREFIX)/share/emacs/site-lisp/commit-patch"
|
| 13 | |
mkdir -p "$(PREFIX)/share/doc/commit-patch"
|
| 14 | |
cp -a $(BIN) "$(PREFIX)/bin"
|
| 15 | |
cp -a $(MAN) "$(PREFIX)/share/man/man1"
|
| 16 | |
- cp -a $(ELISP) "$(PREFIX)/share/emacs/site-lisp"
|
| 17 | |
+ cp -a $(ELISP) "$(PREFIX)/share/emacs/site-lisp/commit-patch"
|
| 18 | |
cp -a $(DOC) "$(PREFIX)/share/doc/commit-patch"
|
| 0 | |
makefile-install_el_files_to_correct_dir.patch
|
| 1 | |
use-editor-instead-of-vi.patch
|
debian/patches/use-editor-instead-of-vi.patch
less
more
| 0 | |
Index: commit-patch/commit-patch
|
| 1 | |
===================================================================
|
| 2 | |
--- commit-patch.orig/commit-patch 2019-02-13 23:18:12.007932991 -0800
|
| 3 | |
+++ commit-patch/commit-patch 2019-02-13 23:18:35.996431443 -0800
|
| 4 | |
@@ -178,7 +178,7 @@
|
| 5 | |
|
| 6 | |
run([split(/ /,$vc{diff}), @ARGV], '>>', $patch);
|
| 7 | |
}
|
| 8 | |
- system(($ENV{VISUAL} || $ENV{EDITOR} || 'vi')." ".$patch);
|
| 9 | |
+ system(($ENV{VISUAL} || $ENV{EDITOR} || 'editor')." ".$patch);
|
| 10 | |
my $last_patch = "#last-comit-partial.patch";
|
| 11 | |
unlink "$last_patch.3";
|
| 12 | |
rename "$last_patch.2", "$last_patch.3";
|
| 4 | 4 |
#export DH_VERBOSE=1
|
| 5 | 5 |
|
| 6 | 6 |
override_dh_auto_install:
|
| 7 | |
make install PREFIX=debian/commit-patch/usr
|
|
7 |
make install PREFIX=debian/commit-patch/usr LISPDIR=/share/emacs/site-lisp/commit-patch
|
| 8 | 8 |
# No need for another copy of the GPL:
|
| 9 | 9 |
rm debian/commit-patch/usr/share/doc/commit-patch/COPYING
|
| 10 | 10 |
# Installed by dh_installchangelogs:
|
| 11 | 11 |
rm debian/commit-patch/usr/share/doc/commit-patch/Changes
|
|
12 |
# Set the correct debian editor
|
|
13 |
sed -i 's/FALLBACK_EDITOR *=.*/FALLBACK_EDITOR = "editor";/' debian/commit-patch/usr/bin/commit-patch
|
| 12 | 14 |
|
| 13 | 15 |
# Skip tests. They aren't mature enough to offer any benefit during packaging.
|
| 14 | 16 |
override_dh_auto_test:
|