diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-05-24 20:42:54 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-05-24 20:43:59 (GMT) |
| commit | 3c106911c22ed0aec1a8ba37448e32ec449b6e54 (patch) | |
| tree | 3b31ff5904a6601dbad1137097d17ae1e8ab18bb | |
| parent | c21b9bed55aca9ad5e36c02aa16561cc455ee77e (diff) | |
Drop patch 1003 fixing zip-based bundle install (upstream identical fix applied within an hour(!) from the earlier Debian patch).debian/0.79.7-1
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/1003_fix_bundlebuilder_zip_install.patch | 19 | ||||
| -rw-r--r-- | debian/patches/2001_sha1_on_older_python.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 3 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index bde8681..f3cf2d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sugar-toolkit (0.79.7-1) unstable; urgency=low * New upstream release. * Unfuzz patches (most of sources moved sugar -> src/sugar). + * Drop patch 1003 fixing zip-based bundle install (upstream identical + fix applied within an hour(!) from the earlier Debian patch). * Mention new file src/sugar/presence/sugartubeconn.py in debian/copyright (LGPL-2.1+) and update paths, thanks to local copyright-check.mk cdbs snippet. Update debian/copyright-hints. diff --git a/debian/patches/1003_fix_bundlebuilder_zip_install.patch b/debian/patches/1003_fix_bundlebuilder_zip_install.patch deleted file mode 100644 index 1eeed92..0000000 --- a/debian/patches/1003_fix_bundlebuilder_zip_install.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py -index 4ea05f8..3e70b3c 100644 ---- a/src/sugar/activity/bundlebuilder.py -+++ b/src/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/2001_sha1_on_older_python.patch b/debian/patches/2001_sha1_on_older_python.patch index 72ec6d7..a8a43d0 100644 --- a/debian/patches/2001_sha1_on_older_python.patch +++ b/debian/patches/2001_sha1_on_older_python.patch @@ -1,6 +1,6 @@ --- sugar-toolkit-0.79.0.orig/src/sugar/activity/activity.py +++ sugar-toolkit-0.79.0/src/sugar/activity/activity.py -@@ -49,7 +49,11 @@ +@@ -50,7 +50,11 @@ import os import time import tempfile diff --git a/debian/patches/series b/debian/patches/series index 1e7eecc..9e4539d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 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 |