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