From: epage <eopage@byu.net>
Date: Sat, 12 Dec 2009 17:08:27 +0000 (+0000)
Subject: Adding support for building .deb
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=e83d24ecd313d9116027e0712801f496958c3ca5

Adding support for building .deb

git-svn-id: file:///svnroot/gc-dialer/trunk@584 c39d3808-3fe2-4d86-a59f-b7f623ee9f21
---

diff --git a/Makefile b/Makefile
index ea37686..57f135d 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,9 @@ package: $(OBJ)
 	mkdir -p $(BUILD_PATH)/mer
 	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
 	cd $(BUILD_PATH)/mer ; python builddeb.py mer
+	mkdir -p $(BUILD_PATH)/debian
+	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
+	cd $(BUILD_PATH)/debian ; python builddeb.py debian
 
 upload: package
 	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
diff --git a/support/builddeb.py b/support/builddeb.py
index 92ef6ff..0973f94 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -307,7 +307,7 @@ def build_package(distribution):
 	print p.generate(
 		version="%s-%s" % (__version__, __build__),
 		changelog=__changelog__,
-		build=False,
+		build=True,
 		tar=True,
 		changes=True,
 		dsc=True,
diff --git a/support/py2deb.py b/support/py2deb.py
index 59426c7..d1eac8a 100644
--- a/support/py2deb.py
+++ b/support/py2deb.py
@@ -192,7 +192,7 @@ def py2changes(params):
     shutil.move(l[0],tar)
     ret.append(tar)
 
-    l=glob("%(TEMP)s/%(name)s*.changes" % params)
+    l=glob("%(TEMP)s/%(name)s*_*_*.changes" % params)
     if len(l)!=1:
         raise Py2debException("don't find source package changes")
     tar = os.path.basename(l[0])