Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-04-25 13:15:34 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-04-25 13:15:34 (GMT)
commitd338cfd5b889558a6f427fe9fdcf6e49eeeede1f (patch)
tree071d4ff597d67d010a0dc4034a76c541beccd201
parent3f26205e814b32858e117dcd59d0ddfdce724de0 (diff)
Add patch 1003 to fix installing zip-based bundles (*.xo files).debian/0.79.6-2
* Add patch 1003 to fix installing zip-based bundles (*.xo files). * Set urgency=high to get this into testing ASAP, as sugar activity building is currently broken due to the above.
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/1003_fix_bundlebuilder_zip_install.patch19
-rw-r--r--debian/patches/series1
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1586720..d349334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sugar-toolkit (0.79.6-2) unstable; urgency=high
+
+ * Add patch 1003 to fix installing zip-based bundles (*.xo files).
+ * Set urgency=high to get this into testing ASAP, as sugar activity
+ building is currently broken due to the above.
+
+ -- Jonas Smedegaard <dr@jones.dk> Fri, 25 Apr 2008 15:11:05 +0200
+
sugar-toolkit (0.79.6-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/1003_fix_bundlebuilder_zip_install.patch b/debian/patches/1003_fix_bundlebuilder_zip_install.patch
new file mode 100644
index 0000000..991cba7
--- /dev/null
+++ b/debian/patches/1003_fix_bundlebuilder_zip_install.patch
@@ -0,0 +1,19 @@
+diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py
+index 4ea05f8..3e70b3c 100644
+--- a/sugar/activity/bundlebuilder.py
++++ b/sugar/activity/bundlebuilder.py
+@@ -78,10 +78,10 @@ def _extract_bundle(source_file, dest_dir):
+ if not os.path.exists(os.path.dirname(path)):
+ os.makedirs(os.path.dirname(path))
+
+- outfile = open(path, 'wb')
+- outfile.write(zf.read(name))
+- outfile.flush()
+- outfile.close()
++ outfile = open(path, 'wb')
++ outfile.write(zf.read(name))
++ outfile.flush()
++ outfile.close()
+
+ def _get_source_path(path=None):
+ if path:
diff --git a/debian/patches/series b/debian/patches/series
index 9e4539d..1e7eecc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
1001_danish_l10n.patch
1002_fix_gettext_domain.patch
+1003_fix_bundlebuilder_zip_install.patch
2001_sha1_on_older_python.patch
2991_enable_danish_l10n.patch
2992_fix_gettext_domain.patch