diff --git a/.gitignore b/.gitignore index 485c3de..7c7bb1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *~ \#* -*.patch *.html commit-patch.1 *.orig diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..26d62ac --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,6 @@ +commit-patch/ +files +*.log +*.debhelper +*.substvars +debhelper-build-stamp diff --git a/debian/buildpackage b/debian/buildpackage new file mode 100755 index 0000000..6950be8 --- /dev/null +++ b/debian/buildpackage @@ -0,0 +1,2 @@ +#!/bin/sh +gbp buildpackage --git-upstream-branch=master --git-debian-branch=debian --git-upstream-tag='%(version)s' -rfakeroot --git-ignore-new -i'^(buildpackage$|\.git)' diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..fa2b3b7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,85 @@ +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. + + * 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. + + * 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 + + * 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. + + * 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. + + * 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 + + * 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. + + * 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 + + * 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..0bcfeb0 --- /dev/null +++ b/debian/clean @@ -0,0 +1,4 @@ +commit-patch.1 +commit-patch.html +pod2htmd.tmp +pod2htmi.tmp 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 + 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.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# diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..078e121 --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: commit-patch +Section: vcs +Priority: optional +Maintainer: David Caldwell +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 +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 +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, 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 + 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..25603e0 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,35 @@ +Format: https://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'. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..6df2ad6 --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# 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 + # 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: + 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: + true + +%: + dh $@ --no-parallel --with elpa 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..0a7a76e --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 + +https://www.porkrind.org/commit-patch commit-patch-(.*)\.tar\.gz