debian/0000755000000000000000000000000012235745240007172 5ustar debian/changelog0000644000000000000000000003150312235720026011041 0ustar patchutils (0.3.2-3) unstable; urgency=low * New maintainer (closes: #728665). * Update Standards-Version to 3.9.5 . [ Eleanor Chen ] * Only do check when not being cross compiled (closes: #719239). -- Laszlo Boszormenyi (GCS) Mon, 04 Nov 2013 13:12:30 +0000 patchutils (0.3.2-2) unstable; urgency=low * Use dh-autoreconf to refresh autotools files. Closes: #710931. Thanks to Colin Watson for the patch. * Fix editdiff.1. Closes: #668422. * Bump to dh 9. -- Christoph Berg Mon, 17 Jun 2013 15:43:41 +0200 patchutils (0.3.2-1.1) unstable; urgency=low * NMU with maintainer approval * Set patchutils as Multi-Arch: foreign, Closes: 650506 -- Riku Voipio Mon, 16 Jan 2012 13:33:34 +0200 patchutils (0.3.2-1) unstable; urgency=low * New upstream version. + filterdiff cleans up tempfile left behind with -z option. Closes: #538715 + all grepdiff options undocumented in manpage. Closes: #544746 + lsdiff -z nonexistent.diff.gz does fail. Closes: #607612 * Convert to 3.0 (quilt) to use upstream's bz2 file. * Enable test suite. + Add rpm to Build-Depends because we need gendiff. * Force make -j1 as the Makefile builds some stuff twice otherwise. -- Christoph Berg Sat, 12 Feb 2011 12:27:58 +0100 patchutils (0.3.1-2) unstable; urgency=low * Remove Conflicts/Replaces/Provides: extractdiff, interdiff. Eight years should be a comfortable grace period. * Mention editdiff in description. (Closes: #520518) * Added 'posixness_fix' patch as a work around for a POSIX incompatibility. By Marc Dequènes. (Closes: #530455) -- Christoph Berg Tue, 26 May 2009 21:39:03 +0200 patchutils (0.3.1-1) unstable; urgency=low * New upstream release. + All utils: Honor TMPDIR. (Closes: #306921) + All utils: --long options for all options. (Closes: #440241) + filterdiff: Separate --add{old,new}prefix settings. (Closes: #433831) + lsdiff: -z doc patch went upstream. + rediff: Doesn't segfault on deleted hunks but reports error. (Closes: #305828, #470040) + rediff: Keep -p comments. (Closes: #468486) + unwrapdiff: Fix typo in manpage. (Closes: #512217) -- Christoph Berg Mon, 26 Jan 2009 10:39:04 +0100 patchutils (0.3.0-1) unstable; urgency=low * New upstream version. + filterdiff reads exclusion list from file. (Closes: #264439) + filterdiff --clean unconditionally strips non-diff stuff. (Closes: #323169) * Bump DH level to 7. * Use quilt, and build-depend on automake as we patch Makefile.am. * Document lsdiff -z, thanks Jari Aalto. (Closes: #465985) * Update watch file to ignore .sig files, thanks Charles Plessy. (Closes: #512163) -- Christoph Berg Sun, 18 Jan 2009 12:48:06 +0100 patchutils (0.2.31-4) unstable; urgency=low * Move espdiff to /usr/games (Closes: #402976). -- Christoph Berg Wed, 14 Feb 2007 19:02:51 +0100 patchutils (0.2.31-3) unstable; urgency=low * New maintainer (Closes: #349324). * Update copyright. * Add homepage to Description, write watch file. -- Christoph Berg Sun, 22 Jan 2006 14:29:20 +0100 patchutils (0.2.31-2) unstable; urgency=low * Orphaned. -- Michael Fedrowitz Sun, 22 Jan 2006 11:41:01 +0100 patchutils (0.2.31-1) unstable; urgency=low * New upstream release: - splitdiff now uses %03d to generate filenames. (Closes: #282017) - Typo fix in fixcvsdiff(1). (Closes: #299310) - splitdiff now calls lsdiff with correct arguments. (Closes: #306869) - Doesn't use PATH_MAX anymore. (Closes: #308316) * Standards-Version 3.6.2 (no changes required). -- Michael Fedrowitz Sat, 18 Jun 2005 16:53:46 +0200 patchutils (0.2.30-1) unstable; urgency=low * New upstream release: - Really fixes missing newline handling. (Closes: #248493) -- Michael Fedrowitz Fri, 23 Jul 2004 19:59:46 +0200 patchutils (0.2.29-1) unstable; urgency=low * New upstream release: - Correctly handles missing newline at EOF again. (Closes: #240406) -- Michael Fedrowitz Mon, 5 Apr 2004 19:40:50 +0200 patchutils (0.2.28-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Fri, 26 Mar 2004 21:28:46 +0100 patchutils (0.2.27-1) unstable; urgency=low * New upstream release - Correctly handles null bytes in patches. (Closes: #226960) -- Michael Fedrowitz Fri, 27 Feb 2004 20:35:41 +0100 patchutils (0.2.26-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Mon, 12 Jan 2004 19:31:07 +0100 patchutils (0.2.25-1) unstable; urgency=low * New upstream release: - splitdiff no longer puts diff lines into the wrong file. (Closes: #223595) - splitdiff now offers an option to name the resulting diffs after the patched file's name (like diffsplit). (Closes: #215870) * Standards-Version 3.6.1 (no changes required). -- Michael Fedrowitz Mon, 15 Dec 2003 21:00:42 +0100 patchutils (0.2.24-1) unstable; urgency=low * New upstream release: - Fixes typo in combinediff manpage. (Closes: #198068) * Standards-Version 3.6.0 (no changes required). -- Michael Fedrowitz Fri, 25 Jul 2003 22:57:44 +0200 patchutils (0.2.23-1) unstable; urgency=low * New upstream release: - editdiff now preserves the edited file when rediff fails. (Closes: #185345) - interdiff now prints a warning if a non-empty input file contains no patch. (Closes: #187767) * Standards-Version 3.5.10 (no changes required). * Remove emacs vars from changelog. -- Michael Fedrowitz Thu, 5 Jun 2003 19:10:03 +0200 patchutils (0.2.22-1) unstable; urgency=low * New upstream release. * Back out editdiff patch, since upstream configure now knows about sensible-editor. -- Michael Fedrowitz Sun, 9 Mar 2003 15:16:51 +0100 patchutils (0.2.21-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Sat, 22 Feb 2003 18:59:55 +0100 patchutils (0.2.20-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Mon, 3 Feb 2003 16:37:07 +0100 patchutils (0.2.19-1) unstable; urgency=low * New upstream release -- Michael Fedrowitz Thu, 23 Jan 2003 20:08:03 +0100 patchutils (0.2.18-1) unstable; urgency=low * New upstream release. * Standards-Version 3.5.8 (no changes required). -- Michael Fedrowitz Tue, 17 Dec 2002 16:39:46 +0100 patchutils (0.2.17-1) unstable; urgency=low * New upstream release. * Standards-Version 3.5.7: - Support DEB_BUILD_OPTIONS noopt instead of debug. - Always build with -g. - Build depend on debhelper (>= 4.1.0) to get rid of /usr/doc link. -- Michael Fedrowitz Wed, 11 Sep 2002 20:19:10 +0200 patchutils (0.2.16-1) unstable; urgency=low * New upstream release. * Use debhelper v4. * Support DEB_BUILD_GNU_TYPE and DEB_HOST_GNU_TYPE. * Minor fixes to copyright file. -- Michael Fedrowitz Fri, 16 Aug 2002 10:34:55 +0200 patchutils (0.2.15-1) unstable; urgency=low * New upstream release * Remove editdiff.1 since editdiff is now adequately documented by rediff.1. -- Michael Fedrowitz Wed, 10 Jul 2002 19:06:45 +0200 patchutils (0.2.14-1) unstable; urgency=low * New upstream release. * Patch editdiff to use sensible-editor. -- Michael Fedrowitz Sat, 18 May 2002 23:15:52 +0200 patchutils (0.2.13-1) unstable; urgency=low * New upstream release. * The 'make check' accidently got lost in a previous upload. Let's make this official and drop the rpm build-dep (which should make life easier for the BSD folks). (closes: #145343) -- Michael Fedrowitz Mon, 13 May 2002 23:37:04 +0200 patchutils (0.2.12-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Sat, 20 Apr 2002 10:21:32 +0200 patchutils (0.2.11-2) unstable; urgency=low * Depend on debianutils (>= 1.16) for mktemp -d (used by editdiff). (closes: #139540) -- Michael Fedrowitz Fri, 22 Mar 2002 23:36:05 +0100 patchutils (0.2.11-1) unstable; urgency=low * New upstream release. * Readded dh_perl call which had got lost somehow. -- Michael Fedrowitz Thu, 14 Mar 2002 11:45:30 +0100 patchutils (0.2.10-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Mon, 4 Mar 2002 19:58:33 +0100 patchutils (0.2.9-1) unstable; urgency=low * New upstream release. * Added a little editdiff(1) manpage. (closes: #134960) * Don't build with -g by default and support DEB_BUILD_OPTIONS. -- Michael Fedrowitz Mon, 25 Feb 2002 15:20:04 +0100 patchutils (0.2.8-1) unstable; urgency=low * New upstream release. -- Michael Fedrowitz Thu, 31 Jan 2002 19:19:14 +0100 patchutils (0.2.7-3) unstable; urgency=low * New maintainer. (closes: #130836) * Use rediff manpage for editdiff, too. * Standards-Version 3.5.6. -- Michael Fedrowitz Sat, 26 Jan 2002 16:40:42 +0100 patchutils (0.2.7-2) unstable; urgency=low * Orphaned this package. -- Adrian Bunk Fri, 25 Jan 2002 13:20:18 +0100 patchutils (0.2.7-1) unstable; urgency=high * New upstream release. - The lsdiff man page no longer has the command 'rediff' in the synopsis section. (closes: #126673) -- Adrian Bunk Thu, 3 Jan 2002 12:20:29 +0100 patchutils (0.2.5-2) unstable; urgency=high * Added the missing build dependency on rpm (needed for "make check"). (closes: #122268) -- Adrian Bunk Mon, 3 Dec 2001 16:08:21 +0100 patchutils (0.2.5-1) unstable; urgency=low * New upstream release. -- Adrian Bunk Mon, 3 Dec 2001 08:48:41 +0100 patchutils (0.2.4-2) unstable; urgency=low * Updated the location of the upstream sources in debian/copyright. -- Adrian Bunk Sat, 1 Dec 2001 20:13:39 +0100 patchutils (0.2.4-1) unstable; urgency=high * New upstream release. (closes: #121112) * Added a call to dh_perl to debian/rules to get the needed dependency on perl. (closes: #121525) -- Adrian Bunk Thu, 29 Nov 2001 09:52:15 +0100 patchutils (0.2.0-1) unstable; urgency=low * New upstream release. -- Adrian Bunk Thu, 15 Nov 2001 22:24:38 +0100 patchutils (0.1.5-1) unstable; urgency=low * New upstream release. -- Adrian Bunk Sat, 27 Oct 2001 00:39:27 +0200 patchutils (0.1.4-1) unstable; urgency=low * New upstream release. -- Adrian Bunk Thu, 18 Oct 2001 08:16:34 +0200 patchutils (0.1.3-1) unstable; urgency=low * New upstream release. - This release supports gzip-ed files. (closes: #96184) -- Adrian Bunk Tue, 16 Oct 2001 22:09:56 +0200 patchutils (0.1.2-1) unstable; urgency=low * New upstream release. - This release includes the fix to let patchutils compile on alpha. (closes: #110342) -- Adrian Bunk Fri, 21 Sep 2001 13:25:57 +0200 patchutils (0.1.1-1) unstable; urgency=low * New upstream release. * Upstream changed the name of the package because it does now include extractdiff (although renamed to filterdiff). -- Adrian Bunk Sun, 27 May 2001 20:21:37 +0200 interdiff (0.1.0-1) unstable; urgency=low * New upstream release. -- Adrian Bunk Sun, 22 Apr 2001 22:48:40 +0200 interdiff (0.0.10-2) unstable; urgency=low * Use "mkdir -p" instead of "mkdirhier" in debian/rules. (closes: #88128) * Don't run the tests when building the package. * Standards-Version: 3.5.2 (no changes) -- Adrian Bunk Sat, 3 Mar 2001 01:09:11 +0100 interdiff (0.0.10-1) unstable; urgency=low * New upstream release. -- Adrian Bunk Sat, 24 Feb 2001 11:21:44 +0100 interdiff (0.0.9-1) unstable; urgency=low * New upstream release. * This version works with zsh's <() construct. (closes: #72072) * Standards-Version: 3.2.1 * Upload sponsored by Tony Mancill . -- Adrian Bunk Sun, 5 Nov 2000 12:26:37 +0100 interdiff (0.0.8-1) unstable; urgency=low * New upstream release. * Upload sponsored by Tony Mancill . -- Adrian Bunk Tue, 8 Aug 2000 14:28:53 +0200 interdiff (0.0.7-1) unstable; urgency=low * Initial Release. (closes: #68582) * Upload sponsored by Tony Mancill . -- Adrian Bunk Sat, 5 Aug 2000 23:59:19 +0200 debian/compat0000644000000000000000000000000212157611142010364 0ustar 9 debian/control0000644000000000000000000000263112235716722010602 0ustar Source: patchutils Section: text Priority: optional Maintainer: Laszlo Boszormenyi (GCS) # dh-autoreconf because we patch Makefile.am # rpm includes gendiff Build-Depends: debhelper (>= 9), xmlto, dh-autoreconf, rpm Standards-Version: 3.9.5 Vcs-Git: git://git.debian.org/collab-maint/patchutils.git Vcs-Browser: https://alioth.debian.org/anonscm/git/collab-maint/patchutils.git Homepage: http://cyberelk.net/tim/patchutils/index.html Package: patchutils Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, patch, debianutils (>= 1.16) Multi-Arch: foreign Description: Utilities to work with patches This package includes the following utilities: - combinediff creates a cumulative patch from two incremental patches - dehtmldiff extracts a diff from an HTML page - filterdiff extracts or excludes diffs from a diff file - fixcvsdiff fixes diff files created by CVS that "patch" mis-interprets - flipdiff exchanges the order of two patches - grepdiff shows which files are modified by a patch matching a regex - interdiff shows differences between two unified diff files - lsdiff shows which files are modified by a patch - recountdiff recomputes counts and offsets in unified context diffs - rediff and editdiff fix offsets and counts of a hand-edited diff - splitdiff separates out incremental patches - unwrapdiff demangles patches that have been word-wrapped debian/copyright0000644000000000000000000000241011710012766011117 0ustar This package was debianized by Adrian Bunk on Sat, 5 Aug 2000 23:59:19 +0200 and later maintained by Michael Fedrowitz . The current maintainer is Christoph Berg . It was downloaded from `http://cyberelk.net/tim/data/patchutils/'. Upstream Author: Tim Waugh Copyright: Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Tim Waugh Copyright (C) 2001 Marko Kreen 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 program; 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'. debian/patches/0000755000000000000000000000000011710012766010616 5ustar debian/patches/espdiff.60000644000000000000000000000132711710012766012330 0ustar --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ bin_SCRIPTS = fixcvsdiff splitdiff editd man_MANS = doc/interdiff.1 doc/filterdiff.1 doc/fixcvsdiff.1 doc/rediff.1 \ doc/editdiff.1 doc/combinediff.1 doc/lsdiff.1 doc/splitdiff.1 \ doc/grepdiff.1 doc/recountdiff.1 doc/unwrapdiff.1 doc/dehtmldiff.1 \ - doc/flipdiff.1 doc/espdiff.1 + doc/flipdiff.1 doc/espdiff.6 AM_CFLAGS = -I$(srcdir)/src src_interdiff_SOURCES = src/interdiff.c src/util.c src/util.h src/diff.c \ --- a/doc/patchutils.xml +++ b/doc/patchutils.xml @@ -2451,7 +2451,7 @@ done)]]> espdiff - 1 + 6 debian/patches/fix-testsuite0000644000000000000000000000033011710012766013352 0ustar --- a/tests/rediff2/run-test +++ b/tests/rediff2/run-test @@ -32,5 +32,5 @@ Index: file EOF ${REDIFF} patch.orig patch.mod > patch-rediffed 2>stderr && exit 1 -[ $? == 1 ] || exit 1 +[ $? = 1 ] || exit 1 exit 0 debian/patches/posixness_fix0000644000000000000000000000060411710012766013442 0ustar Index: patchutils-0.3.1/src/util.c =================================================================== --- patchutils-0.3.1.orig/src/util.c 2009-05-25 00:56:34.000000000 +0200 +++ patchutils-0.3.1/src/util.c 2009-05-25 00:56:55.000000000 +0200 @@ -48,6 +48,10 @@ #include "util.h" +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + /* safe malloc */ void *xmalloc (size_t size) { debian/patches/series0000644000000000000000000000004611710012766012033 0ustar espdiff.6 posixness_fix fix-testsuite debian/rules0000755000000000000000000000341612235717711010260 0ustar #!/usr/bin/make -f #-*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) CONFFLAGS = --build $(DEB_HOST_GNU_TYPE) else CONFFLAGS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif CFLAGS = -g ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O2 endif D=$(CURDIR)/debian/patchutils/usr configure: configure-stamp configure-stamp: dh_testdir dh_autoreconf CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man touch configure-stamp build build-arch: build-stamp build-stamp: configure-stamp dh_testdir # the Makefile runs some stuff twice with -jN $(MAKE) -j1 # Manual files that use the .so links to include other pages should # point to a path relative to the top-level manual hierarchy sed -i -e 's/ rediff.1/ man1\/rediff.1/' doc/editdiff.1 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) $(MAKE) check -j1 endif touch build-stamp build-indep: clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean dh_autoreconf_clean dh_clean doc/*.1 doc/*.6 install: build-stamp dh_testdir dh_testroot dh_prep dh_installdirs $(MAKE) install prefix=$D mkdir $D/games mv $D/bin/espdiff $D/games binary-arch: install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs AUTHORS BUGS NEWS TODO dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_perl dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary-indep: binary: binary-indep binary-arch .PHONY: configure build clean install binary-arch binary-indep binary debian/source/0000755000000000000000000000000012235717650010476 5ustar debian/source/format0000644000000000000000000000001411710012766011675 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000012511710012766010216 0ustar version=3 http://cyberelk.net/tim/data/patchutils/stable/patchutils-(.*).tar[gbz2.]*