From: epage <eopage@byu.net>
Date: Tue, 15 Dec 2009 03:41:05 +0000 (+0000)
Subject: Fixing upload
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=aae4f415952b43f2ce6e75da43ac6d8035dc5296;p=ejpi

Fixing upload

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

diff --git a/Makefile b/Makefile
index 3de3ebd..7094a09 100644
--- 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 fd0db9d..08ffd82 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -155,16 +155,28 @@ def build_package(distribution):
 	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-ejpi.png|ejpi.png"]
 	p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-ejpi.png|ejpi.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
--- 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])