More .deb work

git-svn-id: file:///svnroot/quicknote/trunk@86 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2

diff --git a/Makefile b/Makefile
index be10451..7d0b394 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -91,11 +91,15 @@ build: $(OBJ) build_mo
        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: build
        dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
        dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
        dput chinook-extras-builder $(BUILD_PATH)/chinook/$(PROJECT_NAME)*.changes
+       cp $(BUILD_PATH)/debian/*.deb ../www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
        $(foreach file, $(SOURCE), $(LINT) $(file) ; )

diff --git a/support/builddeb.py b/support/builddeb.py
index a24960c..0b375dc 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -120,7 +120,7 @@ def build_package(distribution):
                "mer": maemoSpecificDepends + ", python-glade2",
        }[distribution]
        p.section = {
-               "debian": "accessories",
+               "debian": "editors",
                "chinook": "accessories",
                "diablo": "user/office",
                "fremantle": "user/office",
@@ -167,7 +167,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])