[Pgp-tools-commit] r398 - in trunk: . debian debian/patches

[thialme-guest at alioth.debian.org]

Author: thialme-guest
Date: 2009-01-24 13:22:28 +0000 (Sat, 24 Jan 2009)
New Revision: 398

Added:
   trunk/debian/README.source
   trunk/debian/patches/
   trunk/debian/patches/gpgwrap_makefile.diff
   trunk/debian/patches/series
Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/rules
Log:
Added Quilt framework.

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


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-01-24 12:12:19 UTC (rev 397)
+++ trunk/Makefile	2009-01-24 13:22:28 UTC (rev 398)
@@ -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

Added: trunk/debian/README.source
===================================================================
--- trunk/debian/README.source	                        (rev 0)
+++ trunk/debian/README.source	2009-01-24 13:22:28 UTC (rev 398)
@@ -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.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-01-24 12:12:19 UTC (rev 397)
+++ trunk/debian/changelog	2009-01-24 13:22:28 UTC (rev 398)
@@ -3,6 +3,7 @@
   [ 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.

Added: trunk/debian/patches/gpgwrap_makefile.diff
===================================================================
--- trunk/debian/patches/gpgwrap_makefile.diff	                        (rev 0)
+++ trunk/debian/patches/gpgwrap_makefile.diff	2009-01-24 13:22:28 UTC (rev 398)
@@ -0,0 +1,26 @@
+From: Franck Joncourt <franck.mail at dthconnex.com>
+Subject: [PATCH] fixes/gpgwrap_makefile
+
+This allows gpgwrap to be installed with the main Makefile.
+
+Signed-off-by: Franck Joncourt <franck.mail at 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)

Added: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	                        (rev 0)
+++ trunk/debian/patches/series	2009-01-24 13:22:28 UTC (rev 398)
@@ -0,0 +1 @@
+gpgwrap_makefile.diff

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-01-24 12:12:19 UTC (rev 397)
+++ trunk/debian/rules	2009-01-24 13:22:28 UTC (rev 398)
@@ -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 @@
 	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