From 947186956353a39e09456c961d11eef7412963d6 Mon Sep 17 00:00:00 2001 From: myon Date: Wed, 12 Mar 2008 22:14:23 +0000 Subject: [PATCH] * Start moving the installation machinery from debian/* to Makefiles. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@368 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 1 + {sig2dot => debian}/changelog.sig2dot | 0 {springgraph => debian}/changelog.springgraph | 0 debian/docs | 2 ++ debian/install | 1 - debian/rules | 2 -- keylookup/Makefile | 9 +++++++++ sig2dot/Makefile | 5 ++--- springgraph/Makefile | 5 ++--- 9 files changed, 16 insertions(+), 9 deletions(-) rename {sig2dot => debian}/changelog.sig2dot (100%) rename {springgraph => debian}/changelog.springgraph (100%) create mode 100644 keylookup/Makefile diff --git a/debian/changelog b/debian/changelog index d29e58f..c23a6b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ signing-party (1.0-1) unreleased; urgency=low * sig2dot, springgraph: new scripts joining the family, no longer provided as separate packages. We shamelessly bump our version number to something greater, and build transitional packages. + * Start moving the installation machinery from debian/* to Makefiles. [ Thijs Kinkhorst ] * keylookup: cope with 16 or 40 nibble keyids, thanks Philippe Teuwen diff --git a/sig2dot/changelog.sig2dot b/debian/changelog.sig2dot similarity index 100% rename from sig2dot/changelog.sig2dot rename to debian/changelog.sig2dot diff --git a/springgraph/changelog.springgraph b/debian/changelog.springgraph similarity index 100% rename from springgraph/changelog.springgraph rename to debian/changelog.springgraph diff --git a/debian/docs b/debian/docs index d76b3d2..2916af6 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,4 @@ debian/NEWS.Debian debian/changelog.keylookup +debian/changelog.sig2dot +debian/changelog.springgraph diff --git a/debian/install b/debian/install index 4a51301..82bae7b 100644 --- a/debian/install +++ b/debian/install @@ -6,4 +6,3 @@ gpgsigs/gpgsigs usr/bin gpg-key2ps/gpg-key2ps usr/bin gpg-mailkeys/gpg-mailkeys usr/bin gpgparticipants/gpgparticipants usr/bin -keylookup/keylookup usr/bin diff --git a/debian/rules b/debian/rules index f962cc5..64b0892 100755 --- a/debian/rules +++ b/debian/rules @@ -37,8 +37,6 @@ install: build $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/caff install -d $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/gpgsigs/examples install -m 644 gpgsigs/gpgsigs-lt2k5*.txt $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/gpgsigs/examples - install -d $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/keylookup - install -m 644 keylookup/NEWS $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/keylookup install -d $(CURDIR)/debian/signing-party/usr/share/lintian/overrides install -m 644 debian/overrides/signing-party $(CURDIR)/debian/signing-party/usr/share/lintian/overrides diff --git a/keylookup/Makefile b/keylookup/Makefile new file mode 100644 index 0000000..dacd4db --- /dev/null +++ b/keylookup/Makefile @@ -0,0 +1,9 @@ +all: + +install: + install -D keylookup $(DESTDIR)/usr/bin/keylookup + install -D -m644 keylookup.1 $(DESTDIR)/usr/share/man/man1/keylookup.1 + install -D -m644 NEWS \ + $(DESTDIR)/usr/share/doc/signing-party/NEWS.keylookup + +clean: diff --git a/sig2dot/Makefile b/sig2dot/Makefile index 5a12bca..772207c 100644 --- a/sig2dot/Makefile +++ b/sig2dot/Makefile @@ -3,8 +3,7 @@ all: install: install -D sig2dot $(DESTDIR)/usr/bin/sig2dot install -D -m644 sig2dot.1 $(DESTDIR)/usr/share/man/man1/sig2dot.1 - install -d $(DESTDIR)/usr/share/doc/signing-party/sig2dot - install -m644 README.sig2dot changelog.sig2dot \ - $(DESTDIR)/usr/share/doc/signing-party/sig2dot + install -D -m644 README.sig2dot \ + $(DESTDIR)/usr/share/doc/signing-party/README.sig2dot clean: diff --git a/springgraph/Makefile b/springgraph/Makefile index 3bd539c..8f174b7 100644 --- a/springgraph/Makefile +++ b/springgraph/Makefile @@ -3,8 +3,7 @@ all: install: install -D springgraph $(DESTDIR)/usr/bin/springgraph install -D -m644 springgraph.1 $(DESTDIR)/usr/share/man/man1/springgraph.1 - install -d $(DESTDIR)/usr/share/doc/signing-party/springgraph - install -m644 README.springgraph changelog.springgraph \ - $(DESTDIR)/usr/share/doc/signing-party/springgraph + install -D -m644 README.springgraph \ + $(DESTDIR)/usr/share/doc/signing-party/README.springgraph clean: -- 2.30.2