testdir41: try 1.

Author: bhaible

build-on.sh

@@ -84,7 +84,8 @@ done
 # testdir38: 200 modules
 # testdir39: 20 modules
 # testdir40: all
-cd testdir40 || exit 1
+# testdir41: git-merge-changelog
+cd testdir41 || exit 1
 
 # Bring the time stamps into an order that will not require autoconf, automake, etc. to run again.
 sleep 1; touch `find . -name aclocal.m4 -type f`

testdir41/AUTHORS

@@ -0,0 +1,5 @@
+Authors of GNU git-merge-changelog:
+Bruno Haible <bruno@clisp.org>
+
+Much of the build infrastructure comes from:
+Free Software Foundation, Inc.

testdir41/COPYING

@@ -0,0 +1,76 @@
+The following packages should be installed before GNU git-merge-changelog is
+installed (runtime dependencies that are also build dependencies):
+
+None.
+
+
+The following packages should be installed when GNU git-merge-changelog is
+installed (runtime dependencies, but not build dependencies):
+
+None.
+
+
+The following should be installed when GNU git-merge-changelog is built, but
+are not needed later, once it is installed (build dependencies, but not runtime
+dependencies):
+
+* A C runtime, compiler, linker, etc.
+  + Mandatory.
+    Either the platform's native 'cc', or GCC 3.1 or newer.
+  + GCC Homepage:
+    https://gcc.gnu.org/
+  + Download:
+    https://ftp.gnu.org/gnu/gcc/
+
+* A 'make' utility.
+  + Mandatory.
+    Either the platform's native 'make' (for in-tree builds only),
+    or GNU Make 3.79.1 or newer.
+  + GNU Make Homepage:
+    https://www.gnu.org/software/make/
+  + Download:
+    https://ftp.gnu.org/gnu/make/
+
+* A shell
+  + Mandatory.
+    Either the platform's native 'sh', or Bash.
+  + Homepage:
+    https://www.gnu.org/software/bash/
+  + Download:
+    https://ftp.gnu.org/gnu/bash/
+
+* Core POSIX utilities, including:
+    [ basename cat chgrp chmod chown cp dd echo expand expr
+    false hostname install kill ln ls md5sum mkdir mkfifo
+    mknod mv printenv pwd rm rmdir sleep sort tee test touch
+    true uname
+  + Mandatory.
+    Either the platform's native utilities, or GNU coreutils.
+  + Homepage:
+    https://www.gnu.org/software/coreutils/
+  + Download:
+    https://ftp.gnu.org/gnu/coreutils/
+
+* The comparison utilities 'cmp' and 'diff'.
+  + Mandatory.
+    Either the platform's native utilities, or GNU diffutils.
+  + Homepage:
+    https://www.gnu.org/software/diffutils/
+  + Download:
+    https://ftp.gnu.org/gnu/diffutils/
+
+* Grep.
+  + Mandatory.
+    Either the platform's native grep, or GNU grep.
+  + Homepage:
+    https://www.gnu.org/software/grep/
+  + Download:
+    https://ftp.gnu.org/gnu/grep/
+
+* Awk.
+  + Mandatory.
+    Either the platform's native awk, mawk, or nawk, or GNU awk.
+  + Homepage:
+    https://www.gnu.org/software/gawk/
+  + Download:
+    https://ftp.gnu.org/gnu/gawk/

testdir41/ChangeLog

@@ -0,0 +1,66 @@
+All you need to know when hacking (modifying) GNU git-merge-changelog or when
+building it off a git checkout.
+
+
+Requirements
+============
+
+You will need reasonably recent versions of the build tools:
+
+  * A C compiler. Such as GNU GCC.
+    + Homepage:
+      https://gcc.gnu.org/
+
+  * GNU automake 1.16.4 or newer
+    + Homepage:
+      https://www.gnu.org/software/automake/
+
+  * GNU autoconf
+    + Homepage:
+      https://www.gnu.org/software/autoconf/
+
+  * GNU m4
+    + Homepage:
+      https://www.gnu.org/software/m4/
+
+  * GNU gperf
+    + Homepage:
+      https://www.gnu.org/software/gperf/
+
+  * GNU sed
+    + Homepage:
+      https://www.gnu.org/software/sed/
+
+  * Perl
+    + Homepage:
+      https://www.perl.org/
+
+  * Either an internet connection or a recent copy of GNU gnulib.
+    In order to work with the HEAD of git-merge-changelog development, you need
+    the HEAD of the gnulib development.
+    In order to work with the version of git-merge-changelog at a given date,
+    you need the version of gnulib of the same date.
+    In order to work with a released tarball of git-merge-changelog, you need
+    the particular version of gnulib which is indicated in the GNULIB_GIT_COMMIT
+    variable in version.sh.
+    + Homepage:
+      https://www.gnu.org/software/gnulib/
+
+And, of course, the packages listed in the DEPENDENCIES file.
+
+
+Building off the Git repository
+===============================
+
+Access to the Git repository is described at
+https://savannah.gnu.org/git/?group=vc-changelog .
+
+After fetching the sources from the Git repository, peek at the comments in
+autogen.sh, then run
+  ./autopull.sh
+  ./autogen.sh
+Then you can proceed with "./configure" as usual.
+
+Each time you want to update the source, do not only "git pull".  Instead do
+  git pull && ./autopull.sh
+  ./autogen.sh

testdir41/DEPENDENCIES

@@ -0,0 +1,80 @@
+This file explains how to install GNU git-merge-changelog from a tarball.
+(If you have checked out the source code repository, start by reading the
+file HACKING instead.)
+
+
+Prerequisites
+=============
+
+Before starting the installation, install the prerequisites listed in the
+file DEPENDENCIES.  You need to have at least those marked as 'Mandatory'
+installed.
+
+
+Installation
+============
+
+Then, you can run 'configure':
+
+  $ mkdir build/ && cd build
+  $ ../configure
+
+Here, you can give as arguments to 'configure'
+
+  - configure options, as listen in the 'configure --help' output,
+  - Makefile variable assignments for building the binaries, as
+    described in the INSTALL.generic file.
+
+If you are in a 64-bit multilib system with support for building 32-bit
+binaries, you can build 32-bit binaries by configuring like this:
+
+  $ ../configure CC="gcc -m32"
+
+You find a set of known-to-work variable settings for various platforms
+in https://gitlab.com/ghwiki/gnow-how/-/wikis/Platforms/Configuration .
+
+Then:
+
+  $ make
+  $ make check
+  $ make install
+
+Additionally, for git users:
+  - Add to .git/config of the checkout (or to your $HOME/.gitconfig) the
+    lines
+
+       [merge "merge-changelog"]
+               name = GNU-style ChangeLog merge driver
+               driver = /usr/local/bin/git-merge-changelog %O %A %B "%Y"
+
+  - Add to the top-level directory of the checkout a file '.gitattributes'
+    with this line:
+
+       ChangeLog    merge=merge-changelog
+
+    (See "man 5 gitattributes" for more info.)
+
+Additionally, for bzr users:
+  - Install the 'extmerge' bzr plug-in listed at
+      <http://doc.bazaar.canonical.com/plugins/en/index.html>
+      <http://wiki.bazaar.canonical.com/BzrPlugins>
+  - Add to your $HOME/.bazaar/bazaar.conf the line
+
+       external_merge = git-merge-changelog %b %T %o
+
+  - Then, to merge a conflict in a ChangeLog file, use
+
+       $ bzr extmerge ChangeLog
+
+Additionally, for hg users:
+  - Add to your $HOME/.hgrc the lines
+
+       [merge-patterns]
+       ChangeLog = git-merge-changelog
+
+       [merge-tools]
+       git-merge-changelog.executable = /usr/local/bin/git-merge-changelog
+       git-merge-changelog.args = $base $local $other
+
+    See <https://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
+    for reference.