diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
| commit | 3dc034dda1a451ed7dc48cfb10caba11e66b4132 (patch) | |
| tree | ac2f7522e5b3287afdb5dcd5af6d9c6bb9a3d079 /pixman/Makefile.am | |
| parent | 4e7e0bd9194a033f05179fb64126c56fc6f072b5 (diff) | |
| parent | 436f8246cd5a377596f6e42e6562da186ef8df48 (diff) | |
| download | vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.gz vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.bz2 vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
Diffstat (limited to 'pixman/Makefile.am')
| -rw-r--r-- | pixman/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/Makefile.am b/pixman/Makefile.am index 88ff897be..5137c9ea3 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am @@ -10,7 +10,7 @@ snapshot: test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git rev-parse HEAD | cut -c 1-6`; \ $(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist -GPGKEY=6FF7C1A8 +GPGKEY=3892336E USERNAME=$$USER RELEASE_OR_SNAPSHOT = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi) RELEASE_CAIRO_HOST = $(USERNAME)@cairographics.org @@ -121,7 +121,7 @@ release-publish-message: $(HASHFILES) ensure-prev @echo "" @echo "GPG signature:" @echo " $(RELEASE_CAIRO_URL)/$(gpg_file)" - @echo " (signed by `git config --get user.name` <`git config --get user.email`>)" + @echo " (signed by`gpg --list-keys $(GPGKEY) | grep uid | cut -b4- | tr -s " "`)" @echo "" @echo "Git:" @echo " git://git.freedesktop.org/git/pixman" |