From e98f2a42a0007992fd7484d80a5d3eb398312826 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Mon, 14 Dec 2009 21:38:12 -0600
Subject: [PATCH] Fixing upload

---
 Makefile            |    2 +-
 support/builddeb.py |   32 ++++++++++++++++++++++----------
 support/py2deb.py   |    2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 43132c0..4ed01ef 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,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 1270f20..3d06585 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -244,16 +244,28 @@ def build_package(distribution):
 	p["/usr/share/icons/hicolor/64x64/hildon"] = ["data-pixmaps-gonvert.png|gonvert.png"]
 	p["/usr/share/icons/hicolor/scalable/hildon"] = ["data-pixmaps-gonvert.png|gonvert.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])
-- 
1.7.9.5