--- colordiff-1.0.16.orig/Makefile
+++ colordiff-1.0.16/Makefile
@@ -1,64 +1,13 @@
-INSTALL_DIR=/usr/local/bin
-MAN_DIR=/usr/local/man/man1
-ETC_DIR=/etc
-VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'")
-DIST_FILES=COPYING INSTALL Makefile README \
- colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES colordiff.1 \
- colordiff.xml cdiff.xml cdiff.1 colordiffrc-gitdiff
-TMPDIR=colordiff-${VERSION}
-TARBALL=${TMPDIR}.tar.gz
+DESTDIR ?=
+INSTALL_DIR=$(DESTDIR)/usr/bin
+MAN_DIR=$(DESTDIR)/usr/share/man/man1
+ETC_DIR=$(DESTDIR)/etc
-.PHONY: doc
-doc: colordiff.xml cdiff.xml
- xmlto -vv man colordiff.xml
- xmlto -vv man cdiff.xml
- xmlto -vv txt colordiff.xml
- xmlto -vv html-nochunks colordiff.xml
- mv colordiff.txt README
- perl -p -i -e 's#
# \
- ${DESTDIR}${INSTALL_DIR}/colordiff
- chmod +x ${DESTDIR}${INSTALL_DIR}/colordiff
- if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \
- install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \
- fi
- install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1
- install -Dm 644 cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1
- if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \
- mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \
- ${DESTDIR}${ETC_DIR}/colordiffrc.old; \
- else \
- install -d ${DESTDIR}${ETC_DIR}; \
- fi
- cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
- -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
- chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
-
-.PHONY: uninstall
-uninstall:
- rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
- rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
- rm -f ${DESTDIR}${INSTALL_DIR}/cdiff
- rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
- rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
-
-.PHONY: dist
-dist:
- mkdir ${TMPDIR}
- cp -p ${DIST_FILES} ${TMPDIR}
- tar -zcvf ${TARBALL} ${TMPDIR}
- rm -fR ${TMPDIR}
-
-.PHONY: gitclean
-gitclean:
- rm -f colordiff.1 colordiff.html cdiff.1
-
-.PHONY: clean
-clean:
- rm -f README colordiff.1 colordiff.html cdiff.1
+ install -D colordiff.pl ${INSTALL_DIR}/colordiff
+ install -D cdiff.sh ${INSTALL_DIR}/cdiff
+ install -Dm 644 colordiff.1 ${MAN_DIR}/colordiff.1
+ install -Dm 644 cdiff.1 ${MAN_DIR}/cdiff.1
+ cp colordiffrc ${ETC_DIR}/colordiffrc
+ chown root.root ${ETC_DIR}/colordiffrc
+ chmod 644 ${ETC_DIR}/colordiffrc
--- colordiff-1.0.16.orig/debian/changelog
+++ colordiff-1.0.16/debian/changelog
@@ -0,0 +1,141 @@
+colordiff (1.0.16-1) unstable; urgency=medium
+
+ * New upstream release
+ * Includes gitdiff colour schema (closes: #783273)
+ * Updated standards version to 3.9.6, deprecated dh_clean
+
+ -- Dave Ewart
Sun, 25 Oct 2015 15:09:56 +0000
+
+colordiff (1.0.13-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Dave Ewart Wed, 14 Nov 2012 10:32:11 +0000
+
+colordiff (1.0.12-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Dave Ewart Mon, 15 Oct 2012 20:13:11 +0100
+
+colordiff (1.0.11-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Improved wdiff support (closes: #681019)
+
+ -- Dave Ewart Sat, 05 Oct 2012 17:05:00 +0100
+
+colordiff (1.0.10-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Fixes use in pipe (closes: #459763)
+
+ -- Dave Ewart Sat, 26 May 2012 20:02:05 +0100
+
+colordiff (1.0.9-1) unstable; urgency=low
+
+ * New upstream release
+ * Upstream fixes return value (closes: #470835)
+ * Upstream fixes shell argument handling issue (closes: #513313)
+ * Upstream supports specifying diff type (closes: #459923)
+ * Remove useless README.Debian (closes: #500241)
+ * Include cdiff.sh from upstream (closes: #500223)
+ * Updated standards version to 3.8.1, no changes necessary
+
+ -- Dave Ewart Tue, 21 Apr 2009 21:03:36 +0100
+
+colordiff (1.0.7-2) unstable; urgency=low
+
+ * Fix standard input management bug (closes: #459763)
+ * Reformat copyright file to adhere to updated lintian checks
+
+ -- Dave Ewart Sun, 02 Mar 2008 11:17:02 +0000
+
+colordiff (1.0.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated standards version to 3.7.3, no changes necessary
+
+ -- Dave Ewart Thu, 13 Dec 2007 19:21:46 +0000
+
+colordiff (1.0.6-2) unstable; urgency=low
+
+ * Typo in script, changed to correct look for 'color_patches'
+
+ -- Dave Ewart Sun, 17 Sep 2006 19:58:52 +0100
+
+colordiff (1.0.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Introduces new 'plain' colour setting. (closes: #368973)
+ * Introduces support for side-by-side diffs. (closes: #303837)
+ * Sensibly handles patch creation when output is redirected to a file
+ (closes: #378563)
+
+ -- Dave Ewart Wed, 13 Sep 2006 21:14:34 +0100
+
+colordiff (1.0.5-2) unstable; urgency=low
+
+ * Increase standards version to 3.7.2, no changes required
+
+ -- Dave Ewart Sat, 24 Jun 2006 20:58:49 +0100
+
+colordiff (1.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * New maintainer, Dave Ewart davee@sungate.co.uk
+ * New FSF address.
+ * Increase standards version to 3.6.2, no changes required
+
+ -- Dave Ewart Tue, 18 Apr 2006 08:58:36 +0100
+
+colordiff (1.0.4-4) unstable; urgency=low
+
+ * Match asterisks (from context diffs) only at start of line; thanks to
+ Robert Luberda. (closes: #246679)
+
+ -- Graham Wilson Mon, 31 May 2004 05:47:29 +0000
+
+colordiff (1.0.4-3) unstable; urgency=low
+
+ * Always use /etc as $etcdir. (closes: #238748)
+
+ -- Graham Wilson Fri, 19 Mar 2004 03:15:38 +0000
+
+colordiff (1.0.4-2) unstable; urgency=low
+
+ * Remove CVS keywords from config files so they don't change everytime.
+ * Add a watch file for uscan.
+ * Rebuild with fixed build tool. (closes: #235410)
+
+ -- Graham Wilson Mon, 01 Mar 2004 22:32:59 +0000
+
+colordiff (1.0.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * Minor man page cleanup.
+
+ -- Graham Wilson Fri, 09 Jan 2004 07:50:20 +0000
+
+colordiff (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Change maintainer address.
+ * Increase standards version, and change build-depends-indep back to
+ build-depends because of it.
+ * Include support for colors with the bold attribute off. Thanks Michael
+ Piefel. (closes: #211521)
+
+ -- Graham Wilson Thu, 18 Sep 2003 18:09:19 +0000
+
+colordiff (1.0.2-2) unstable; urgency=low
+
+ * Change Build-Depends to Build-Depends-Indep. Thanks Julien LEMOINE.
+
+ -- Graham Wilson Wed, 07 May 2003 19:54:16 +0000
+
+colordiff (1.0.2-1) unstable; urgency=low
+
+ * Initial Debian release. (closes: #183898)
+
+ -- Graham Wilson Tue, 06 May 2003 01:50:01 +0000
--- colordiff-1.0.16.orig/debian/compat
+++ colordiff-1.0.16/debian/compat
@@ -0,0 +1 @@
+9
--- colordiff-1.0.16.orig/debian/control
+++ colordiff-1.0.16/debian/control
@@ -0,0 +1,18 @@
+Source: colordiff
+Section: text
+Priority: optional
+Maintainer: Dave Ewart
+Build-Depends: debhelper (>> 9.0.0)
+Standards-Version: 3.9.6
+Homepage: http://www.colordiff.org/
+
+Package: colordiff
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}
+Description: tool to colorize 'diff' output
+ ColorDiff is a wrapper for the 'diff' command. It produces
+ the same output as diff, but with colored highlighting to improve
+ readability. The color schemes can be customized.
+ .
+ The output is similar to the syntax-highlighting mode of Vim or Emacs
+ when editing a patch created by diff.
--- colordiff-1.0.16.orig/debian/copyright
+++ colordiff-1.0.16/debian/copyright
@@ -0,0 +1,32 @@
+Copyright (C)2002-2012 Dave Ewart (davee@sungate.co.uk)
+
+This package was debianized by Graham Wilson on
+Sun, 16 Mar 2003 23:30:30 +0000.
+
+It was downloaded from: http://colordiff.sourceforge.net/ - since version
+1.0.12 from http://www.colordiff.org/
+
+Upstream Author: Dave Ewart
+
+Current maintainer: Dave Ewart (since April 2006)
+Previous maintainer: Graham Wilson
+
+Copyright:
+
+ 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
--- colordiff-1.0.16.orig/debian/dirs
+++ colordiff-1.0.16/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+etc
--- colordiff-1.0.16.orig/debian/docs
+++ colordiff-1.0.16/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+README
--- colordiff-1.0.16.orig/debian/examples
+++ colordiff-1.0.16/debian/examples
@@ -0,0 +1,2 @@
+colordiffrc
+colordiffrc-lightbg
--- colordiff-1.0.16.orig/debian/rules
+++ colordiff-1.0.16/debian/rules
@@ -0,0 +1,50 @@
+#!/usr/bin/make -f
+# $Id: rules 5 2004-03-01 22:16:51Z bob $
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess.
+
+# Nothing to do.
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp:
+
+clean:
+ dh_testdir
+ rm -f build-stamp
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ # Add here commands to install the package into debian/.
+ $(MAKE) DESTDIR=$(CURDIR)/debian/colordiff install
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installexamples
+ dh_installchangelogs CHANGES
+ dh_installdocs
+ dh_installman
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_perl
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install pre-build
+
+# vim:ts=4:sw=4:
--- colordiff-1.0.16.orig/debian/source/format
+++ colordiff-1.0.16/debian/source/format
@@ -0,0 +1 @@
+1.0
--- colordiff-1.0.16.orig/debian/watch
+++ colordiff-1.0.16/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://www.colordiff.org/colordiff-(.*)\.tar\.gz