From e2273e6fd149125a22eb8b29a9862c941b8c9ccd Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Fri, 25 Dec 2009 07:47:48 -0600
Subject: [PATCH] Updating packaing stuff

---
 support/builddeb.py |   35 ++++++++++++++++++++++++-----------
 support/py2deb.py   |    2 +-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/support/builddeb.py b/support/builddeb.py
index a8f4ddf..2e9d12f 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -29,6 +29,7 @@ __changelog__ = """
 __postinstall__ = """#!/bin/sh -e
 
 gtk-update-icon-cache -f /usr/share/icons/hicolor
+rm -f ~/.theonering/theonering.log
 """
 
 def find_files(path):
@@ -62,7 +63,7 @@ def build_package(distribution):
 	p.prettyName = constants.__pretty_app_name__
 	p.description = __description__
 	p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=theonering"
-	p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
+	#p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
 	p.author = __author__
 	p.mail = __email__
 	p.license = "lgpl"
@@ -108,16 +109,28 @@ def build_package(distribution):
 	p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-theonering.png|theonering.png"]
 	p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-theonering.png|theonering.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