From 7647b3aed3e9b0d91134ab6b57f56f80fd701b6a Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Thu, 25 Jun 2009 20:32:06 +0100
Subject: Debian Packaging seems to vaguely work now.


diff --git a/Makefile b/Makefile
index 9c71c56..f56cfbc 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ ifeq ($(BUILD_SWIFT),yes)
 include Swift/Makefile.inc
 endif
 include QA/Makefile.inc
-include Swift/Packaging/Debian/Makefile.inc
 ################################################################################
 # Main targets
 ################################################################################
diff --git a/Swift/Makefile.inc b/Swift/Makefile.inc
index 1a88144..8646f2a 100644
--- a/Swift/Makefile.inc
+++ b/Swift/Makefile.inc
@@ -1,2 +1,3 @@
 include Swift/Controllers/Makefile.inc
 include Swift/QtUI/Makefile.inc
+include Swift/Packaging/Debian/Makefile.inc
diff --git a/Swift/Packaging/Debian/Makefile.inc b/Swift/Packaging/Debian/Makefile.inc
index b54a9f1..e93f995 100755
--- a/Swift/Packaging/Debian/Makefile.inc
+++ b/Swift/Packaging/Debian/Makefile.inc
@@ -1,24 +1,20 @@
 DATE=`date +%Y%m%d`
 SIZE=`du -s tmpusr/usr | awk '{print $1}'`
-VERSION=0.3.$DATE
+VERSION=0.3.$(DATE)
 ARCH=amd64
 DEBPATH=Swift/Packaging/Debian
 DEBNAME=swift-preview_$(VERSION)-$(ARCH).deb
 $(DEBPATH)/$(DEBNAME): all
-	echo "Removing old package files"
 	rm -rf $(DEBPATH)/tmpusr
 	mkdir -p $(DEBPATH)/tmpusr/usr/bin
 	mkdir $(DEBPATH)/tmpusr/DEBIAN
 
-	echo "Building fake filesystem"
 	cp Swift/QtUI/swift $(DEBPATH)/tmpusr/usr/bin
 
-	echo "Populating debian control scripts"
-	cat $(DEBPATH)/control | sed -e"s/\%ARCH\%/$ARCH/" -e"s/\%VERSION\%/$VERSION/" -e"s/\%SIZE\%/$SIZE/" > $(DEBPATH)/tmpusr/DEBIAN/control
+	cat $(DEBPATH)/control | sed -e"s/\%ARCH\%/$(ARCH)/" -e"s/\%VERSION\%/$(VERSION)/" -e"s/\%SIZE\%/$(SIZE)/" > $(DEBPATH)/tmpusr/DEBIAN/control
 
-	echo "Building package"
-	dpkg -b $(DEBPATH)tmpusr $(DEBPATH)/$(DEBNAME)
+	dpkg -b $(DEBPATH)/tmpusr $(DEBPATH)/$(DEBNAME)
 
+.PHONY: deb
 deb: $(DEBPATH)/$(DEBNAME)
 
-.PHONY: deb
-- 
cgit v0.10.2-6-g49f6