Adding support for building .deb

git-svn-id: file:///svnroot/ejpi/trunk@82 df6cc7de-23d0-4ae0-bb86-c17aa67b2a9d

diff --git a/Makefile b/Makefile
index 240b4fc..bdecd33 100644 (file)
--- 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 50bfb24..7eb4a3c 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -154,7 +154,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 (file)
--- 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])