Merge lp:~bratsche/libgrope/dist-hook into lp:libgrope

Proposed by Cody Russell
Status: Merged
Merged at revision: 2
Proposed branch: lp:~bratsche/libgrope/dist-hook
Merge into: lp:libgrope
Diff against target: 63 lines (+30/-2)
4 files modified
AUTHORS (+1/-1)
ChangeLog (+1/-0)
Makefile.am (+27/-1)
configure.ac (+1/-0)
To merge this branch: bzr merge lp:~bratsche/libgrope/dist-hook
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+40441@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Pretty standard stuff.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2010-10-12 15:42:04 +0000
3+++ AUTHORS 2010-11-09 15:33:05 +0000
4@@ -1,1 +1,1 @@
5-Cody Russell <crussell@canonical.com>
6+# Generated by Makefile
7
8=== modified file 'ChangeLog'
9--- ChangeLog 2010-10-12 15:42:04 +0000
10+++ ChangeLog 2010-11-09 15:33:05 +0000
11@@ -0,0 +1,1 @@
12+# Generated by Makefile
13
14=== modified file 'Makefile.am'
15--- Makefile.am 2010-10-12 15:42:04 +0000
16+++ Makefile.am 2010-11-09 15:33:05 +0000
17@@ -13,7 +13,33 @@
18 pkgconfig_DATA = libgrope-0.1.pc
19
20 CLEANFILES = libgrope-0.1.pc
21-DISTCLEANFILES = libgrope.pc
22+DISTCLEANFILES = libgrope.pc grope*.tar.gz
23 EXTRA_DIST = libgrope.pc.in
24
25 DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc
26+
27+dist-hook:
28+ @if test -d "$(top_srcdir)/.bzr"; \
29+ then \
30+ echo Creating ChangeLog && \
31+ ( cd "$(top_srcdir)" && \
32+ echo '# Generated by Makefile. Do not edit.'; echo; \
33+ $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
34+ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
35+ || (rm -f ChangeLog.tmp; \
36+ echo Failed to generate ChangeLog >&2 ); \
37+ else \
38+ echo Failed to generate ChangeLog: not a branch >&2; \
39+ fi
40+ @if test -d "$(top_srcdir)/.bzr"; \
41+ then \
42+ echo Creating AUTHORS && \
43+ ( cd "$(top_srcdir)" && \
44+ echo '# Generated by Makefile. Do not edit.'; echo; \
45+ $(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 \
46+ && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
47+ || (rm -f AUTHORS.tmp; \
48+ echo Failed to generate AUTHORS >&2 ); \
49+ else \
50+ echo Failed to generate AUTHORS: not a branch >&2; \
51+ fi
52
53=== modified file 'configure.ac'
54--- configure.ac 2010-10-12 15:42:04 +0000
55+++ configure.ac 2010-11-09 15:33:05 +0000
56@@ -25,6 +25,7 @@
57 AM_CONFIG_HEADER([config.h])
58
59 AM_INIT_AUTOMAKE([1.9])
60+AM_MAINTAINER_MODE
61
62 GROPE_MAJOR_VERSION=grope_major_version
63 GROPE_MINOR_VERSION=grope_minor_version

Subscribers

People subscribed via source and target branches