[hurd] 08/09: Fix "random" ChangeLog handling

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 29ca072fcfeb04fc29dfa9853621c15b58a3ebcf
Author: Thomas Schwinge <address@hidden>
Date:   Fri Dec 16 23:58:04 2016 +0100

    Fix "random" ChangeLog handling
    
    ..., so that the correct things get done for "make dist".
    
        * ChangeLog: Elaborate on "random".
        * Makefile (gitlog-to-changelog_rev, ChangeLog_specs): Add entries
        for "random".
        (gen-ChangeLog): Handle that.
---
 ChangeLog | 18 +++++++++++++++++-
 Makefile  | 26 +++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44cc9ee..28b6740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-For all but procfs (see below),
+For all but procfs and random (see below),
 2772f5c6a6a51cf946fd95bf6ffe254273157a21 is the last commit imported from CVS.
 All commits after that one have valid author and committer information.
 
@@ -57,6 +57,22 @@ Use this to examine the change log for earlier changes:
     $ git show 2772f5c6a6a51cf946fd95bf6ffe254273157a21:usermux/ChangeLog
     $ git show 2772f5c6a6a51cf946fd95bf6ffe254273157a21:utils/ChangeLog
 
+random:
+
+random has been merged in 707f6cc4dbad734325881c5b275138522188754c.  Before
+1ba2ed95690396bf081d0af043d878b26b8563c2, it lived in the top-level directory.
+
+Use this to examine the change log, rewriting paths to where they live now:
+
+    $ ./gitlog-to-changelog --strip-tab 
ac38884dc9ad32a11d09f55ba9fe399cd0a48e2f..1ba2ed95690396bf081d0af043d878b26b8563c2~1
 | sed -e 's%\* [ ]*%* random/%'
+
+ac38884dc9ad32a11d09f55ba9fe399cd0a48e2f is the commit where it was imported.
+All commits after that one have valid author and committer information.
+
+Use this to examine the change log for earlier changes:
+
+    $ git ls-tree --name-only ac38884dc9ad32a11d09f55ba9fe399cd0a48e2f | perl 
-e 'print "2011-08-18  Gaël Le Mignot  <address@hidden>\n\n"; while(<>){s%^%\t* 
random/%;s%$%: New file.%;print;}'
+
 procfs:
 
 procfs has been merged in 7877d064a4318fb550b3cbcf64f0ec605e4a53e2.  Before
diff --git a/Makefile b/Makefile
index 4b2ef4c..9de4fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -161,6 +161,12 @@ gitlog-to-changelog_rev += \
   ^aac4aaf42372f61c78061711916c81a9d5bcb42d~1
 ChangeLog_specs += \
   procfs/ChangeLog:edb4593c38d421b5d538b221a991b50c36fdba15:ChangeLog
+# random
+gitlog-to-changelog_rev += \
+  ^1ba2ed95690396bf081d0af043d878b26b8563c2~1
+# Specify dummy ChangeLog file, will get overwritten.
+ChangeLog_specs += \
+  random/ChangeLog:HEAD:ChangeLog
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
        $(AM_V_GEN)if test -d $(top_srcdir)/.git; then                  \
@@ -173,6 +179,11 @@ gen-ChangeLog:
          ./gitlog-to-changelog --strip-tab                             \
            
edb4593c38d421b5d538b221a991b50c36fdba15..aac4aaf42372f61c78061711916c81a9d5bcb42d~1
 && \
          echo) >> procfs/ChangeLog &&                                  \
+         rm -f random/ChangeLog-1 &&                                   \
+         (cd $(top_srcdir)/ &&                                         \
+         ./gitlog-to-changelog --strip-tab                             \
+           
ac38884dc9ad32a11d09f55ba9fe399cd0a48e2f..1ba2ed95690396bf081d0af043d878b26b8563c2~1
 && \
+         echo) >> random/ChangeLog-1 &&                                \
          for cs in $(ChangeLog_specs); do                              \
            f=$${cs%%:*} &&                                             \
            s=$${cs#$$f:} && s_f=$$s:$$f && s=$${s_f/*:*:*/$$s} &&      \
@@ -180,10 +191,23 @@ gen-ChangeLog:
            git show $$s) >> $$f                                        \
            || exit $$?;                                                \
          done &&                                                       \
+         rm -f random/ChangeLog_ &&                                    \
+         (cd $(top_srcdir)/ &&                                         \
+         git ls-tree --name-only                                       \
+           ac38884dc9ad32a11d09f55ba9fe399cd0a48e2f) >> random/ChangeLog_ && \
+         rm -f random/ChangeLog-2 &&                                   \
+         perl \
+           -e 'print "2011-08-18  Gaël Le Mignot  <address@hidden>\n\n"; 
while(<>){s%^%\t* %;s%$$%: New file.%;print;}' \
+           < random/ChangeLog_ > random/ChangeLog-2 &&                 \
+         cat random/ChangeLog-* > random/ChangeLog &&                  \
+         rm random/ChangeLog?* &&                                      \
          sed                                                           \
            -e 's%\* [ ]*%* procfs/%'                                   \
            -e s%procfs/procfs/%procfs/%                                \
-           -i procfs/ChangeLog;                                        \
+           -i procfs/ChangeLog &&                                      \
+         sed                                                           \
+           -e 's%\* [ ]*%* random/%'                                   \
+           -i random/ChangeLog;                                        \
        fi
 
 $(dist-version).tar: HEAD.tar $(addsuffix /dist-hook,hurd/.. $(subdirs)) 
ChangeLog.tar

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git