This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository remote-login-service-x2go. commit 231a745c260b13263ecf06cd9ba2db212a106687 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 19 09:01:17 2015 +0200 Adapt creation of upstream ChangeLog to using Git, same for AUTHORS file. Keep orginal authors in AUTHORS.Canonical. --- AUTHORS.Canonical | 5 +++++ Makefile.am | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/AUTHORS.Canonical b/AUTHORS.Canonical new file mode 100644 index 0000000..6163413 --- /dev/null +++ b/AUTHORS.Canonical @@ -0,0 +1,5 @@ + Albert Astals + Albert Astals Cid + Michael Terry + Tarmac + Ted Gould diff --git a/Makefile.am b/Makefile.am index f92ad07..e3edc22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,24 +8,24 @@ SUBDIRS = \ DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall dist-hook: - @if test -d "$(top_srcdir)/.bzr"; \ + @if test -d "$(top_srcdir)/.git"; \ then \ echo Creating ChangeLog && \ ( cd "$(top_srcdir)" && \ echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + $(top_srcdir)/missing --run git --no-pager log --since "1970" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n") > ChangeLog.tmp \ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ || (rm -f ChangeLog.tmp; \ echo Failed to generate ChangeLog >&2 ); \ else \ echo Failed to generate ChangeLog: not a branch >&2; \ fi - @if test -d "$(top_srcdir)/.bzr"; \ + @if test -d "$(top_srcdir)/.git"; \ then \ echo Creating AUTHORS && \ ( cd "$(top_srcdir)" && \ echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + $(top_srcdir)/missing --run git log | grep -e "^Author:" -e "Committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ || (rm -f AUTHORS.tmp; \ echo Failed to generate AUTHORS >&2 ); \ -- Alioth's /srv/git/code.x2go.org/remote-login-service-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/remote-login-service-x2go.git