cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-07-10 22:31:58 -04:00
parent c2c04ad9e6 7593e76c96
commit 42418ca7c6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -17,8 +17,12 @@ install:
cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1) cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1)
# cabal sdist does not preserve symlinks, so copy over file # cabal sdist does not preserve symlinks, so copy over file
cd dist/gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../../$$f $$f; done cd dist/gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../../$$f $$f; done
export GIT_AUTHOR_NAME=build && \
export GIT_AUTHOR_EMAIL=build@buildhost && \
export GIT_COMMITTER_NAME=build && \
export GIT_COMMITTER_EMAIL=build@buildhost && \
cd dist/gittmp && git init && \ cd dist/gittmp && git init && \
git add . \ && git add . \
&& git commit -q -m "distributed version of propellor" \ && git commit -q -m "distributed version of propellor" \
&& git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \ && git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \
&& git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ propellor (2.6.0) UNRELEASED; urgency=medium
* Version dependency on exceptions. * Version dependency on exceptions.
* Systemd: Add masked property. * Systemd: Add masked property.
Thanks, Sean Whitton Thanks, Sean Whitton
* Fix make install target to work even when git is not configured.
-- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400 -- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400