Added Quilt framework.

  To easily install gpgwrap through the main Makefile, the gpgwrap Makefile
  is patched with gpgwrap_makefile.diff.

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

diff --git a/Makefile b/Makefile
index 95ec64f5a3a3efeb4c382528284238a2bb32e88f..d07ce6407ac51fe74eb2b223cdab26ab25c92ac5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
-     sig2dot springgraph
+     sig2dot springgraph gpgwrap gpgdir
 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

diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..ec7c9c8
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+Quilt
+===============================================================================
+This package uses quilt to manage all modifications to the upstream tarball.
+So, you may have a look at the /usr/share/doc/quilt/README.source file to get 
+further information on how to use it.

diff --git a/debian/changelog b/debian/changelog
index dd1c7e328bc66ea01f25244ea2dd3d8b73e7082c..cd0054709d44418771af4b071eb2071c45be4cc4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ signing-party (1.1-1) UNRELEASED; urgency=low
   [ Franck Joncourt ]
   * Imported gpgdir. (Closes: #498167)
   * Imported gpgwrap. (Closes: #454074)
+    Added Quilt framework/README.source to handle gpgwrap.
 
   [ Thijs Kinkhorst ]
   * Checked for policy 3.8.0, no changes.

diff --git a/debian/patches/gpgwrap_makefile.diff b/debian/patches/gpgwrap_makefile.diff
new file mode 100644 (file)
index 0000000..51930f1
--- /dev/null
+++ b/debian/patches/gpgwrap_makefile.diff
@@ -0,0 +1,26 @@
+From: Franck Joncourt <franck.mail@dthconnex.com>
+Subject: [PATCH] fixes/gpgwrap_makefile
+
+This allows gpgwrap to be installed with the main Makefile.
+
+Signed-off-by: Franck Joncourt <franck.mail@dthconnex.com>
+
+---
+ gpgwrap/Makefile |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/gpgwrap/Makefile b/gpgwrap/Makefile
+index 30064df..ff6ead2 100644
+--- a/gpgwrap/Makefile
++++ b/gpgwrap/Makefile
+@@ -5,5 +5,8 @@ MAKE=make
+ all:
+       cd src && ${MAKE} all DIET="${DIET}"
+ 
++install:
++      install bin/gpgwrap $(DESTDIR)/usr/bin
++
+ clean:
+       cd src && ${MAKE} clean
+-- 
+tg: (9286c56..) fixes/gpgwrap_makefile (depends on: master)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..ca5352f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gpgwrap_makefile.diff

diff --git a/debian/rules b/debian/rules
index 57a360a1d03c8d9bd8526733a175e34da840e02b..a660382436995bfd4fbb803bcc60468f4b1a1b41 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
 
 configure: configure-stamp
@@ -8,12 +10,12 @@ configure-stamp:
        touch $@
 
 build: build-stamp
-build-stamp: configure-stamp
+build-stamp: $(QUILT_STAMPFN) configure-stamp
        dh_testdir
        $(MAKE)
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        $(MAKE) clean