Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-06-11 01:35:11 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-06-11 01:39:23 (GMT)
commitb0b58cfff64520449a23e5aed145fe596c18111b (patch)
treee6f78a0f132d8d7a720c4cfa45ebee5e47bce537 /debian/patches
parent99a52c5d6c3ac749b9ffb74f50d5b28b06f84ab1 (diff)
Add patch 2002 to ignore debian subdir and .pc quilt subdir when packaging bundles (since version 0.81.4 the MANIFEST file is ignored and instead everything but an internally hardcoded exception list is included).debian/0.81.4-2
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/2002_ignore_debian_and_quilt-patches.patch22
-rw-r--r--debian/patches/series1
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/2002_ignore_debian_and_quilt-patches.patch b/debian/patches/2002_ignore_debian_and_quilt-patches.patch
new file mode 100644
index 0000000..a50e6f1
--- /dev/null
+++ b/debian/patches/2002_ignore_debian_and_quilt-patches.patch
@@ -0,0 +1,22 @@
+diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
+index bf21085..5aad4ef 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):
diff --git a/debian/patches/series b/debian/patches/series
index 9e4539d..e33b68d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
1001_danish_l10n.patch
1002_fix_gettext_domain.patch
2001_sha1_on_older_python.patch
+2002_ignore_debian_and_quilt-patches.patch
2991_enable_danish_l10n.patch
2992_fix_gettext_domain.patch