Fixing upload

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

diff --git a/Makefile b/Makefile
index 2dd7144..b55cea5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ package: $(OBJ)
        cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
        cd $(BUILD_PATH)/debian ; python builddeb.py debian
 
-upload: package
+upload:
        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

diff --git a/support/builddeb.py b/support/builddeb.py
index a864821..0b3d38e 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -308,16 +308,28 @@ def build_package(distribution):
        p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-dialcentral.png|dialcentral.png"]
        p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-dialcentral.png|dialcentral.png"]
 
-       print p
-       print p.generate(
-               version="%s-%s" % (__version__, __build__),
-               changelog=__changelog__,
-               build=True,
-               tar=True,
-               changes=True,
-               dsc=True,
-       )
-       print "Building for %s finished" % distribution
+       if distribution == "debian":
+               print p
+               print p.generate(
+                       version="%s-%s" % (__version__, __build__),
+                       changelog=__changelog__,
+                       build=True,
+                       tar=False,
+                       changes=False,
+                       dsc=False,
+               )
+               print "Building for %s finished" % distribution
+       else:
+               print p
+               print p.generate(
+                       version="%s-%s" % (__version__, __build__),
+                       changelog=__changelog__,
+                       build=False,
+                       tar=True,
+                       changes=True,
+                       dsc=True,
+               )
+               print "Building for %s finished" % distribution
 
 
 if __name__ == "__main__":

diff --git a/support/py2deb.py b/support/py2deb.py
index d1eac8a..4a47513 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])