From ad60071003201af2fc6e98b7a8552af6af8c601b Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 10 Mar 2010 02:27:06 -0500
Subject: [PATCH] adjusted Makefile to use strategies jrollins and i worked out
 from the xul-ext; cleaned up and decided to distribute docs

---
 .gitattributes                             |  2 --
 Changelog                                  |  8 ++++++++
 Makefile                                   | 12 ++++--------
 notes_from_whiteboard.txt => README.schema |  8 ++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)
 delete mode 100644 .gitattributes
 rename notes_from_whiteboard.txt => README.schema (63%)

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index d116b0f..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-.git* export-ignore
-notes_from_whiteboard.txt export-ignore
diff --git a/Changelog b/Changelog
index e04907e..3118c63 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+msva-perl (0.2~pre1) UNRELEASED;
+
+  * now shipping README.schema (notes about possible future MSVA
+    implementations)
+  * cleanup Makefile and distribution strategies.
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 10 Mar 2010 02:41:19 -0500
+
 msva-perl (0.1) upstream;
   
    * first release.
diff --git a/Makefile b/Makefile
index e579757..c967de7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,19 +13,15 @@ all: msva-perl.1
 msva-perl.1: msva-perl
 	pod2man msva-perl msva-perl.1
 
-release: tarball
-	git tag -s msva-perl/$(VERSION) -m "releasing msva-perl version $(VERSION)"
-
-tarball: msva-perl msva.protocol.README COPYING Makefile
-	git archive --format tar --prefix=msva-perl-$(VERSION)/ HEAD | gzip -n -9 > ../msva-perl-$(VERSION).tar.gz
-
 clean: 
 	rm -f msva-perl.1
 
 debian-package:
-	debuild -uc -us -i'^\.git|notes_from_whiteboard\.txt'
+	git buildpackage -uc -us --git-upstream-branch=master --git-debian-branch=debian --git-no-pristine-tar
 
+upstream-tag:
+	git tag -s msva-perl/$(VERSION) -m "releasing msva-perl version $(VERSION)"
 debian-tag:
 	git tag -s debian/$(DEBIAN_VERSION) -m "tagging msva-perl debian packaging version $(DEBIAN_VERSION)"
 
-.PHONY: release tarball debian-package debian-tag all clean
+.PHONY: upstream-tag debian-package debian-tag all clean
diff --git a/notes_from_whiteboard.txt b/README.schema
similarity index 63%
rename from notes_from_whiteboard.txt
rename to README.schema
index 1ca2bae..980a395 100644
--- a/notes_from_whiteboard.txt
+++ b/README.schema
@@ -1,3 +1,11 @@
+HYPOTHETICAL DOCS
+----------------
+
+These notes describe what a hypothetical schema for a self-implemented
+Monkeysphere Validation Agent (with no reliance on gpg) might look
+like.  This describes only the relational tables that might be
+relevant, and it is in some kind of pseudo-SQL.
+
 Public Key Carriers {
 
   x509 certs {
-- 
2.26.2