--- patch-2.6.orig/debian/patch.lintian-overrides +++ patch-2.6/debian/patch.lintian-overrides @@ -0,0 +1 @@ +patch: syntax-error-in-debian-changelog --- patch-2.6.orig/debian/README.source +++ patch-2.6/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- patch-2.6.orig/debian/NEWS +++ patch-2.6/debian/NEWS @@ -0,0 +1,20 @@ +patch (2.6-1) unstable; urgency=low + + The patch versions shipped in Debian Etch and Lenny (2.5.9-4 and 2.5.9-5) + contained two patches that would create reject files in unified format, and + collect all rejects in a single, "global" reject file. These patches are now + part of patch 2.6. + + However, the arguments have been renamed: + + * -U or --unified-reject-files is now --reject-format=format. + Additionally, reject files will automatically be in unified format if the + input patch is in that format. + + * --global-reject-file=file is now a synonym for --reject-file=file (-r) + which has been fixed not to overwrite reject hunks from different files. + + The old syntax is still supported, but will be removed for the Debian + release following Squeeze. + + -- Christoph Berg Mon, 30 Nov 2009 14:01:54 +0100 --- patch-2.6.orig/debian/copyright +++ patch-2.6/debian/copyright @@ -0,0 +1,39 @@ +This is Debian's prepackaged version of patch, Larry Wall's program that +allows you to apply diffs to a file automagically. + +The current maintainer for this package is Christoph Berg +. + +Previous maintainers were Bill Mitchell , +Darren Stalder , Adrian Bunk , and +Michael Fedrowitz . + +The upstream source is available at 'ftp://ftp.gnu.org/gnu/patch/', resp. +'ftp://alpha.gnu.org/gnu/diffutils/'. + +Upstream Maintainer: Paul Eggert + +Copyright: + + Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall + + Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2002, + 2003 Free Software Foundation, Inc. + + 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, 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; see the file COPYING. + If not, write to the Free Software Foundation, + 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'. --- patch-2.6.orig/debian/watch +++ patch-2.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnu.org/gnu/patch/patch-(.*).tar.(gz|bz2|xz) --- patch-2.6.orig/debian/control +++ patch-2.6/debian/control @@ -0,0 +1,16 @@ +Source: patch +Section: vcs +Priority: standard +Maintainer: Christoph Berg +Build-Depends: debhelper (>= 7), ed, quilt +Standards-Version: 3.8.3 + +Package: patch +Depends: ${shlibs:Depends} +Suggests: ed, diffutils-doc +Architecture: any +Description: Apply a diff file to an original + Patch will take a patch file containing any of the four forms + of difference listing produced by the diff program and apply + those differences to an original file, producing a patched + version. --- patch-2.6.orig/debian/rules +++ patch-2.6/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +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 = -Wall -g + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + CFLAGS="$(CFLAGS)" ac_cv_sys_long_file_names=yes \ + ./configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + $(MAKE) check + touch build-stamp + +clean: unpatch + dh_testdir + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean build-stamp configure-stamp + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install prefix=$(CURDIR)/debian/patch/usr + +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs README NEWS AUTHORS + -dh_lintian + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + 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 patch unpatch --- patch-2.6.orig/debian/compat +++ patch-2.6/debian/compat @@ -0,0 +1 @@ +7 --- patch-2.6.orig/debian/changelog +++ patch-2.6/debian/changelog @@ -0,0 +1,350 @@ +patch (2.6-2) unstable; urgency=low + + * Update watch file. + * Section: vcs. + * Suggests: diffutils-doc instead of diff-doc, thanks Christoph Anton + Mitterer for spotting. Closes: #558974. + + -- Christoph Berg Wed, 02 Dec 2009 10:25:26 +0100 + +patch (2.6-1) unstable; urgency=low + + * New upstream version. Fixes: + + Closes: #402737: append to .rej files instead of overwriting them + + Closes: #372769: patch aborts with "pch.c:622: intuit_diff_type: + Assertion `i0 != NONE' failed." + + Closes: #558485: patch creates backup files with 000 perms for newly + created files + + Closes: #386188: -o creates empty output on null patch + + Closes: #271946: fails to create new files when POSIXLY_CORRECT is set + + Closes: #445309: output result to stdout + * Document in NEWS that the unified-reject-files and global-reject-file + options are now included upstream, but called differently. + * Enable test suite. + + -- Christoph Berg Mon, 30 Nov 2009 15:22:49 +0100 + +patch (2.5.9-5) unstable; urgency=low + + * Convert packaging to quilt. + * Tell lintian that part of the changelog is in a different format. + * Bump Standards-Version. + + -- Christoph Berg Mon, 21 Apr 2008 21:04:02 +0200 + +patch (2.5.9-4) unstable; urgency=low + + * New maintainer (Closes: #349323). + * Use dpatch, add patches: + + unified-reject-files: write unified reject files (Closes: #26675). + + global-reject-file: write a global reject file. + + manpage-char: fix weird character. + * Suggests: diff-doc. + * Bump Standards-Version. + + -- Christoph Berg Sat, 28 Jan 2006 18:46:28 +0100 + +patch (2.5.9-3) unstable; urgency=low + + * Orphaned. + + -- Michael Fedrowitz Sun, 22 Jan 2006 11:40:22 +0100 + +patch (2.5.9-2) unstable; urgency=low + + * Standards-Version 3.6.1 (no changes required). + * Applied upstream patch to fix CR stripping. (Closes: #196297) + * Applied a patch from SUSE to prevent previously created backup files + from being overwritten. (Closes: #248950) + * Ran aclocal and autoconf to make the above patch work. + * Touch aclocal.m4 and configure during build to prevent the usual + time-skew problems. + * Removed emacs vars from changelog. + + -- Michael Fedrowitz Sun, 18 Jul 2004 12:56:02 +0200 + +patch (2.5.9-1) unstable; urgency=low + + * New upstream release: + - Handles filenames with spaces. (closes: #99808) + - Don't try to stat output file after skipping a patch. (closes: #157232) + - CR in hunk header doesn't trigger CR stripping. (closes: #192272) + * Standards-Version 3.5.10 (no changes required). + * Remove obsolete CFLAGS. (closes: #193403) + * Update copyright file. + + -- Michael Fedrowitz Tue, 20 May 2003 21:13:37 +0200 + +patch (2.5.8-2) experimental; urgency=low + + * Standards-Version 3.5.8: + - Support DEB_BUILD_GNU_TYPE and DEB_HOST_GNU_TYPE. + - 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. + * Use debhelper v4. + * Minor fixes to copyright file. + * Don't try to stat the output file if the user elected to skip a + patch. (Fixes #157232, not closing since this is for experimental.) + * Applied patch from upstream to strip trailing whitespace from filenames + found in patch headers. (This fixes the glibc build.) + + -- Michael Fedrowitz Thu, 2 Jan 2003 19:37:49 +0100 + +patch (2.5.8-1) experimental; urgency=low + + * New upstream testing release. + + -- Michael Fedrowitz Mon, 3 Jun 2002 16:53:35 +0200 + +patch (2.5.7-1) experimental; urgency=low + + * New upstream testing release (which is likely to become the new stable + release). + + -- Michael Fedrowitz Fri, 31 May 2002 19:01:55 +0200 + +patch (2.5.6-1) experimental; urgency=low + + * New upstream testing release (plus two patches from upstream which + will be in the next version), which incorporates all of our patches + or fixes the problems in different ways. + * Uploading to experimental until final release. + + -- Michael Fedrowitz Wed, 29 May 2002 22:30:18 +0200 + +patch (2.5.4-11) unstable; urgency=low + + * Fix patch -D. (closes: #140247) + * Improve indentation guessing for ed diffs. (closes: #140642) + + -- Michael Fedrowitz Sat, 6 Apr 2002 20:19:19 +0200 + +patch (2.5.4-10) unstable; urgency=low + + * Fix segfault on illegal arguments to certain options. (closes: #137222) + + -- Michael Fedrowitz Tue, 12 Mar 2002 22:48:53 +0100 + +patch (2.5.4-9) unstable; urgency=low + + * Debhelperized debian/rules. + + -- Michael Fedrowitz Sun, 10 Feb 2002 19:09:16 +0100 + +patch (2.5.4-8) unstable; urgency=low + + * New maintainer. (closes: #130835) + * Call configure with ac_cv_sys_long_file_names=yes (all Debian systems + have long file names, but the test may fail if the build target is + invoked under fakeroot or is invoked as root while /usr is mounted + read-only). (closes: #129257) + * Don't build with -g by default. + * Support DEB_BUILD_OPTIONS. + * Standards-Version 3.5.6. + + -- Michael Fedrowitz Sat, 26 Jan 2002 15:17:35 +0100 + +patch (2.5.4-7) unstable; urgency=low + + * Orphaned this package. + + -- Adrian Bunk Fri, 25 Jan 2002 13:07:18 +0100 + +patch (2.5.4-6) unstable; urgency=high + + * Applied patches from RedHat for the following bugs: + - Correct default suffix to .orig. (closes: #122476) + - 'no such file' does now appear before the skip patch + question. + - Fix a possible segfault. + + -- Adrian Bunk Wed, 5 Dec 2001 12:15:10 +0100 + +patch (2.5.4-5) unstable; urgency=low + + * s/GNU Public License/GNU General Public License/ in + debian/copyright. (closes: #102238) + + -- Adrian Bunk Sun, 15 Jul 2001 17:44:36 +0200 + +patch (2.5.4-4) unstable; urgency=low + + * Added a build dependency and a suggestion for ed. + (closes: #86822) + * Strip the binary better. + + -- Adrian Bunk Sat, 2 Jun 2001 18:35:53 +0200 + +patch (2.5.4-3) unstable; urgency=low + + * Added a patch from Alessandro Rubini that + corrects messages about offsets. (closes: #68943) + + -- Adrian Bunk Tue, 16 Jan 2001 00:10:03 +0100 + +patch (2.5.4-2) unstable; urgency=low + + * Removed the build dependency on patch. There's no longer a + debian/patches since 2.5.4-1 (all problems are fixed upstream) and + therefore no call to patch when building the package. (closes: #76205) + * Upload sponsored by Tony Mancill . + + -- Adrian Bunk Sun, 5 Nov 2000 17:48:00 +0100 + +patch (2.5.4-1) unstable; urgency=low + + * New upstream release. (closes: #49119) + * Upload sponsored by Tony Mancill . + + -- Adrian Bunk Sat, 5 Aug 2000 22:46:32 +0200 + +patch (2.5-3) unstable; urgency=low + + * New Maintainer + * Removed patch.log from source + * Debian patches to the source are now in debian/patches + * /usr/doc -> /usr/share/doc + * /usr/man -> /usr/share/man + * Added Build-Depends to debian/control + * Added Section to debian/control + * Added "-isp" to dpkg-gencontrol + * Added "-g -Wall" to CFLAGS + * Removed "-s" from LDFLAGS + * Standards-Version: 3.1.1.1 + * Updated copyright + * Approved the patches from the NMUs + Closes: #57100, #56621, #58811 + * Upload sponsored by Tony Mancill + + -- Adrian Bunk Mon, 29 May 2000 14:29:05 +0200 + +patch (2.5-2.2) frozen unstable; urgency=medium + + * NMU + * Fixed a buffer overrun in mktemp (closes: #58811) + + -- Randolph Chung Sat, 26 Feb 2000 12:27:09 -0700 + +patch (2.5-2.1) frozen unstable; urgency=medium + + * Non-maintainer upload + * Update location of GPL and Artistic license in copyright + * Apply patch from Colin Phipps to fix unsafe file + handling, Closes: Bug#56621 + * Add -D_XOPEN_SOURCE=500 to CFLAGS so patch builds correctly again + Closes: Bug#57100 + + -- Wichert Akkerman Sun, 20 Feb 2000 16:39:13 +0100 + +patch (2.5-2) unstable; urgency=low + + * Apply patch from "James A" to fix segv when + skipping a patch. This does fix (Bug #14693, #16116, #16391). It + might fix #14653 but I need more information. + * Don't use su during build - allow fakeroot and friends to do their + stuff. (Fixes #15459, #18319) + * Use original source. + * Updated standards to 2.4.0.0. (No changes.) + * lintian clean. + + -- Darren Stalder Sat, 14 Mar 1998 19:11:46 -0800 + +patch (2.5-1) unstable; urgency=low + + * New upstream version. + * Problem in patch with Index overriding filenames fixed in upstream. + (Bug #10420) + * Compiled for libc6. (Bug #11699) + * Updated to conform to debian packaging standards 2.3.0.0. + + -- Darren Stalder Fri, 19 Sep 1997 23:41:38 +0000 + +patch (2.2-1) unstable; urgency=low + + * Larry Wall said that patch is under the Artistic License. (Bug #7215) + * Make sure that ChangeLog actually becomes /usr/doc/patch/changelog.gz to + conform to policy. (Bug #7237) + * Upstream changes fix the problem with basename. (Bug #8324, #8811) + * Upstream changes fix "no newline" problem. (Bug #9754) + * Updated to conform to debian packaging standards 2.1.3.2. + + -- Darren Stalder Fri, 19 Sep 1997 23:23:32 +0000 + +patch (2.1-11) unstable; urgency=high + + * Built completely as root to bypass autoconf bug where it doesn't + detect long filename support + * Waiting on Larry Wall to see if patch will have to be moved to + non-free. + + -- Darren Stalder Mon, 10 Feb 1997 03:18:58 -0800 + +patch (2.1-10) unstable; urgency=low + + * Updated to dpkg standards version 2.1.1.2, changed the rules file to + the format that I'm used to. This fixes #3348. + * Reverted the Makefile.in to the upstream version since the changed + parameters can be passed on the command line + * Reverted util.h and backupfile.c since the basename problem isn't + there anymore. + * Applied patch by Herbert Xu to handle + long lines. + + -- Darren Stalder Sat, 1 Feb 1997 17:08:10 -0800 + +The following changes are from Bill Mitchell: + +Changes for the debian patch-2.1-9 + elf package + * rebuilt for elf + +Changes for the debian patch-2.1-8 binary distribution + +1. Install patch.1 in /usr/man/man1, not /usr/man (oops). + +Changes for the debian patch-2.1-7 binary distribution + +1. Changed debian.rules file to Ian Murdock style. + +2. Cleaned up control file description and extended description. + +3. In debian.rules, add -DLINUX to CFLAGS. + +4. In util.h, added #ifndef LINUX block around obsolete basename() + declaration. It conflicts with the declaration in the file + /usr/include/unistd.h in the linux 1.2.1 kernel sources. + +5. In backupfile, added #ifndef LINUX block around obsolete basename() + declarations. + +Changes for the debian patch-2.1-6 binary distribution + +1. Removed leading tab on "include debian.rules.inc" line of debian.rules + +Changes for the debian patch-2.1-5 binary distribution + +1. Changes for new packaging guidelines + preinst and postinst scripts return exit status + use debian.rules.inc 1.6 to support new package naming conventions + debian.rules changes for new debian.rules.inc + +Changes for the debian patch-2.1-4 binary distribution + +1. Modified debian.rules to use debian.rules.inc + +Changes for the debian patch-2.1-3 binary distribution + +1. For the debian.rules target build: + pass CFLAGS and LDFLAGS to Makefile + +Changes for the debian patch-2.1-2 binary distribution + +1. Corrected permissions on man pages from 640 to 644 + +Changes for the patch-2.1-1 debian binary distribution + +1. Renamed README.debian to debian.README +2. Renamed COPYRIGHT.debian to debian.COPYRIGHT +3. Added debian.control +4. Added debian.rules --- patch-2.6.orig/debian/patches/lenny-options +++ patch-2.6/debian/patches/lenny-options @@ -0,0 +1,66 @@ +--- a/src/patch.c ++++ b/src/patch.c +@@ -527,7 +527,7 @@ static char const shortopts[] = "bB:cd:D + #if 0 && defined(ENABLE_MERGE) + "m" + #endif +- "nNo:p:r:RstTuvV:x:Y:z:Z"; ++ "nNo:p:r:RstTuUvV:x:Y:z:Z"; + + static struct option const longopts[] = + { +@@ -551,6 +551,7 @@ static struct option const longopts[] = + {"output", required_argument, NULL, 'o'}, + {"strip", required_argument, NULL, 'p'}, + {"reject-file", required_argument, NULL, 'r'}, ++ {"global-reject-file", required_argument, NULL, 'r'}, /* Debian etch/lenny compatibility */ + {"reverse", no_argument, NULL, 'R'}, + {"quiet", no_argument, NULL, 's'}, + {"silent", no_argument, NULL, 's'}, +@@ -572,6 +573,7 @@ static struct option const longopts[] = + {"posix", no_argument, NULL, CHAR_MAX + 7}, + {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, + {"reject-format", required_argument, NULL, CHAR_MAX + 9}, ++ {"unified-reject-files", no_argument, NULL, 'U'}, /* Debian etch/lenny compatibility */ + {NULL, no_argument, NULL, 0} + }; + +@@ -771,6 +773,9 @@ get_some_switches (void) + case 'u': + diff_type = UNI_DIFF; + break; ++ case 'U': /* Debian etch/lenny compatibility */ ++ reject_format = UNI_DIFF; ++ break; + case 'v': + version(); + exit (0); +--- a/patch.man ++++ b/patch.man +@@ -550,6 +550,11 @@ instead of the default + .B \&.rej + file. When \fIrejectfile\fP is \fB\-\fP, discard rejects. + .TP ++.BI \*=global\-reject\-file= rejectfile ++Same as ++\fB\*=reject\-file=\fP\fIrejectfile\fP. This option is deprecated and is a ++Debian-specific extension that will be removed in a future release. ++.TP + \fB\-R\fP or \fB\*=reverse\fP + Assume that this patch was created with the old and new files swapped. + (Yes, I'm afraid that does happen occasionally, human nature being what it +@@ -585,6 +590,14 @@ Produce reject files in the specified \f + format if the input patch was of that format, otherwise in ordinary context + diff form. + .TP ++\fB\-U\fP or \fB\*=unified\-reject\-files\fP ++Produce unified reject files. ++.BR ++This option is deprecated and is a Debian-specific extension that will be ++removed in a future release. Use ++\fB\*=reject\-format=\fP\fIformat\fP ++instead. ++.TP + \fB\-s\fP or \fB\*=silent\fP or \fB\*=quiet\fP + Work silently, unless an error occurs. + .TP --- patch-2.6.orig/debian/patches/558485-backupmode +++ patch-2.6/debian/patches/558485-backupmode @@ -0,0 +1,12 @@ +--- a/patch.man ++++ b/patch.man +@@ -263,9 +263,6 @@ mentioned previously. + Make backup files. + That is, when patching a file, + rename or copy the original instead of removing it. +-When backing up a file that does not exist, +-an empty, unreadable backup file is created +-as a placeholder to represent the nonexistent file. + See the + .B \-V + or --- patch-2.6.orig/debian/patches/series +++ patch-2.6/debian/patches/series @@ -0,0 +1,2 @@ +lenny-options +558485-backupmode