[Pkg-sugar-commit] [sugar-toolkit-gtk3] 02/05: Drop patch now included upstream, and unfuzz remaining patch.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository sugar-toolkit-gtk3.

commit d41c98166c82467c612906b6990afc308b60f58b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 14 15:29:35 2015 -0500

    Drop patch now included upstream, and unfuzz remaining patch.
---
 debian/patches/020150528~e8553c1.patch             | 67 ----------------------
 .../2002_ignore_debian_and_quilt-patches.patch     |  4 +-
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/debian/patches/020150528~e8553c1.patch b/debian/patches/020150528~e8553c1.patch
deleted file mode 100644
index 6e708a2..0000000
--- a/debian/patches/020150528~e8553c1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Add skip-install-mime option to bundlebuilder
- Historically, distro packagers have been using bunblebuilder, via
- "setup.py install", to populate packages directories and files.
- .
- The install procedure uses ActivityBundle.install_mime_type to install
- custom mime types, by creating symlinks and updating the system mime
- types database via the update-mime-database tool.
- .
- When ActivityBundle.install_mime_type is executed during packages
- creation, the symlinks end-up broken in the final package and the use
- of update-mime-database populates the final packages with a new copy of
- the database files which could clash with the system copy.
- .
- This patch adds a new option, called --skip-install-mime to "setup.py
- install" to skip the execution of ActivityBundle.install_mime_type and
- avoid the issues mentioned above.
- .
- Activity packagers should use this new option. The creation of symlinks
- and the execution of update-mime-database should be done in post
- install packaging steps.
-Origin: upstream, https://github.com/sugarlabs/sugar-toolkit-gtk3/commit/e8553c1
-Author: Martin Abente Lahaye <tch at sugarlabs.org>
-Forwarded: yes
-Bug-Debian: http://bugs.debian.org/783890
-Last-Update: 2015-05-30
-
---- a/src/sugar3/activity/bundlebuilder.py
-+++ b/src/sugar3/activity/bundlebuilder.py
-@@ -235,7 +235,7 @@
-         Packager.__init__(self, builder.config)
-         self.builder = builder
- 
--    def install(self, prefix):
-+    def install(self, prefix, install_mime=True):
-         self.builder.build()
- 
-         activity_path = os.path.join(prefix, 'share', 'sugar', 'activities',
-@@ -267,7 +267,8 @@
- 
-             shutil.copy(source, dest)
- 
--        self.config.bundle.install_mime_type(self.config.source_dir)
-+        if install_mime:
-+            self.config.bundle.install_mime_type(self.config.source_dir)
- 
- 
- def cmd_check(config, options):
-@@ -355,7 +356,7 @@
-     """Install the activity in the system"""
- 
-     installer = Installer(Builder(config))
--    installer.install(options.prefix)
-+    installer.install(options.prefix, options.install_mime)
- 
- 
- def cmd_genpot(config, options):
-@@ -419,6 +420,10 @@
-     install_parser.add_argument(
-         "--prefix", dest="prefix", default=sys.prefix,
-         help="Path for installing")
-+    install_parser.add_argument(
-+        "--skip-install-mime", dest="install_mime",
-+        action="store_false", default=True,
-+        help="Skip the installation of custom mime types in the system")
- 
-     check_parser = subparsers.add_parser(
-         "check", help="Run tests for the activity")
diff --git a/debian/patches/2002_ignore_debian_and_quilt-patches.patch b/debian/patches/2002_ignore_debian_and_quilt-patches.patch
index 32619ed..1b8aff3 100644
--- a/debian/patches/2002_ignore_debian_and_quilt-patches.patch
+++ b/debian/patches/2002_ignore_debian_and_quilt-patches.patch
@@ -7,8 +7,8 @@ Last-Update: 2010-02-08
  from sugar3.bundle.activitybundle import ActivityBundle
  
  
--IGNORE_DIRS = ['dist', '.git']
-+IGNORE_DIRS = ['dist', '.git', 'debian', '.pc']
+-IGNORE_DIRS = ['dist', '.git', 'screenshots']
++IGNORE_DIRS = ['dist', '.git', 'screenshots', 'debian', '.pc']
  IGNORE_FILES = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak', 'pseudo.po']
  
  
diff --git a/debian/patches/series b/debian/patches/series
index 9616f27..8ba3862 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-020150528~e8553c1.patch
 2002_ignore_debian_and_quilt-patches.patch
 #2003_bundlebuilder_exit_nonzero_on_error.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit-gtk3.git