* 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

diff --git a/debian/changelog b/debian/changelog
index d29e58ff48819f498ebc7fb5e47cb9d9a3b44088..c23a6b5502b90ea2b1063cf6ff6a927dd85be36a 100644 (file)
--- 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 d76b3d217673c88e4d900f7d48619a083eb2ceb7..2916af6b00fb96379aef6bc41d0b6fb15de59694 100644 (file)
--- 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 4a513013f04e61077940e560c6664752c5a4bb1b..82bae7b76c69c0de801d4d3a3127952df7e61581 100644 (file)
--- 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 f962cc5d3c0e91c230179b503be49d3ffdf73e04..64b089221ecd2520bbf83ff39f57ce5557804a8a 100755 (executable)
--- 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 (file)
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 5a12bca2a1f0b6f95c9a4bfb912bfbe179df1df6..772207c57315da7f574e5be242691e81ed2c8901 100644 (file)
--- 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 3bd539ce03f964b09776b3efcabbf02b1788087d..8f174b7ddb0ba0a8ef2685819f663e0a9da0aa1d 100644 (file)
--- 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: