make make install install stuff.

Bump NEWS.Debian.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@367 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/Makefile b/Makefile
index 19ab77c5fc7589871a7db9b00506895a904cf150..b7c5be15782f5772b41baa79ae05a9c083de6014 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keylookup
+DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keylookup \
+     sig2dot springgraph
 VERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: ([^-]*)/')
 DEBVERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: (.*)/')
 TGZ=../signing-party_$(VERSION).orig.tar.gz
@@ -7,6 +8,9 @@ TGZ_DIR=signing-party-$(VERSION)
 all:
        for dir in $(DIRS) ; do if [ -f $$dir/Makefile ] ; then $(MAKE) -C $$dir || exit 1 ; fi ; done
 
+install:
+       for dir in $(DIRS) ; do if [ -f $$dir/Makefile ] ; then $(MAKE) -C $$dir install || exit 1 ; fi ; done
+
 clean:
        for dir in $(DIRS) ; do if [ -f $$dir/Makefile ] ; then $(MAKE) -C $$dir clean || exit 1 ; fi ; done
 

diff --git a/caff/Makefile b/caff/Makefile
index 1dbd04c88518d7e537982f21c9a83e9cdd7e1a17..714aa8f742e2e1ee2877006bd3d4ba908de2294e 100644 (file)
--- a/caff/Makefile
+++ b/caff/Makefile
@@ -5,5 +5,7 @@ all: $(MAN)
 %.1: %
        pod2man $< > $@
 
+install:
+
 clean:
        rm -f $(MAN)

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 9e9441c5f452d2456134abce6165140ed036dabb..6605491e189837e8d0fdcfd3df9789cbed7eacff 100644 (file)
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,3 +1,12 @@
+signing-party (1.0-1) unstable; urgency=low
+
+  There are several new tools:
+  * gpgparticipants creates a list of party participants for the organiser.
+  * sig2dot and springgraph were imported from their formerly separate
+    packages.
+
+ -- Christoph Berg <myon@debian.org>  Wed, 12 Mar 2008 22:58:00 +0100
+
 signing-party (0.4.2-1) unstable; urgency=low
 
   * New: gpglist -- show who signed which of your UIDs
@@ -9,7 +18,7 @@ signing-party (0.4.0-1) unstable; urgency=low
   * Signing-party has now been merged with the (never released) pgp-tools
     package. It now includes two new tools. The package will be extended
     further in the near future.
-    
+
   * New: caff -- CA - fire and forget:
     caff takes a list of keyids on the command line, fetches them from a
     keyserver and calls GnuPG so that you can sign it. It then mails each

diff --git a/debian/control b/debian/control
index b94d56f9ff6a0db8b2cc16a4c4e03b745b9496ad..fb2d15b81907944e14b1d756936761e6c3e431b5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,14 +37,14 @@ Description: Various OpenPGP related tools
 
 Package: sig2dot
 Architecture: all
-Depends: signing-party (= ${binary:Version})
+Depends: signing-party (>= 1.0)
 Description: transitional package to pull in signing-party
  This is an empty package to pull in signing-party in which sig2dot is
  now included. It can safely be removed.
 
 Package: springgraph
 Architecture: all
-Depends: signing-party (= ${binary:Version})
+Depends: signing-party (>= 1.0)
 Description: transitional package to pull in signing-party
  This is an empty package to pull in signing-party in which springgraph is
  now included. It can safely be removed.

diff --git a/gpg-key2ps/Makefile b/gpg-key2ps/Makefile
index 4e96d485a09e0f97848fb176302d8aa49e10270f..5f483c5c754f6a1104e3506b82d64a5c6b149f46 100644 (file)
--- a/gpg-key2ps/Makefile
+++ b/gpg-key2ps/Makefile
@@ -3,5 +3,7 @@ all: gpg-key2ps.1
 gpg-key2ps.1: gpg-key2ps
        pod2man $< > $@
 
+install:
+
 clean:
        rm -f gpg-key2ps.1

diff --git a/gpglist/Makefile b/gpglist/Makefile
index 49042baed858ab8d3713f5a27516a36be5c04265..f4f8487dcf6a4e7c57e0a09d25b947b905dfe502 100644 (file)
--- a/gpglist/Makefile
+++ b/gpglist/Makefile
@@ -5,5 +5,7 @@ all: $(MAN)
 %.1: %
        pod2man $< > $@
 
+install:
+
 clean:
        rm -f $(MAN)

diff --git a/gpgsigs/Makefile b/gpgsigs/Makefile
index bc5569c0fb89f3f0ab02fa1cfc539007a90c380c..760d54cbe9ef8ca2c512cc5fa3011d56f837d3e5 100644 (file)
--- a/gpgsigs/Makefile
+++ b/gpgsigs/Makefile
@@ -3,5 +3,7 @@ all: gpgsigs.1
 gpgsigs.1: gpgsigs
        pod2man $< > $@
 
+install:
+
 clean:
        rm -f gpgsigs.1

diff --git a/sig2dot/Makefile b/sig2dot/Makefile
new file mode 100644 (file)
index 0000000..5a12bca
--- /dev/null
+++ b/sig2dot/Makefile
@@ -0,0 +1,10 @@
+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
+
+clean:

diff --git a/springgraph/Makefile b/springgraph/Makefile
new file mode 100644 (file)
index 0000000..3bd539c
--- /dev/null
+++ b/springgraph/Makefile
@@ -0,0 +1,10 @@
+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
+
+clean: