From 80afb2e08d84eefe7fcd086844781b5481ef6871 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 24 Jun 2013 01:16:00 -0400
Subject: [PATCH] More work on debian packaging

---
 .gitignore      |  1 +
 Makefile        | 13 ++++++++-----
 config/awx.conf |  1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf49f92867..0bf73b31fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ awx/public/media
 awx/public/static
 env/*
 build
+deb-build
 dist
 htmlcov
 rpm-build
diff --git a/Makefile b/Makefile
index 58224eab50..a3583ed563 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 PYTHON=python
 SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 RELEASE=awx-1.2b2
+VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])")
 
 .PHONY: clean rebase push setup requirements requirements_pypi develop refresh \
 	adduser syncdb migrate dbchange dbshell runserver celeryd test \
@@ -126,11 +127,13 @@ rpm: sdist
 	-ba packaging/rpm/awx.spec
 
 deb: sdist
-	cp -r packaging/debian ./
-	chmod 755 debian/rules
-	fakeroot debian/rules clean
-	fakeroot dh_install
-	fakeroot debian/rules binary
+	@mkdir -p deb-build
+	@cp dist/*.gz deb-build/
+	(cd deb-build && tar zxf awx-$(VERSION).tar.gz)
+	(cd deb-build/awx-$(VERSION) && dh_make --single --yes -f ../awx-$(VERSION).tar.gz)
+	@rm -rf deb-build/awx-$(VERSION)/debian
+	@cp -a packaging/debian deb-build/awx-$(VERSION)/
+	(cd deb-build/awx-$(VERSION) && dpkg-buildpackage -nc -us -uc -b)
 
 install:
 	$(PYTHON) setup.py install egg_info -b ""
diff --git a/config/awx.conf b/config/awx.conf
index 5905373328..f57573933b 100644
--- a/config/awx.conf
+++ b/config/awx.conf
@@ -1,5 +1,4 @@
 NameVirtualHost *:80
-WSGISocketPrefix run/wsgi
 
 <VirtualHost _default_:80>
   ServerName localhost