[X2Go-Commits] [x2go-keyring] 10/13: Makefile: add old-style keyrings to cleanup.
git-admin at x2go.org
git-admin at x2go.org
Sun Aug 18 14:48:14 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2go-keyring.
commit f908dd3952e3d5dbdde43d04b9603744fe6d9e14
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Aug 18 14:40:52 2019 +0200
Makefile: add old-style keyrings to cleanup.
---
Makefile | 20 ++++++++++++--------
debian/changelog | 1 +
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 348418f..fe12067 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,6 @@ keyrings/x2go-archive-keyring.gpg1: keyrings/x2go-archive-keyring.gpg
if [ -s $@ ]; then \
${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
fi
- rm -f $@~
keyrings/x2go-archive-removed-keys.gpg: removed-keys/index
if [ -e 'removed-keys/index' ] && [ ! -s 'removed-keys/index' ]; then \
@@ -100,7 +99,6 @@ keyrings/x2go-archive-removed-keys.gpg1: keyrings/x2go-archive-removed-keys.gpg
if [ -s $@ ]; then \
${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
fi
- rm -f $@~
keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index
if [ -e 'x2go-maintainers/index' ] && [ ! -s 'x2go-maintainers/index' ]; then \
@@ -122,7 +120,6 @@ keyrings/x2go-maintainers-keyring.gpg1: keyrings/x2go-maintainers-keyring.gpg
if [ -s $@ ]; then \
${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
fi
- rm -f $@~
keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index
if [ -e 'x2go-maintainers-removed-keys/index' ] && [ ! -s 'x2go-maintainers-removed-keys/index' ]; then \
@@ -144,7 +141,6 @@ keyrings/x2go-maintainers-removed-keys.gpg1: keyrings/x2go-maintainers-removed-k
if [ -s $@ ]; then \
${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \
fi
- rm -f $@~
$(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-keys/index
mkdir -p $(TMPRING) trusted.gpg
@@ -164,16 +160,24 @@ $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-key
clean:
rm -f keyrings/x2go-archive-keyring.gpg \
keyrings/x2go-archive-keyring.gpg~ \
- keyrings/x2go-archive-keyring.gpg.lastchangeset
+ keyrings/x2go-archive-keyring.gpg.lastchangeset \
+ keyrings/x2go-archive-keyring.gpg1 \
+ keyrings/x2go-archive-keyring.gpg1~
rm -f keyrings/x2go-archive-removed-keys.gpg \
keyrings/x2go-archive-removed-keys.gpg~ \
- keyrings/x2go-archive-removed-keys.gpg.lastchangeset
+ keyrings/x2go-archive-removed-keys.gpg.lastchangeset \
+ keyrings/x2go-archive-removed-keys.gpg1 \
+ keyrings/x2go-archive-removed-keys.gpg1~
rm -f keyrings/x2go-maintainers-keyring.gpg \
keyrings/x2go-maintainers-keyring.gpg~ \
- keyrings/x2go-maintainers-keyring.gpg.lastchangeset
+ keyrings/x2go-maintainers-keyring.gpg.lastchangeset \
+ keyrings/x2go-maintainers-keyring.gpg1 \
+ keyrings/x2go-maintainers-keyring.gpg1~
rm -f keyrings/x2go-maintainers-removed-keys.gpg \
keyrings/x2go-maintainers-removed-keys.gpg~ \
- keyrings/x2go-maintainers-removed-keys.gpg.lastchangeset
+ keyrings/x2go-maintainers-removed-keys.gpg.lastchangeset \
+ keyrings/x2go-maintainers-removed-keys.gpg1 \
+ keyrings/x2go-maintainers-removed-keys.gpg1~
rm -rf $(TMPRING) trusted.gpg trustdb.gpg
rm -f keyrings/*.cache
diff --git a/debian/changelog b/debian/changelog
index 4a034f2..7ff1489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
maintonly target.
* Makefile: do not try to run gpg1 to export and import keys if the keyrings
are actually empty.
+ * Makefile: add old-style keyrings to cleanup.
* debian/control:
- Change maintainer to the mailing list.
- Add the old package maintainer to the Uploaders field and myself.
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git
More information about the x2go-commits
mailing list