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
=== modified file 'AUTHORS'
--- AUTHORS 2010-10-12 15:42:04 +0000
+++ AUTHORS 2010-11-09 15:33:05 +0000
@@ -1,1 +1,1 @@
1Cody Russell <crussell@canonical.com>1# Generated by Makefile
22
=== modified file 'ChangeLog'
--- ChangeLog 2010-10-12 15:42:04 +0000
+++ ChangeLog 2010-11-09 15:33:05 +0000
@@ -0,0 +1,1 @@
1# Generated by Makefile
02
=== modified file 'Makefile.am'
--- Makefile.am 2010-10-12 15:42:04 +0000
+++ Makefile.am 2010-11-09 15:33:05 +0000
@@ -13,7 +13,33 @@
13pkgconfig_DATA = libgrope-0.1.pc13pkgconfig_DATA = libgrope-0.1.pc
1414
15CLEANFILES = libgrope-0.1.pc15CLEANFILES = libgrope-0.1.pc
16DISTCLEANFILES = libgrope.pc16DISTCLEANFILES = libgrope.pc grope*.tar.gz
17EXTRA_DIST = libgrope.pc.in17EXTRA_DIST = libgrope.pc.in
1818
19DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc19DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc
20
21dist-hook:
22 @if test -d "$(top_srcdir)/.bzr"; \
23 then \
24 echo Creating ChangeLog && \
25 ( cd "$(top_srcdir)" && \
26 echo '# Generated by Makefile. Do not edit.'; echo; \
27 $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
28 && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
29 || (rm -f ChangeLog.tmp; \
30 echo Failed to generate ChangeLog >&2 ); \
31 else \
32 echo Failed to generate ChangeLog: not a branch >&2; \
33 fi
34 @if test -d "$(top_srcdir)/.bzr"; \
35 then \
36 echo Creating AUTHORS && \
37 ( cd "$(top_srcdir)" && \
38 echo '# Generated by Makefile. Do not edit.'; echo; \
39 $(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 \
40 && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
41 || (rm -f AUTHORS.tmp; \
42 echo Failed to generate AUTHORS >&2 ); \
43 else \
44 echo Failed to generate AUTHORS: not a branch >&2; \
45 fi
2046
=== modified file 'configure.ac'
--- configure.ac 2010-10-12 15:42:04 +0000
+++ configure.ac 2010-11-09 15:33:05 +0000
@@ -25,6 +25,7 @@
25AM_CONFIG_HEADER([config.h])25AM_CONFIG_HEADER([config.h])
2626
27AM_INIT_AUTOMAKE([1.9])27AM_INIT_AUTOMAKE([1.9])
28AM_MAINTAINER_MODE
2829
29GROPE_MAJOR_VERSION=grope_major_version30GROPE_MAJOR_VERSION=grope_major_version
30GROPE_MINOR_VERSION=grope_minor_version31GROPE_MINOR_VERSION=grope_minor_version

Subscribers

People subscribed via source and target branches