From bb653ca4695f25562a853a254c4bcf7800238d22 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 4 Sep 2008 13:05:27 -0400
Subject: [PATCH] preparing for 0.14-1 release with old packaging format.

---
 Makefile         | 6 +++---
 debian/changelog | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1e0b649..8f8cd92 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ all: keytrans
 keytrans:
 	$(MAKE) -C src/keytrans
 
-release: clean
+tarball: clean
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 	mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
 	ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
@@ -13,7 +13,7 @@ release: clean
 	tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
-debian-package: release
+debian-package: tarball
 	tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION)
 	(cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
@@ -24,4 +24,4 @@ clean:
 	# clean up old monkeysphere packages lying around as well.
 	rm -f monkeysphere_*
 
-.PHONY: all clean release debian-package
+.PHONY: all clean tarball debian-package
diff --git a/debian/changelog b/debian/changelog
index 8688b95..99ebec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+monkeysphere (0.14-1) experimental; urgency=low
+
+  * changing debian packaging back to format 1.0 so we get automatic
+    tarballs, and easier inclusion in other build networks.
+  * no other source changes.
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 04 Sep 2008 13:03:35 -0400
+
 monkeysphere (0.13-1) experimental; urgency=low
 
   [ Daniel Kahn Gillmor ]
-- 
2.26.2