From 714c89ec2ad8b191b5a04644234e651c798227b7 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 01:47:40 -0800 Subject: [PATCH 01/56] Current Debian packaging stuff. --- debian/changelog | 16 +++++++ debian/clean | 2 + debian/compat | 1 + debian/control | 25 +++++++++++ debian/copyright | 43 ++++++++++++++++++ debian/emacsen-install | 45 +++++++++++++++++++ debian/emacsen-remove | 15 +++++++ debian/emacsen-startup | 23 ++++++++++ ...file-install_el_files_to_correct_dir.patch | 17 +++++++ debian/patches/series | 2 + debian/patches/specify-gpl-version-2.patch | 28 ++++++++++++ debian/rules | 12 +++++ debian/source/format | 1 + debian/watch | 3 ++ 14 files changed, 233 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/clean create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/emacsen-install create mode 100644 debian/emacsen-remove create mode 100644 debian/emacsen-startup create mode 100644 debian/patches/makefile-install_el_files_to_correct_dir.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/specify-gpl-version-2.patch create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..83c0f22 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,16 @@ +commit-patch (2.4-1) unstable; urgency=low + + * New upstream version. + + * Upgraded to standards base 3.9.1. + + * Fixed a slew of packaging issues pointed out by Gregor Herrmann + . + + -- David Caldwell Wed, 23 Feb 2011 01:22:03 -0800 + +commit-patch (2.3-1) unstable; urgency=low + + * Initial Debian release (Closes: #574787) + + -- David Caldwell Sat, 20 Mar 2010 15:42:43 -0700 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..af24e36 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +commit-patch.1 +commit-patch.html diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b901f7c --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: commit-patch +Section: vcs +Priority: optional +Maintainer: David Caldwell +Build-Depends: debhelper (>= 7.0.50~), perl +Standards-Version: 3.9.1 +Homepage: http://porkrind.org/commit-patch/ + +Package: commit-patch +Architecture: all +Depends: ${misc:Depends}, perl, libipc-run-perl, patch, patchutils +Suggests: darcs | git | mercurial | bzr | subversion | cvs +Description: utility to commit fine grained patches to source code control repositories + Normally version control systems don't allow fine grained + commits. commit-patch allows the user to control exactly what gets + committed by letting the user supply a patch to be committed rather than + using the files in the current working directory. + . + commit-patch supports Darcs, Git, Mercurial, Bazaar, Subversion, or CVS + repositories. + . + Also included is an Emacs interface to commit-patch. It allows you to just + hit C-c C-c in any patch buffer to apply and commit only the changes + indicated by the patch, regardless of the changes in your working + directory. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b73e8c4 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,43 @@ +This work was packaged for Debian by: + + David Caldwell on Sat, 20 Mar 2010 15:42:43 -0700 + +It was downloaded from: + + + +Upstream Authors: + + o David Caldwell + o Jim Radford + +Copyright: + + Copyright 2003-2010 by David Caldwell and Jim Radford. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package 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, see + +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +The Debian packaging is: + + Copyright (C) 2010,2011 David Caldwell + +you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. diff --git a/debian/emacsen-install b/debian/emacsen-install new file mode 100644 index 0000000..1b413e5 --- /dev/null +++ b/debian/emacsen-install @@ -0,0 +1,45 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/commit-patch + +# Written by Jim Van Zandt , borrowing heavily +# from the install scripts for gettext by Santiago Vila +# and octave by Dirk Eddelbuettel . + +FLAVOR=$1 +PACKAGE=commit-patch + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /usr/sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 diff --git a/debian/emacsen-remove b/debian/emacsen-remove new file mode 100644 index 0000000..1768fbb --- /dev/null +++ b/debian/emacsen-remove @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/commit-patch + +FLAVOR=$1 +PACKAGE=commit-patch + +if [ ${FLAVOR} != emacs ]; then + if test -x /usr/sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/commit-patch.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi diff --git a/debian/emacsen-startup b/debian/emacsen-startup new file mode 100644 index 0000000..9a965f2 --- /dev/null +++ b/debian/emacsen-startup @@ -0,0 +1,23 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50commit-patch.el +;; for the Debian commit-patch package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; The commit-patch package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(let ((package-dir (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/commit-patch"))) +;; If package-dir does not exist, the commit-patch package must have +;; removed but not purged, and we should skip the setup. + (when (file-directory-p package-dir) + (setq load-path (cons package-dir load-path)) + (eval-after-load 'diff-mode + '(require 'commit-patch-buffer nil 'noerror)))) diff --git a/debian/patches/makefile-install_el_files_to_correct_dir.patch b/debian/patches/makefile-install_el_files_to_correct_dir.patch new file mode 100644 index 0000000..0b354df --- /dev/null +++ b/debian/patches/makefile-install_el_files_to_correct_dir.patch @@ -0,0 +1,17 @@ +Description: Fix elisp install location +Author: David Caldwell + +--- commit-patch-2.3.orig/Makefile ++++ commit-patch-2.3/Makefile +@@ -32,9 +32,9 @@ PREFIX=/usr/local + install: $(ALL) + mkdir -p "$(PREFIX)/bin" + mkdir -p "$(PREFIX)/share/man/man1" +- mkdir -p "$(PREFIX)/share/emacs/site-lisp" ++ mkdir -p "$(PREFIX)/share/emacs/site-lisp/commit-patch" + 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)/share/emacs/site-lisp/commit-patch" + cp -a $(DOC) "$(PREFIX)/share/doc/commit-patch" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..64085dc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +specify-gpl-version-2.patch +makefile-install_el_files_to_correct_dir.patch diff --git a/debian/patches/specify-gpl-version-2.patch b/debian/patches/specify-gpl-version-2.patch new file mode 100644 index 0000000..116e784 --- /dev/null +++ b/debian/patches/specify-gpl-version-2.patch @@ -0,0 +1,28 @@ +Description: Specify which version of the GPL we are licenced under. +Author: David Caldwell + +Index: commit-patch/commit-patch +=================================================================== +--- commit-patch.orig/commit-patch 2011-02-23 01:42:34.000000000 -0800 ++++ commit-patch/commit-patch 2011-02-23 01:43:28.000000000 -0800 +@@ -1,7 +1,7 @@ + #!/usr/bin/perl -w + # Copyright (c) 2003-2010 David Caldwell + # and Jim Radford , All Rights Reserved. +-# This code can be distributed under the terms of the GNU Public License ++# This code can be distributed under the terms of the GNU Public License (Version 2 or greater). + + my $VERSION = '2.4'; + +Index: commit-patch/commit-patch-buffer.el +=================================================================== +--- commit-patch.orig/commit-patch-buffer.el 2011-02-23 01:43:19.000000000 -0800 ++++ commit-patch/commit-patch-buffer.el 2011-02-23 01:43:28.000000000 -0800 +@@ -1,6 +1,6 @@ + ;; Copyright 2003-2010 Jim Radford + ;; and David Caldwell , All Rights Reserved. +-;; This code can be distributed under the terms of the GNU Public License ++;; This code can be distributed under the terms of the GNU Public License (Version 2 or greater). + ;; Version: 2.1 + + (require 'vc) diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e335be5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +override_dh_auto_install: + make install PREFIX=debian/commit-patch/usr + rm debian/commit-patch/usr/share/doc/commit-patch/COPYING + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..6e698de --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.porkrind.org/commit-patch commit-patch-(.*)\.tar\.gz From 55e0f5dabc14f4b8f00e8f401f33bafa3778c50e Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 01:48:18 -0800 Subject: [PATCH 02/56] Remove .patch files so we can commit debian/patches/*.patch reasonably. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b1483a..265eeee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *~ \#* -*.patch *.html *.1 *.orig From dcef637e01df4aa996c32e02dba7d82277f287d1 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 02:52:56 -0800 Subject: [PATCH 03/56] [debian/clean] Remove symlinks and pod2html tmp files so they don't show up in the source. --- debian/clean | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/clean b/debian/clean index af24e36..20b4dda 100644 --- a/debian/clean +++ b/debian/clean @@ -1,2 +1,6 @@ +commit-partial +commit-partial.1 commit-patch.1 commit-patch.html +pod2htmd.tmp +pod2htmi.tmp From 39a36d42aa944faa9985d2f8a9b10d5f4eb0885a Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 02:54:13 -0800 Subject: [PATCH 04/56] [debian/control] We're using debhelper 8 so we need to depend on it specifically. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b901f7c..d2dbdb0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: commit-patch Section: vcs Priority: optional Maintainer: David Caldwell -Build-Depends: debhelper (>= 7.0.50~), perl +Build-Depends: debhelper (>= 8.0.0~), perl Standards-Version: 3.9.1 Homepage: http://porkrind.org/commit-patch/ From 1a00b7728d3d80ad50beeed51d0b7e26c5474a44 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 02:55:31 -0800 Subject: [PATCH 05/56] Add lintian overrides for lintian, which balks at "C-c C-c" in the description. --- debian/commit-patch.lintian-overrides | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/commit-patch.lintian-overrides diff --git a/debian/commit-patch.lintian-overrides b/debian/commit-patch.lintian-overrides new file mode 100644 index 0000000..ad718b9 --- /dev/null +++ b/debian/commit-patch.lintian-overrides @@ -0,0 +1 @@ +commit-patch: description-contains-duplicated-word C-c C-c From f4c5ad73290f1fa61f46532397a0108e6ebfdc73 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 02:55:59 -0800 Subject: [PATCH 06/56] Add a little script file that will build the package using git-buildpackage --- buildpackage | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 buildpackage diff --git a/buildpackage b/buildpackage new file mode 100755 index 0000000..74e5c80 --- /dev/null +++ b/buildpackage @@ -0,0 +1,3 @@ +#!/bin/sh +quilt pop -a +git-buildpackage --git-upstream-branch=master ---git-debian-branch=debian -rfakeroot --git-ignore-new -i'$(buildpackage|\.git)^' From 3939e65d719d700a0a54d07da27179fb39d21e74 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 03:11:02 -0800 Subject: [PATCH 07/56] [debian/control] Use the perl:Depends variable for our perl depends (gets rid of a warning during build). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d2dbdb0..1a5334d 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Homepage: http://porkrind.org/commit-patch/ Package: commit-patch Architecture: all -Depends: ${misc:Depends}, perl, libipc-run-perl, patch, patchutils +Depends: ${misc:Depends}, ${perl:Depends}, libipc-run-perl, patch, patchutils Suggests: darcs | git | mercurial | bzr | subversion | cvs Description: utility to commit fine grained patches to source code control repositories Normally version control systems don't allow fine grained From 3734ddccab7cb26cf11a728085ae73145a4688a4 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 04:02:43 -0800 Subject: [PATCH 08/56] [debian/rules] Comment why we are not installing the GPL. --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index e335be5..78a1a97 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,7 @@ override_dh_auto_install: make install PREFIX=debian/commit-patch/usr + # No need for another copy of the GPL: rm debian/commit-patch/usr/share/doc/commit-patch/COPYING %: From ea8cd2805375d32a1dfae1f450007d8e1f14b8f7 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 23 Feb 2011 04:03:35 -0800 Subject: [PATCH 09/56] [debian/rules] Don't install Changes because dh_installchangelogs already does that. --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 78a1a97..9406030 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ override_dh_auto_install: make install PREFIX=debian/commit-patch/usr # No need for another copy of the GPL: rm debian/commit-patch/usr/share/doc/commit-patch/COPYING + # Installed by dh_installchangelogs: + rm debian/commit-patch/usr/share/doc/commit-patch/Changes %: dh $@ From 8d7ee74b7a6be7dac26c897b19a98471b8897163 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 20:43:13 -0700 Subject: [PATCH 10/56] Remove specify-gpl-version-2.patch -- It's been incorporated upstream --- debian/patches/series | 1 - debian/patches/specify-gpl-version-2.patch | 28 ---------------------- 2 files changed, 29 deletions(-) delete mode 100644 debian/patches/specify-gpl-version-2.patch diff --git a/debian/patches/series b/debian/patches/series index 64085dc..2f85b8e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -specify-gpl-version-2.patch makefile-install_el_files_to_correct_dir.patch diff --git a/debian/patches/specify-gpl-version-2.patch b/debian/patches/specify-gpl-version-2.patch deleted file mode 100644 index 116e784..0000000 --- a/debian/patches/specify-gpl-version-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Specify which version of the GPL we are licenced under. -Author: David Caldwell - -Index: commit-patch/commit-patch -=================================================================== ---- commit-patch.orig/commit-patch 2011-02-23 01:42:34.000000000 -0800 -+++ commit-patch/commit-patch 2011-02-23 01:43:28.000000000 -0800 -@@ -1,7 +1,7 @@ - #!/usr/bin/perl -w - # Copyright (c) 2003-2010 David Caldwell - # and Jim Radford , All Rights Reserved. --# This code can be distributed under the terms of the GNU Public License -+# This code can be distributed under the terms of the GNU Public License (Version 2 or greater). - - my $VERSION = '2.4'; - -Index: commit-patch/commit-patch-buffer.el -=================================================================== ---- commit-patch.orig/commit-patch-buffer.el 2011-02-23 01:43:19.000000000 -0800 -+++ commit-patch/commit-patch-buffer.el 2011-02-23 01:43:28.000000000 -0800 -@@ -1,6 +1,6 @@ - ;; Copyright 2003-2010 Jim Radford - ;; and David Caldwell , All Rights Reserved. --;; This code can be distributed under the terms of the GNU Public License -+;; This code can be distributed under the terms of the GNU Public License (Version 2 or greater). - ;; Version: 2.1 - - (require 'vc) From e6b355901e72a1deff7f711e918a26d5be31e9c7 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 20:44:15 -0700 Subject: [PATCH 11/56] Refresh quilt patch --- .../makefile-install_el_files_to_correct_dir.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/patches/makefile-install_el_files_to_correct_dir.patch b/debian/patches/makefile-install_el_files_to_correct_dir.patch index 0b354df..e50d916 100644 --- a/debian/patches/makefile-install_el_files_to_correct_dir.patch +++ b/debian/patches/makefile-install_el_files_to_correct_dir.patch @@ -1,9 +1,11 @@ Description: Fix elisp install location Author: David Caldwell ---- commit-patch-2.3.orig/Makefile -+++ commit-patch-2.3/Makefile -@@ -32,9 +32,9 @@ PREFIX=/usr/local +Index: commit-patch/Makefile +=================================================================== +--- commit-patch.orig/Makefile 2013-05-15 20:43:23.000000000 -0700 ++++ commit-patch/Makefile 2013-05-15 20:43:23.000000000 -0700 +@@ -36,9 +36,9 @@ install: $(ALL) mkdir -p "$(PREFIX)/bin" mkdir -p "$(PREFIX)/share/man/man1" From 42734bc6ed0207f017ae6fdab033709292f064fa Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 21:20:14 -0700 Subject: [PATCH 12/56] [debian/copyright] Switch to copyright-format 1.0 --- debian/copyright | 78 ++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/debian/copyright b/debian/copyright index b73e8c4..24a2495 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,35 @@ -This work was packaged for Debian by: - - David Caldwell on Sat, 20 Mar 2010 15:42:43 -0700 - -It was downloaded from: - - - -Upstream Authors: - - o David Caldwell - o Jim Radford - -Copyright: - - Copyright 2003-2010 by David Caldwell and Jim Radford. - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package 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, see - -On Debian systems, the complete text of the GNU General -Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -The Debian packaging is: - - Copyright (C) 2010,2011 David Caldwell - -you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: commit-patch +Upstream-Contact: David Caldwell + Jim Radford +Source: http://porkrind.org/commit-patch/ + +Files: * +Copyright: 2003-2013 by David Caldwell and Jim Radford. +License: GPL-2+ + +Files: debian/* +Copyright: 2010,2011,2013 David Caldwell +License: GPL-2+ + +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 as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + 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 package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. From d283e9185653bc2fbc22f14891845a918a721de3 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 21:24:40 -0700 Subject: [PATCH 13/56] [debian/control] Bump to standards version 3.9.4. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1a5334d..610835c 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,9 @@ Section: vcs Priority: optional Maintainer: David Caldwell Build-Depends: debhelper (>= 8.0.0~), perl -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Homepage: http://porkrind.org/commit-patch/ +Vcs-Git: git://github.com/caldwell/commit-patch.git -b debian Package: commit-patch Architecture: all From e36c344a25cd1f31f266f666b33abec4febd84c5 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 21:26:30 -0700 Subject: [PATCH 14/56] [debian/changelog] Version 2.5 --- debian/changelog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 83c0f22..1d2b20c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +commit-patch (2.5-1) unstable; urgency=low + + * New upstream release: + + * Added Monotone support. + + * Support Subversion version 1.7. + + * Fixed an issue with git where committing inside a repository's + subdirectory would fail. + + * Fixed some cases where adding and removing files would fail. + + * Updraded to standards version 3.9.4. + + -- David Caldwell Wed, 15 May 2013 20:44:57 -0700 + commit-patch (2.4-1) unstable; urgency=low * New upstream version. From d6c840a38b20761d15fdca809a7ae618d32f888d Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 21:33:24 -0700 Subject: [PATCH 15/56] [buildpackage] Fix new version of git-buildpackage not guessing the tag correctly. --- buildpackage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpackage b/buildpackage index 74e5c80..af2e7a5 100755 --- a/buildpackage +++ b/buildpackage @@ -1,3 +1,3 @@ #!/bin/sh quilt pop -a -git-buildpackage --git-upstream-branch=master ---git-debian-branch=debian -rfakeroot --git-ignore-new -i'$(buildpackage|\.git)^' +git-buildpackage --git-upstream-branch=master --git-debian-branch=debian --git-upstream-tag='%(version)s' -rfakeroot --git-ignore-new -i'$(buildpackage|\.git)^' From ac78c39cf566751d5d2be2719ef0e2d9c4c55fc3 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 21:50:57 -0700 Subject: [PATCH 16/56] [rules] Don't run the tests. --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 9406030..a1cd8d9 100755 --- a/debian/rules +++ b/debian/rules @@ -11,5 +11,9 @@ override_dh_auto_install: # Installed by dh_installchangelogs: rm debian/commit-patch/usr/share/doc/commit-patch/Changes +# Skip tests. They aren't mature enough to offer any benefit during packaging. +override_dh_auto_test: + true + %: dh $@ From 1a7eb5ca6ce37d15799f9309ef05f6c54027cebc Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 21:58:31 -0700 Subject: [PATCH 17/56] [debian/emacsen-install] Upgrade to latest debhelper version. (Closes: #703583) --- debian/emacsen-install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/emacsen-install b/debian/emacsen-install index 1b413e5..29cf140 100644 --- a/debian/emacsen-install +++ b/debian/emacsen-install @@ -22,6 +22,7 @@ FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} +ELRELDIR=../../../emacs/site-lisp/${PACKAGE} # Install-info-altdir does not actually exist. # Maybe somebody will write it. @@ -33,13 +34,14 @@ fi install -m 755 -d ${ELCDIR} cd ${ELDIR} FILES=`echo *.el` -cp ${FILES} ${ELCDIR} cd ${ELCDIR} +ln -sf ${ELRELDIR}/*.el . cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) +(debian-pkg-add-load-path-item ".") +(setq byte-compile-warnings nil) EOF ${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el +rm -f path.el exit 0 From dca8fa40a27262a39582b9fc640baada277c682b Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 22:02:50 -0700 Subject: [PATCH 18/56] [debian/changelog] Spelling. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1d2b20c..2abbbc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ commit-patch (2.5-1) unstable; urgency=low * Fixed some cases where adding and removing files would fail. - * Updraded to standards version 3.9.4. + * Upgraded to standards version 3.9.4. -- David Caldwell Wed, 15 May 2013 20:44:57 -0700 From 39ec65f29dadd1b4d9521af85446febbbb885b62 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 15 May 2013 22:03:06 -0700 Subject: [PATCH 19/56] [debian/changelog] Close Dima's bug. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2abbbc7..bd47eb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ commit-patch (2.5-1) unstable; urgency=low * Upgraded to standards version 3.9.4. + * Updated emacsen-install debhelper script (Closes: #703583) + -- David Caldwell Wed, 15 May 2013 20:44:57 -0700 commit-patch (2.4-1) unstable; urgency=low From 30cd7709dfabb721a2df03e9c03458c3b80f4f8e Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Thu, 16 May 2013 13:32:36 -0700 Subject: [PATCH 20/56] [debian/commit-patch.doc-base] Add doc-base control file to quell lintian warning --- debian/commit-patch.doc-base | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 debian/commit-patch.doc-base diff --git a/debian/commit-patch.doc-base b/debian/commit-patch.doc-base new file mode 100644 index 0000000..407ed09 --- /dev/null +++ b/debian/commit-patch.doc-base @@ -0,0 +1,12 @@ +Document: commit-patch +Title: Debian commit-patch Manual +Author: David Caldwell +Abstract: This manual describes what commit-patch is + and how it can be used to commit patches to Darcs, Git, + Mercurial, Bazaar, Monotone, Subversion, or CVS repositories. +Section: Programming + +Format: HTML +Index: /usr/share/doc/commit-patch/commit-patch.html +Files: /usr/share/doc/commit-patch/commit-patch.html + From d699765da2e44b6c83ee2bd7b89baef7dafc68a5 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Thu, 16 May 2013 13:38:14 -0700 Subject: [PATCH 21/56] [debian/.gitignore] Add .gitignore to ignore all the debian build remnants. --- debian/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 debian/.gitignore diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..cc9960d --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,5 @@ +commit-patch/ +files +*.log +*.debhelper +*.substvars From 91602fd1a868f8d75334166ac55709285b773791 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Thu, 16 May 2013 14:14:49 -0700 Subject: [PATCH 22/56] [debian/control] Add Monotone. --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 610835c..b5409ad 100644 --- a/debian/control +++ b/debian/control @@ -10,15 +10,15 @@ Vcs-Git: git://github.com/caldwell/commit-patch.git -b debian Package: commit-patch Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, libipc-run-perl, patch, patchutils -Suggests: darcs | git | mercurial | bzr | subversion | cvs +Suggests: darcs | git | mercurial | bzr | monotone | subversion | cvs Description: utility to commit fine grained patches to source code control repositories Normally version control systems don't allow fine grained commits. commit-patch allows the user to control exactly what gets committed by letting the user supply a patch to be committed rather than using the files in the current working directory. . - commit-patch supports Darcs, Git, Mercurial, Bazaar, Subversion, or CVS - repositories. + commit-patch supports Darcs, Git, Mercurial, Bazaar, Monotone, Subversion, + or CVS repositories. . Also included is an Emacs interface to commit-patch. It allows you to just hit C-c C-c in any patch buffer to apply and commit only the changes From fc01fc0065a33b7b76991f2cbdbfb4b0542a5a39 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:22:02 -0800 Subject: [PATCH 23/56] control: Use https for git url --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b5409ad..11b0bc5 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: David Caldwell Build-Depends: debhelper (>= 8.0.0~), perl Standards-Version: 3.9.4 Homepage: http://porkrind.org/commit-patch/ -Vcs-Git: git://github.com/caldwell/commit-patch.git -b debian +Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian Package: commit-patch Architecture: all From ce416d07bdf5d89e0e3f81bd217ba025a4dd07ea Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:23:07 -0800 Subject: [PATCH 24/56] debian/patches: refresh makefile-install_el_files_to_correct_dir.patch --- .../patches/makefile-install_el_files_to_correct_dir.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/makefile-install_el_files_to_correct_dir.patch b/debian/patches/makefile-install_el_files_to_correct_dir.patch index e50d916..966ab75 100644 --- a/debian/patches/makefile-install_el_files_to_correct_dir.patch +++ b/debian/patches/makefile-install_el_files_to_correct_dir.patch @@ -3,9 +3,9 @@ Author: David Caldwell Index: commit-patch/Makefile =================================================================== ---- commit-patch.orig/Makefile 2013-05-15 20:43:23.000000000 -0700 -+++ commit-patch/Makefile 2013-05-15 20:43:23.000000000 -0700 -@@ -36,9 +36,9 @@ +--- commit-patch.orig/Makefile 2019-02-13 23:14:06.678581982 -0800 ++++ commit-patch/Makefile 2019-02-13 23:14:06.646581248 -0800 +@@ -42,9 +42,9 @@ install: $(ALL) mkdir -p "$(PREFIX)/bin" mkdir -p "$(PREFIX)/share/man/man1" From d59d17e8100320a8b5bef21fc9a030c80c77f245 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:23:54 -0800 Subject: [PATCH 25/56] debian/patches: Add patch that uses editor instead of vi for the fallback program --- debian/patches/series | 1 + debian/patches/use-editor-instead-of-vi.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 debian/patches/use-editor-instead-of-vi.patch diff --git a/debian/patches/series b/debian/patches/series index 2f85b8e..3643075 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ makefile-install_el_files_to_correct_dir.patch +use-editor-instead-of-vi.patch diff --git a/debian/patches/use-editor-instead-of-vi.patch b/debian/patches/use-editor-instead-of-vi.patch new file mode 100644 index 0000000..7b06923 --- /dev/null +++ b/debian/patches/use-editor-instead-of-vi.patch @@ -0,0 +1,13 @@ +Index: commit-patch/commit-patch +=================================================================== +--- commit-patch.orig/commit-patch 2019-02-13 23:18:12.007932991 -0800 ++++ commit-patch/commit-patch 2019-02-13 23:18:35.996431443 -0800 +@@ -178,7 +178,7 @@ + + run([split(/ /,$vc{diff}), @ARGV], '>>', $patch); + } +- system(($ENV{VISUAL} || $ENV{EDITOR} || 'vi')." ".$patch); ++ system(($ENV{VISUAL} || $ENV{EDITOR} || 'editor')." ".$patch); + my $last_patch = "#last-comit-partial.patch"; + unlink "$last_patch.3"; + rename "$last_patch.2", "$last_patch.3"; From f061e4fad4e3b3cb995e79b358c4d82cb7a4233f Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:24:39 -0800 Subject: [PATCH 26/56] debian/control: Upgraded to Standards-Version 4.3.0 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 11b0bc5..0114cce 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: vcs Priority: optional Maintainer: David Caldwell Build-Depends: debhelper (>= 8.0.0~), perl -Standards-Version: 3.9.4 +Standards-Version: 4.3.0 Homepage: http://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian From 2410a8c95be7919d328ddec3db285420499f1144 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:25:15 -0800 Subject: [PATCH 27/56] debian/changelog: Update for version 2.6-1 --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index bd47eb4..a1a8642 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +commit-patch (2.6-1) unstable; urgency=medium + + * New upstream release. + + * Upgrade to Standards-Version 4.3.0 + + * Use https link for Vcs-Git + + * Use 'editor' instead of 'vi' when EDITOR and VISUAL are not set. + + -- David Caldwell Wed, 13 Feb 2019 23:20:24 -0800 + commit-patch (2.5-1) unstable; urgency=low * New upstream release: From 9ce708a160fbc0aa75c8fb6250947e8d20675efd Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:52:54 -0800 Subject: [PATCH 28/56] buildpackage: Fix invocation and regexp --- buildpackage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpackage b/buildpackage index af2e7a5..47871bc 100755 --- a/buildpackage +++ b/buildpackage @@ -1,3 +1,3 @@ #!/bin/sh quilt pop -a -git-buildpackage --git-upstream-branch=master --git-debian-branch=debian --git-upstream-tag='%(version)s' -rfakeroot --git-ignore-new -i'$(buildpackage|\.git)^' +gbp buildpackage --git-upstream-branch=master --git-debian-branch=debian --git-upstream-tag='%(version)s' -rfakeroot --git-ignore-new -i'^(buildpackage$|\.git)' From a9f130aaa15404b9587e1f29b973633e61da6000 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Wed, 13 Feb 2019 23:53:16 -0800 Subject: [PATCH 29/56] debian: Upgrade to debhelper 10 --- debian/.gitignore | 1 + debian/changelog | 2 ++ debian/compat | 2 +- debian/control | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index cc9960d..26d62ac 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -3,3 +3,4 @@ files *.log *.debhelper *.substvars +debhelper-build-stamp diff --git a/debian/changelog b/debian/changelog index a1a8642..81b8f55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ commit-patch (2.6-1) unstable; urgency=medium * Use 'editor' instead of 'vi' when EDITOR and VISUAL are not set. + * Upgrade to debhelper 10 + -- David Caldwell Wed, 13 Feb 2019 23:20:24 -0800 commit-patch (2.5-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +10 diff --git a/debian/control b/debian/control index 0114cce..04d27c5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: commit-patch Section: vcs Priority: optional Maintainer: David Caldwell -Build-Depends: debhelper (>= 8.0.0~), perl +Build-Depends: debhelper (>= 10.0.0~), perl Standards-Version: 4.3.0 Homepage: http://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian From 4aaa77b6f57dce6352bd0f86fef2b324eb281deb Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Thu, 14 Feb 2019 00:02:44 -0800 Subject: [PATCH 30/56] debian: comply with https://www.debian.org/doc/packaging-manuals/debian-emacs-policy --- debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 81b8f55..44de953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ commit-patch (2.6-1) unstable; urgency=medium * Upgrade to debhelper 10 + * Comply with debian-emacs-policy + -- David Caldwell Wed, 13 Feb 2019 23:20:24 -0800 commit-patch (2.5-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 04d27c5..b87b220 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian Package: commit-patch Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, libipc-run-perl, patch, patchutils +Depends: ${misc:Depends}, ${perl:Depends}, libipc-run-perl, patch, patchutils, emacsen-common (>= 2.0.8) Suggests: darcs | git | mercurial | bzr | monotone | subversion | cvs Description: utility to commit fine grained patches to source code control repositories Normally version control systems don't allow fine grained diff --git a/debian/rules b/debian/rules index a1cd8d9..ef446e7 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,9 @@ override_dh_auto_install: rm debian/commit-patch/usr/share/doc/commit-patch/COPYING # Installed by dh_installchangelogs: rm debian/commit-patch/usr/share/doc/commit-patch/Changes + # To comply with https://www.debian.org/doc/packaging-manuals/debian-emacs-policy + mkdir -p debian/commit-patch/usr/lib/emacsen-common/packages/compat + echo 0 > debian/commit-patch/usr/lib/emacsen-common/packages/compat/commit-patch # Skip tests. They aren't mature enough to offer any benefit during packaging. override_dh_auto_test: From b7e2f976c73f041ae83f4f821608a21463e74d77 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Thu, 14 Feb 2019 23:12:20 -0800 Subject: [PATCH 31/56] moved "buildpackage" script to debian/ --- buildpackage => debian/buildpackage | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename buildpackage => debian/buildpackage (100%) diff --git a/buildpackage b/debian/buildpackage similarity index 100% rename from buildpackage rename to debian/buildpackage From 0ffafeba0b598045fab97110e241cbf602ab6c57 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Thu, 14 Feb 2019 23:20:28 -0800 Subject: [PATCH 32/56] added .emacsen-compat file to pacify postinst script --- debian/commit-patch.emacsen-compat | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/commit-patch.emacsen-compat diff --git a/debian/commit-patch.emacsen-compat b/debian/commit-patch.emacsen-compat new file mode 100644 index 0000000..573541a --- /dev/null +++ b/debian/commit-patch.emacsen-compat @@ -0,0 +1 @@ +0 From d50f7224dd97609bdd6f4b521fb10d6d916ec543 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Fri, 22 Feb 2019 04:14:12 -0800 Subject: [PATCH 33/56] debian/rules: Remove compat stuff (Dima's patch is cleaner) --- debian/rules | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/rules b/debian/rules index ef446e7..a1cd8d9 100755 --- a/debian/rules +++ b/debian/rules @@ -10,9 +10,6 @@ override_dh_auto_install: rm debian/commit-patch/usr/share/doc/commit-patch/COPYING # Installed by dh_installchangelogs: rm debian/commit-patch/usr/share/doc/commit-patch/Changes - # To comply with https://www.debian.org/doc/packaging-manuals/debian-emacs-policy - mkdir -p debian/commit-patch/usr/lib/emacsen-common/packages/compat - echo 0 > debian/commit-patch/usr/lib/emacsen-common/packages/compat/commit-patch # Skip tests. They aren't mature enough to offer any benefit during packaging. override_dh_auto_test: From 6c9a1285656a37dee2ddd2f9295370bd00ebeb71 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Fri, 22 Feb 2019 04:15:43 -0800 Subject: [PATCH 34/56] debian/emacsen-install: Support byte compiling on plain 'emacs' flavor --- debian/emacsen-install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/emacsen-install b/debian/emacsen-install index 29cf140..998c3be 100644 --- a/debian/emacsen-install +++ b/debian/emacsen-install @@ -8,7 +8,6 @@ FLAVOR=$1 PACKAGE=commit-patch -if [ ${FLAVOR} = emacs ]; then exit 0; fi echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} @@ -35,7 +34,9 @@ install -m 755 -d ${ELCDIR} cd ${ELDIR} FILES=`echo *.el` cd ${ELCDIR} -ln -sf ${ELRELDIR}/*.el . +if [ $ELDIR != $ELCDIR ]; then + ln -sf ${ELRELDIR}/*.el . +fi cat << EOF > path.el (debian-pkg-add-load-path-item ".") From 82840d46d40b3f7031f62b252881cc534a052930 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Fri, 22 Feb 2019 04:16:55 -0800 Subject: [PATCH 35/56] debian/emacsen-install: Don't byte compile on xemacs. --- debian/emacsen-install | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/emacsen-install b/debian/emacsen-install index 998c3be..6518ad9 100644 --- a/debian/emacsen-install +++ b/debian/emacsen-install @@ -8,6 +8,14 @@ FLAVOR=$1 PACKAGE=commit-patch +case $FLAVOR in + xemacs*) + echo install/${PACKAGE}: Skipping unsupported emacs ${FLAVOR} + exit 0 + ;; + *) + echo install/${PACKAGE}: Handling install of emacsen flavor ${FLAVOR} +esac echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} From 348fb15e72ce6519aed961bc99f6fd940c31bf68 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Fri, 22 Feb 2019 04:22:13 -0800 Subject: [PATCH 36/56] debian/changelog: Update for version 2.6-2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 44de953..752c6f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +commit-patch (2.6-2) unstable; urgency=medium + + * Don't attempt to byte compile on xemacs (not supported by upstream) + (Closes: 922926) + + -- David Caldwell Fri, 22 Feb 2019 04:09:12 -0800 + commit-patch (2.6-1) unstable; urgency=medium * New upstream release. From 6bdbe07ba10e34a2ce5f3b64d8a85ed21b7d883c Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 2 Sep 2021 00:05:19 +0000 Subject: [PATCH 37/56] Use secure copyright file specification URI. Changes-By: lintian-brush Fixes: lintian: insecure-copyright-format-uri See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 24a2495..25603e0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: commit-patch Upstream-Contact: David Caldwell Jim Radford From 3b6ad9931bfaa08437bd62df3848385247d879d6 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 2 Sep 2021 00:05:33 +0000 Subject: [PATCH 38/56] Use secure URI in Homepage field. Changes-By: lintian-brush Fixes: lintian: homepage-field-uses-insecure-uri See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b87b220..1a6b82d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: David Caldwell Build-Depends: debhelper (>= 10.0.0~), perl Standards-Version: 4.3.0 -Homepage: http://porkrind.org/commit-patch/ +Homepage: https://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian Package: commit-patch From 39b0cd3184f93b2e66f2f0ba8e48ec4a28d8d70a Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 2 Sep 2021 00:05:46 +0000 Subject: [PATCH 39/56] debian/control: Add Vcs-Browser field Changes-By: lintian-brush Fixes: lintian: missing-vcs-browser-field See-also: https://lintian.debian.org/tags/missing-vcs-browser-field.html --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 1a6b82d..82d9762 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 10.0.0~), perl Standards-Version: 4.3.0 Homepage: https://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian +Vcs-Browser: https://github.com/caldwell/commit-patch/tree/debian Package: commit-patch Architecture: all From a77eb678ed599addf5330dc02c0c0c82fefdb8f5 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 2 Sep 2021 00:05:59 +0000 Subject: [PATCH 40/56] Bump debhelper from old 10 to 13. Changes-By: lintian-brush Fixes: lintian: package-uses-old-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/compat b/debian/compat index f599e28..b1bd38b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +13 diff --git a/debian/control b/debian/control index 82d9762..c18aaf3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: commit-patch Section: vcs Priority: optional Maintainer: David Caldwell -Build-Depends: debhelper (>= 10.0.0~), perl +Build-Depends: debhelper (>= 13~), perl Standards-Version: 4.3.0 Homepage: https://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian From 20db339f6e740f3445aa8c3b673caca7724d3c21 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Fri, 3 Sep 2021 14:41:49 -0700 Subject: [PATCH 41/56] debian/rules: Whitespace --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a1cd8d9..fdfd5fe 100755 --- a/debian/rules +++ b/debian/rules @@ -16,4 +16,4 @@ override_dh_auto_test: true %: - dh $@ + dh $@ From ea24dd44fbec65795535081a4f6ce53919b46d43 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 2 Sep 2021 00:06:12 +0000 Subject: [PATCH 42/56] Set debhelper-compat version in Build-Depends. Changes-By: lintian-brush Fixes: lintian: uses-debhelper-compat-file See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html --- debian/compat | 1 - debian/control | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b1bd38b..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -13 diff --git a/debian/control b/debian/control index c18aaf3..e409c8b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: commit-patch Section: vcs Priority: optional Maintainer: David Caldwell -Build-Depends: debhelper (>= 13~), perl +Build-Depends: debhelper-compat (= 13), perl Standards-Version: 4.3.0 Homepage: https://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian From b25ef09faf3e768196784a61100fbf239a366846 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 2 Sep 2021 00:06:29 +0000 Subject: [PATCH 43/56] Update standards version to 4.5.1, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e409c8b..f4a1e4c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: vcs Priority: optional Maintainer: David Caldwell Build-Depends: debhelper-compat (= 13), perl -Standards-Version: 4.3.0 +Standards-Version: 4.5.1 Homepage: https://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian Vcs-Browser: https://github.com/caldwell/commit-patch/tree/debian From 09662f58a725cdb7ae96a4681cdac3763c779f2d Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 10:53:49 -0700 Subject: [PATCH 44/56] debian/changelog: Update for version 2.6.1-1 --- debian/changelog | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 752c6f0..6925266 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +commit-patch (2.6.1-1) unstable; urgency=medium + + * New upstream release: + + * Fixed a bug in `commit-patch-buffer` that caused `vc-annotate` to be + out of date (https://github.com/caldwell/commit-patch/issues/14). + + * Update standards version to 4.5.1. + + * Set debhelper-compat version in Build-Depends. + + * Bump debhelper from old 10 to 13. + + * debian/control: Add Vcs-Browser field + + * Use secure URI in Homepage field. + + * Use secure copyright file specification URI. + + -- David Caldwell Mon, 06 Sep 2021 10:52:51 -0700 + commit-patch (2.6-2) unstable; urgency=medium * Don't attempt to byte compile on xemacs (not supported by upstream) From eeb4df44cc44cc5a7cefce6c93770c8935ccbd77 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 10:58:27 -0700 Subject: [PATCH 45/56] debian/clean: don't clean commit-partial symlinks any more since they are now committed --- debian/clean | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/clean b/debian/clean index 20b4dda..0bcfeb0 100644 --- a/debian/clean +++ b/debian/clean @@ -1,5 +1,3 @@ -commit-partial -commit-partial.1 commit-patch.1 commit-patch.html pod2htmd.tmp From be61a8ca07bafd0a27f27f5bd833911ceb5ed4bc Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 11:47:39 -0700 Subject: [PATCH 46/56] Replace debian/patches with makefile overrides and hacky sed script --- ...file-install_el_files_to_correct_dir.patch | 19 ------------------- debian/patches/series | 2 -- debian/patches/use-editor-instead-of-vi.patch | 13 ------------- debian/rules | 4 +++- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 debian/patches/makefile-install_el_files_to_correct_dir.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/use-editor-instead-of-vi.patch diff --git a/debian/patches/makefile-install_el_files_to_correct_dir.patch b/debian/patches/makefile-install_el_files_to_correct_dir.patch deleted file mode 100644 index 966ab75..0000000 --- a/debian/patches/makefile-install_el_files_to_correct_dir.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix elisp install location -Author: David Caldwell - -Index: commit-patch/Makefile -=================================================================== ---- commit-patch.orig/Makefile 2019-02-13 23:14:06.678581982 -0800 -+++ commit-patch/Makefile 2019-02-13 23:14:06.646581248 -0800 -@@ -42,9 +42,9 @@ - install: $(ALL) - mkdir -p "$(PREFIX)/bin" - mkdir -p "$(PREFIX)/share/man/man1" -- mkdir -p "$(PREFIX)/share/emacs/site-lisp" -+ mkdir -p "$(PREFIX)/share/emacs/site-lisp/commit-patch" - 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)/share/emacs/site-lisp/commit-patch" - cp -a $(DOC) "$(PREFIX)/share/doc/commit-patch" diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 3643075..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -makefile-install_el_files_to_correct_dir.patch -use-editor-instead-of-vi.patch diff --git a/debian/patches/use-editor-instead-of-vi.patch b/debian/patches/use-editor-instead-of-vi.patch deleted file mode 100644 index 7b06923..0000000 --- a/debian/patches/use-editor-instead-of-vi.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: commit-patch/commit-patch -=================================================================== ---- commit-patch.orig/commit-patch 2019-02-13 23:18:12.007932991 -0800 -+++ commit-patch/commit-patch 2019-02-13 23:18:35.996431443 -0800 -@@ -178,7 +178,7 @@ - - run([split(/ /,$vc{diff}), @ARGV], '>>', $patch); - } -- system(($ENV{VISUAL} || $ENV{EDITOR} || 'vi')." ".$patch); -+ system(($ENV{VISUAL} || $ENV{EDITOR} || 'editor')." ".$patch); - my $last_patch = "#last-comit-partial.patch"; - unlink "$last_patch.3"; - rename "$last_patch.2", "$last_patch.3"; diff --git a/debian/rules b/debian/rules index fdfd5fe..07978bb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,13 @@ #export DH_VERBOSE=1 override_dh_auto_install: - make install PREFIX=debian/commit-patch/usr + make install PREFIX=debian/commit-patch/usr LISPDIR=/share/emacs/site-lisp/commit-patch # No need for another copy of the GPL: rm debian/commit-patch/usr/share/doc/commit-patch/COPYING # Installed by dh_installchangelogs: rm debian/commit-patch/usr/share/doc/commit-patch/Changes + # Set the correct debian editor + sed -i 's/FALLBACK_EDITOR *=.*/FALLBACK_EDITOR = "editor";/' debian/commit-patch/usr/bin/commit-patch # Skip tests. They aren't mature enough to offer any benefit during packaging. override_dh_auto_test: From f7f4aad3f3d956353a557249b03cfdf688f71785 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 12:13:00 -0700 Subject: [PATCH 47/56] debian/rules: make -j doesn't work (due to commit-partial symlink) --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 07978bb..7e5568f 100755 --- a/debian/rules +++ b/debian/rules @@ -18,4 +18,4 @@ override_dh_auto_test: true %: - dh $@ + dh $@ --no-parallel From 62ed6fb66e9d5cfe76adab4ad5bc17d99db44dfe Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 11:48:45 -0700 Subject: [PATCH 48/56] debian/changelog: Update for version 2.6.2-1 Remove mention of 2.6.1-1 since I couldn't make it build. --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6925266..8d05fa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -commit-patch (2.6.1-1) unstable; urgency=medium +commit-patch (2.6.2-1) unstable; urgency=medium * New upstream release: * Fixed a bug in `commit-patch-buffer` that caused `vc-annotate` to be out of date (https://github.com/caldwell/commit-patch/issues/14). + * Minor changes to allow easier packaging + * Update standards version to 4.5.1. * Set debhelper-compat version in Build-Depends. @@ -17,7 +19,7 @@ commit-patch (2.6.1-1) unstable; urgency=medium * Use secure copyright file specification URI. - -- David Caldwell Mon, 06 Sep 2021 10:52:51 -0700 + -- David Caldwell Mon, 06 Sep 2021 12:37:46 -0700 commit-patch (2.6-2) unstable; urgency=medium From 848cd54a165b2099c8d068ccb4917866471c9061 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 13:29:34 -0700 Subject: [PATCH 49/56] Remove lintian overrides file The particular override we were using doesn't even exist any more (it used to not like "C-c C-c" in the package description). --- debian/commit-patch.lintian-overrides | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/commit-patch.lintian-overrides diff --git a/debian/commit-patch.lintian-overrides b/debian/commit-patch.lintian-overrides deleted file mode 100644 index ad718b9..0000000 --- a/debian/commit-patch.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -commit-patch: description-contains-duplicated-word C-c C-c From 61ee8ec24c4450aa457d423b199a916a29fc4c8c Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 13:32:02 -0700 Subject: [PATCH 50/56] debian/{control,rules,*.elpa}: Use dh_elpa --- debian/commit-patch.elpa | 1 + debian/commit-patch.emacsen-compat | 1 - debian/control | 2 +- debian/emacsen-install | 56 ------------------------------ debian/emacsen-remove | 15 -------- debian/emacsen-startup | 23 ------------ debian/rules | 9 +++-- 7 files changed, 9 insertions(+), 98 deletions(-) create mode 100644 debian/commit-patch.elpa delete mode 100644 debian/commit-patch.emacsen-compat delete mode 100644 debian/emacsen-install delete mode 100644 debian/emacsen-remove delete mode 100644 debian/emacsen-startup diff --git a/debian/commit-patch.elpa b/debian/commit-patch.elpa new file mode 100644 index 0000000..abf136d --- /dev/null +++ b/debian/commit-patch.elpa @@ -0,0 +1 @@ +*.el diff --git a/debian/commit-patch.emacsen-compat b/debian/commit-patch.emacsen-compat deleted file mode 100644 index 573541a..0000000 --- a/debian/commit-patch.emacsen-compat +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/debian/control b/debian/control index f4a1e4c..dd7b354 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: commit-patch Section: vcs Priority: optional Maintainer: David Caldwell -Build-Depends: debhelper-compat (= 13), perl +Build-Depends: debhelper-compat (= 13), dh-elpa (>= 2.0.8~), perl Standards-Version: 4.5.1 Homepage: https://porkrind.org/commit-patch/ Vcs-Git: https://github.com/caldwell/commit-patch.git -b debian diff --git a/debian/emacsen-install b/debian/emacsen-install deleted file mode 100644 index 6518ad9..0000000 --- a/debian/emacsen-install +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/commit-patch - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=commit-patch - -case $FLAVOR in - xemacs*) - echo install/${PACKAGE}: Skipping unsupported emacs ${FLAVOR} - exit 0 - ;; - *) - echo install/${PACKAGE}: Handling install of emacsen flavor ${FLAVOR} -esac - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} -ELRELDIR=../../../emacs/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cd ${ELCDIR} -if [ $ELDIR != $ELCDIR ]; then - ln -sf ${ELRELDIR}/*.el . -fi - -cat << EOF > path.el -(debian-pkg-add-load-path-item ".") -(setq byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f path.el - -exit 0 diff --git a/debian/emacsen-remove b/debian/emacsen-remove deleted file mode 100644 index 1768fbb..0000000 --- a/debian/emacsen-remove +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/commit-patch - -FLAVOR=$1 -PACKAGE=commit-patch - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/commit-patch.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/debian/emacsen-startup b/debian/emacsen-startup deleted file mode 100644 index 9a965f2..0000000 --- a/debian/emacsen-startup +++ /dev/null @@ -1,23 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50commit-patch.el -;; for the Debian commit-patch package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The commit-patch package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/commit-patch"))) -;; If package-dir does not exist, the commit-patch package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (eval-after-load 'diff-mode - '(require 'commit-patch-buffer nil 'noerror)))) diff --git a/debian/rules b/debian/rules index 7e5568f..6df2ad6 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +ELPA_NAME=commit-patch-buffer +export ELPA_NAME + override_dh_auto_install: - make install PREFIX=debian/commit-patch/usr LISPDIR=/share/emacs/site-lisp/commit-patch + make install PREFIX=debian/commit-patch/usr + # dh_elpa copies the .el file to a new place + rm debian/commit-patch/usr/share/emacs/site-lisp/commit-patch-buffer.el # No need for another copy of the GPL: rm debian/commit-patch/usr/share/doc/commit-patch/COPYING # Installed by dh_installchangelogs: @@ -18,4 +23,4 @@ override_dh_auto_test: true %: - dh $@ --no-parallel + dh $@ --no-parallel --with elpa From bb0bf6c786f33dd8c769ce633e31d87cc965a355 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 14:25:02 -0700 Subject: [PATCH 51/56] debian/commit-patch.postinst: Add script to clean up byte-compiled dropping left behind by buggy old package --- debian/commit-patch.postinst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 debian/commit-patch.postinst diff --git a/debian/commit-patch.postinst b/debian/commit-patch.postinst new file mode 100755 index 0000000..840c6a9 --- /dev/null +++ b/debian/commit-patch.postinst @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + if test -d /usr/share/emacs/site-lisp/commit-patch; then + # Due to a bug in the commit-patch-2.6-2 emacsen-remove script, the + # xemacs byte compiled files got purged instead of the emacs + # files. Detect this and clean them up now. + echo install/commit-patch: purging old version of byte-compiled files for emacs + rm -rf /usr/share/emacs/site-lisp/commit-patch + fi +fi + +#DEBHELPER# From 02015da3c4c74a3ad3f76958c0b024b8410a56f5 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 14:28:28 -0700 Subject: [PATCH 52/56] debian/changelog: Document recent changes --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d05fa5..76376f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,11 @@ commit-patch (2.6.2-1) unstable; urgency=medium * Use secure copyright file specification URI. - -- David Caldwell Mon, 06 Sep 2021 12:37:46 -0700 + * Remove obsolete lintian override. + + * Use dh_elpa for elisp portion. + + -- David Caldwell Mon, 06 Sep 2021 14:27:23 -0700 commit-patch (2.6-2) unstable; urgency=medium From 4fde31b1013e7a88f88f3870cd17b3fa27a86fa5 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 14:28:47 -0700 Subject: [PATCH 53/56] debian/changelog: Fix inconsistent sentence endings --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76376f9..fa2b3b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ commit-patch (2.6.2-1) unstable; urgency=medium * Fixed a bug in `commit-patch-buffer` that caused `vc-annotate` to be out of date (https://github.com/caldwell/commit-patch/issues/14). - * Minor changes to allow easier packaging + * Minor changes to allow easier packaging. * Update standards version to 4.5.1. @@ -13,7 +13,7 @@ commit-patch (2.6.2-1) unstable; urgency=medium * Bump debhelper from old 10 to 13. - * debian/control: Add Vcs-Browser field + * debian/control: Add Vcs-Browser field. * Use secure URI in Homepage field. From ca98bd094fa4be9f2bdb31d2a91184429e980c2a Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 6 Sep 2021 14:30:45 -0700 Subject: [PATCH 54/56] debian/build-package: No more quilt patches --- debian/buildpackage | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/buildpackage b/debian/buildpackage index 47871bc..6950be8 100755 --- a/debian/buildpackage +++ b/debian/buildpackage @@ -1,3 +1,2 @@ #!/bin/sh -quilt pop -a gbp buildpackage --git-upstream-branch=master --git-debian-branch=debian --git-upstream-tag='%(version)s' -rfakeroot --git-ignore-new -i'^(buildpackage$|\.git)' From ebad0677936d90fca45f815a61f119c4f991111a Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Wed, 2 Feb 2022 13:46:35 +0000 Subject: [PATCH 55/56] Remove constraints unnecessary since buster * commit-patch: Drop versioned constraint on emacsen-common in Depends. Changes-By: deb-scrub-obsolete --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dd7b354..078e121 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/caldwell/commit-patch/tree/debian Package: commit-patch Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, libipc-run-perl, patch, patchutils, emacsen-common (>= 2.0.8) +Depends: ${misc:Depends}, ${perl:Depends}, libipc-run-perl, patch, patchutils, emacsen-common Suggests: darcs | git | mercurial | bzr | monotone | subversion | cvs Description: utility to commit fine grained patches to source code control repositories Normally version control systems don't allow fine grained From c74acac35e720b9474d0a9a09789c2fe11a56595 Mon Sep 17 00:00:00 2001 From: David Caldwell Date: Mon, 29 Jan 2024 11:37:40 -0800 Subject: [PATCH 56/56] debian/watch: Update version, use https link --- debian/watch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/watch b/debian/watch index 6e698de..0a7a76e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 -http://www.porkrind.org/commit-patch commit-patch-(.*)\.tar\.gz +https://www.porkrind.org/commit-patch commit-patch-(.*)\.tar\.gz