From: Ed Page <eopage@byu.net>
Date: Sat, 12 Dec 2009 17:03:57 +0000 (-0600)
Subject: Adding support for building .debs
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=5871efe867162458c5180deb6a8c812abdbcbcf9;ds=sidebyside

Adding support for building .debs
---

diff --git a/Makefile b/Makefile
index 1bfbe22..fcaa075 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,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 05b02ff..ef908f7 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -110,7 +110,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 6018f91..d1eac8a 100644
--- a/support/py2deb.py
+++ b/support/py2deb.py
@@ -168,7 +168,8 @@ def py2changes(params):
     fileHandle = open('/tmp/py2deb2.tmp', 'w')
     fileHandle.write('#!/bin/sh\n')
     fileHandle.write("cd " +os.getcwd()+ "\n")
-    fileHandle.write("gpg --local-user %(mail)s --clearsign %(TEMP)s/%(name)s_%(version)s.changes\n" % params)
+    # TODO Renable signing
+    # fileHandle.write("gpg --local-user %(mail)s --clearsign %(TEMP)s/%(name)s_%(version)s.changes\n" % params)
     fileHandle.write("mv %(TEMP)s/%(name)s_%(version)s.changes.asc %(TEMP)s/%(name)s_%(version)s.changes\n" % params)
     fileHandle.write('\nexit')
     fileHandle.close()
@@ -191,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])
@@ -254,7 +255,8 @@ def py2dsc(TEMP, name, version, depends, author, mail, arch):
     try:
         fileHandle.write('#!/bin/sh\n')
         fileHandle.write("cd " + os.getcwd() + "\n")
-        fileHandle.write("gpg --local-user %(mail)s --clearsign %(TEMP)s/%(name)s_%(version)s.dsc\n" % locals())
+        # TODO Renable signing
+        # fileHandle.write("gpg --local-user %(mail)s --clearsign %(TEMP)s/%(name)s_%(version)s.dsc\n" % locals())
         fileHandle.write("mv %(TEMP)s/%(name)s_%(version)s.dsc.asc %(filename)s\n" % locals())
         fileHandle.write('\nexit')
         fileHandle.close()