Merge lp:~ted/unity/generate-authors into lp:unity

Proposed by Ted Gould
Status: Superseded
Proposed branch: lp:~ted/unity/generate-authors
Merge into: lp:unity
Diff against target: 65 lines (+26/-17)
3 files modified
AUTHORS (+1/-5)
ChangeLog (+1/-0)
Makefile.am (+24/-12)
To merge this branch: bzr merge lp:~ted/unity/generate-authors
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+37995@code.launchpad.net

This proposal has been superseded by a proposal from 2011-01-06.

Description of the change

I was looking in Unity and I noticed that it didn't have the AUTHORS generation code in Makefile.am. Also updated the ChangeLog generation code.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Obviously this isn't going to apply against trunk, but might be worth at least merge into 0.2 and I'll steal the code for trunk too :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2010-04-07 15:23:07 +0000
+++ AUTHORS 2010-10-08 17:22:40 +0000
@@ -1,5 +1,1 @@
1Neil Jagdish Patel <neil.patel@canonical.com>1# Generated by Makefile. Do not edit.
2Gordon Allott <gord.allott@canonical.com>
3Mirco "MacSlow" Müller <mirco.mueller@canonical.com>
4Jay Taoko <jay.taoko@canonical.com>
5Jason Smith <jason.smith@canonical.com>
62
=== modified file 'ChangeLog'
--- ChangeLog 2009-10-15 10:40:35 +0000
+++ ChangeLog 2010-10-08 17:22:40 +0000
@@ -0,0 +1,1 @@
1# Generated by Makefile. Do not edit.
02
=== modified file 'Makefile.am'
--- Makefile.am 2010-07-02 13:56:28 +0000
+++ Makefile.am 2010-10-08 17:22:40 +0000
@@ -7,20 +7,32 @@
77
8DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-mutter8DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-mutter
99
10# ChangeLog file created at distcheck time10# ChangeLog and AUTHORS files created at distcheck time
11dist-hook:11dist-hook:
12 @if test -d "$(srcdir)/.bzr"; \12 @if test -d "$(top_srcdir)/.bzr"; \
13 then \13 then \
14 echo Creating ChangeLog && \14 echo Creating ChangeLog && \
15 ( cd "$(top_srcdir)" && \15 ( cd "$(top_srcdir)" && \
16 echo '# Generated by Makefile. Do not edit.'; echo; \16 echo '# Generated by Makefile. Do not edit.'; echo; \
17 $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \17 $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
18 && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \18 && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
19 || (rm -f ChangeLog.tmp; \19 || (rm -f ChangeLog.tmp; \
20 echo Failed to generate ChangeLog >&2 ); \20 echo Failed to generate ChangeLog >&2 ); \
21 else \21 else \
22 echo Failed to generate ChangeLog: not a branch >&2; \22 echo Failed to generate ChangeLog: not a branch >&2; \
23 fi23 fi
24 @if test -d "$(top_srcdir)/.bzr"; \
25 then \
26 echo Creating AUTHORS && \
27 ( cd "$(top_srcdir)" && \
28 echo '# Generated by Makefile. Do not edit.'; echo; \
29 $(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 \
30 && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
31 || (rm -f AUTHORS.tmp; \
32 echo Failed to generate AUTHORS >&2 ); \
33 else \
34 echo Failed to generate AUTHORS: not a branch >&2; \
35 fi
2436
25pkgconfigdir = $(libdir)/pkgconfig37pkgconfigdir = $(libdir)/pkgconfig
26pkgconfig_DATA = unity.pc38pkgconfig_DATA = unity.pc