diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:53:16 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:53:16 (GMT) |
| commit | badce532e0a1aeb8bf97eb0ea088bec292dd5dc5 (patch) | |
| tree | 6e2e9fad95b0fa314cac9c18c99207b8aa1ed81f | |
| parent | bb7bd96ce379692b5906beaf371475b5c2129d98 (diff) | |
Update patch 2002.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/2002_ignore_debian_and_quilt-patches.patch | 17 |
2 files changed, 9 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 7629155..098dd13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ sugar-toolkit (0.82.11-1) UNRELEASED; urgency=low * New upstream release. * Drop patch 1002 now applied upstream. * Drop patch 1003 no longer relevant (upstream routine rewritten). + * Update patch 2002. * Update debian/copyright and copyright hints (new copyright holders and years, same licenses). diff --git a/debian/patches/2002_ignore_debian_and_quilt-patches.patch b/debian/patches/2002_ignore_debian_and_quilt-patches.patch index ca8bdfe..43f95ae 100644 --- a/debian/patches/2002_ignore_debian_and_quilt-patches.patch +++ b/debian/patches/2002_ignore_debian_and_quilt-patches.patch @@ -1,13 +1,12 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py -index 2480b03..01d06f3 100644 --- a/src/sugar/activity/bundlebuilder.py +++ b/src/sugar/activity/bundlebuilder.py -@@ -130,7 +130,7 @@ class BuildPackager(Packager): - return files - - def _list_useful_files(self): -- ignore_dirs = ['dist', '.git'] -+ ignore_dirs = ['dist', '.git', 'debian', '.pc'] - ignore_files = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak'] +@@ -30,7 +30,7 @@ from fnmatch import fnmatch + from sugar import env + from sugar.bundle.activitybundle import ActivityBundle + +-IGNORE_DIRS = ['dist', '.git'] ++IGNORE_DIRS = ['dist', '.git', 'debian', '.pc'] + IGNORE_FILES = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak', 'pseudo.po'] - return list_files(self.config.source_dir, ignore_dirs, ignore_files) + def list_files(base_dir, ignore_dirs=None, ignore_files=None): |