diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.in | 23 | ||||
| -rw-r--r-- | NEWS | 38 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/remember-backup-files | 0 |
5 files changed, 57 insertions, 18 deletions
@@ -1,5 +1,7 @@ 2009-03-22 Andreas Gruenbacher <agruen@suse.de> + * NEWS: Update for alpha release. + * patch.c (main): Always initialize the known files table. Move new reject files into place; append to known ones. * util.c (file_already_seen): Export. @@ -32,6 +34,16 @@ * tests/normal-garbage: New test case. * Makefile.in (TESTS): Add test case. + * Makefile.in (bindir): Define as @bindir@. + (DISTFILES_CLEAN): Move DISTFILES here which must not be remade by + the dist target. + (MISC): Add missing tests/test-lib.sh and update-version.sh. + (check, $(TESTS)): Make each test depend on all so that they can be + run individually. + (maintainer-clean): Also remove patch-*.tar.gz. + (dist): Add PV directory level. Add reminder to self how to upload. + * configure.ac: Silence "missing datarootdir" warning. + 2009-03-21 Andreas Gruenbacher <agruen@suse.de> * patch.c (main): With -r, instead of moving the global reject diff --git a/Makefile.in b/Makefile.in index 24e1f78..c2fa38d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,8 +46,7 @@ STDBOOL_H = @STDBOOL_H@ prefix = @prefix@ exec_prefix = @exec_prefix@ - -bindir = $(exec_prefix)/bin +bindir = @bindir@ # Where to put the manual pages. mandir = @mandir@ @@ -87,15 +86,17 @@ HDRS = argmatch.h backupfile.h common.h dirname.h \ unlocked-io.h util.h version.h xalloc.h MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README VERSION \ aclocal.m4 config.hin configure configure.ac install-sh \ - mkinstalldirs patch.man stdbool_.h timespec.h + mkinstalldirs patch.man stdbool_.h tests/test-lib.sh timespec.h \ + update-version.sh TESTS = tests/corrupt-reject-files tests/crlf-handling \ tests/global-reject-files tests/need-filename \ tests/no-newline-triggers-assert tests/preserve-c-function-names \ tests/preserve-mode-and-timestamp tests/reject-format \ tests/remember-backup-files tests/remember-reject-files -DISTFILES = $(MISC) $(SRCS) $(HDRS) $(M4FILES) $(TESTS) \ +DISTFILES = $(MISC) $(SRCS) $(HDRS) $(M4FILES) \ pc/chdirsaf.c pc/djgpp/config.sed pc/djgpp/configure.bat \ pc/djgpp/configure.sed pc/djgpp/README +MORE_DISTFILES = $(TESTS) patch_name = `echo patch | sed '$(transform)'` @@ -104,10 +105,10 @@ all:: patch$(EXEEXT) info:: installcheck:: -check:: all $(TESTS) +check:: $(TESTS) .PHONY: $(TESTS) -$(TESTS): patch$(EXEEXT) +$(TESTS): all @echo "[$@]" @srcdir=$(srcdir)/tests $(SHELL) $@ @@ -199,21 +200,23 @@ maintainer-clean:: @echo "This command is intended for maintainers to use;" @echo "rebuilding the deleted files requires special tools." $(MAKE) distclean - rm -f TAGS VERSION aclocal.m4 config.hin configure + rm -f TAGS VERSION aclocal.m4 config.hin configure patch-*.tar.gz PV = $(PACKAGE_NAME)-$(PACKAGE_VERSION) dist:: $(DISTFILES) - @echo Creating $(PV).tar.gz @rm -rf $(PV) @ln -s . $(PV) - @tar -cf - `( printf "%s\n" $(DISTFILES); \ + @tar -cf - `( printf "%s\n" $(DISTFILES) $(MORE_DISTFILES); \ grep -q -E -- '-[0-9]+-[0-9a-z]+(-dirty)?$$' VERSION \ && echo README-alpha \ - ) | sed -e 's,^$(srcdir)/,,' \ + ) | sed -e 's,^$(srcdir)/,,' -e "s,^,$(PV)/," \ | LC_ALL=C sort` \ | gzip -9 > $(PV).tar.gz @rm -rf $(PV) + @whereto=$$(if grep -q -E -- '-[0-9]+-[0-9a-z]+(-dirty)?$$' VERSION; \ + then echo alpha; else echo ftp; fi); \ + echo -e "\n# gnupload --to $$whereto.gnu.org:patch $(PV).tar.gz\n" $(OBJS): config.h COMMON = common.h $(STDBOOL_H) @@ -1,11 +1,33 @@ -Changes in version 2.6: - -* If the input patch is in unified format, any .rej output is now - in unified format as well. Formerly it was in context format. - This can be overridden with --reject-format=FORMAT. -* Reject files new have patch headers. -* Changed lines in reject files in context format will now be indicated - with '!' as per the definition of the format instead of '+' and '-'. +* A regression test suite has been added ("make check"). +* All reject files have file name headers, which allows to use them + as regular patches. +* Unless a filename has been specified on the command line, look only + for filenames in the patch until one has been found. Start looking + for hunks only after that. This prevents patch from tripping over + garbage that isn't a patch. +* Reject more malformed normal format commands and check for trailing + garbage. Recognize ed commands without addresses. +* When a patch file modifies the same file more than once, and there are + rejects in more than one of those patches, the rejects are appended to + the same reject file (rather then overwriting themselves). The -r option + works correctly even there are rejects in more than one file. Use the - + argument to discard rejects. +* Rejected hunks come out in unified diff format if the input patch was of + that format, otherwise in ordinary context diff form. Use the + --reject-format option to enforce either "context" or "unified" format. + The "diff -p" (--show-c-function) output is preserved. + Changed lines in context format reject files are correctly indicated + with '!' markers as the format defines. Added and removed lines are + still marked with '+' and '-', respectively. +* The file permissions of reject files are no longer set to match the files + they modify. Instead, they retain the default permissions. This is + consistent with reject files to which rejects of multiple files may be + written (-r option). +* The --binary option disables the heuristic for stripping CRs from + line endings in patches. This allows to preserve CRs even in mangled + patches, or in patches generated without the --binary option on non-POSIX + systems. +* Handle missing timestamps better. Changes in versions 2.5.8 and 2.5.9: bug fixes only. diff --git a/configure.ac b/configure.ac index d8b2a40..2c7add2 100644 --- a/configure.ac +++ b/configure.ac @@ -78,5 +78,7 @@ PATCH_FUNC_MKDIR_TAKES_ONE_ARG jm_AC_DOS AC_SYS_LONG_FILE_NAMES +AC_DEFUN([AC_DATAROOTDIR_CHECKED]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/tests/remember-backup-files b/tests/remember-backup-files index 8293970..8293970 100644..100755 --- a/tests/remember-backup-files +++ b/tests/remember-backup-files |