diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 19:38:59 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 19:38:59 (GMT) |
| commit | 297317343ca932308e504905ad55cac72d7d2c54 (patch) | |
| tree | c80a74179ddae8f12cb5c371c3f10ed020d35062 | |
| parent | 9be50f293c46c6045d40d867e60f8b332f27969a (diff) | |
Rewrite patch 2002 (ignore debian subdir and .pc quilt subdir) and unfuzz patch 1002.debian/0.81.5-1
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/1002_fix_gettext_domain.patch | 2 | ||||
| -rw-r--r-- | debian/patches/2002_ignore_debian_and_quilt-patches.patch | 29 |
3 files changed, 13 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index 77499ee..7c06785 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ sugar-toolkit (0.81.5-1) unstable; urgency=low * New upstream release. + * Rewrite patch 2002 (ignore debian subdir and .pc quilt subdir) and + unfuzz patch 1002. * Update local cdbs snippets: + Relax copyright-check to only warn about its discoveries. Closes: bug#486987. diff --git a/debian/patches/1002_fix_gettext_domain.patch b/debian/patches/1002_fix_gettext_domain.patch index c4b8d87..0ca4496 100644 --- a/debian/patches/1002_fix_gettext_domain.patch +++ b/debian/patches/1002_fix_gettext_domain.patch @@ -15,7 +15,7 @@ diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index 6204354..65f0428 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py -@@ -73,7 +73,7 @@ from sugar import wm +@@ -74,7 +74,7 @@ from sugar import wm from sugar import profile from sugar import _sugarext diff --git a/debian/patches/2002_ignore_debian_and_quilt-patches.patch b/debian/patches/2002_ignore_debian_and_quilt-patches.patch index a50e6f1..349c805 100644 --- a/debian/patches/2002_ignore_debian_and_quilt-patches.patch +++ b/debian/patches/2002_ignore_debian_and_quilt-patches.patch @@ -1,22 +1,13 @@ diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py -index bf21085..5aad4ef 100644 +index 2480b03..01d06f3 100644 --- a/src/sugar/activity/bundlebuilder.py +++ b/src/sugar/activity/bundlebuilder.py -@@ -115,7 +115,7 @@ class BuildPackager(Packager): - - def get_files(self): - return list_files(self.build_dir, -- ignore_dirs=['po', 'dist', '.git'], -+ ignore_dirs=['po', 'dist', '.git', 'debian', '.pc'], - ignore_files=['.gitignore']) - - class XOPackager(BuildPackager): -@@ -141,7 +141,7 @@ class SourcePackager(Packager): - - def get_files(self): - return list_files(self.config.source_dir, -- ignore_dirs=['locale', 'dist', '.git'], -+ ignore_dirs=['locale', 'dist', '.git', 'debian', '.pc'], - ignore_files=['.gitignore']) - - def package(self): +@@ -126,7 +126,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'] + + return list_files(self.config.source_dir, ignore_dirs, ignore_files) |