Revert "we are building with the format 3.0 (git) packaging techniques now; simplify...

I want to move back to the old way of building the packages because
having tarballs available to the public is a good thing.

This reverts commit bdee166ec49a499e7203e9bf7f4bd783b5ef0232.

diff --git a/Makefile b/Makefile
index ff0ee0c86dc2abe60a44d55e34413955d1dfd7bf..1e0b649efe0e9e72ee6f5ec892e06b4006bfe05a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,23 @@ all: keytrans
 keytrans:
        $(MAKE) -C src/keytrans
 
-tarball: clean
+release: 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
        ln -s ../COPYING ../etc ../Makefile ../man ../src  monkeysphere-$(MONKEYSPHERE_VERSION)
-       tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).tar.gz
+       tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
        rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
-debian-package: 
-       debuild -uc -us
+debian-package: release
+       tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
+       cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION)
+       (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
+       rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
 clean:
        $(MAKE) -C src/keytrans clean
        # clean up old monkeysphere packages lying around as well.
        rm -f monkeysphere_*
 
-.PHONY: all clean tarball debian-package
+.PHONY: all clean release debian-package