[Pkg-sugar-commit] [sugar-toolkit-gtk3] 02/07: Add patch cherry-picked upstream to sort translation files. Closes: Bug#848633. Thanks to Dhole.

[Jonas Smedegaard]

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

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

commit 82d203674690fedfb83ce02111a27e8e3e519bcb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jan 25 04:21:34 2017 +0100

    Add patch cherry-picked upstream to sort translation files. Closes: Bug#848633. Thanks to Dhole.
---
 debian/patches/020170102~05a18a2.patch | 21 +++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/020170102~05a18a2.patch b/debian/patches/020170102~05a18a2.patch
new file mode 100644
index 0000000..d65a291
--- /dev/null
+++ b/debian/patches/020170102~05a18a2.patch
@@ -0,0 +1,21 @@
+Description: Sort translation files
+ Sort translation files when generating the .desktop file to output
+ reproducible results.
+Author: Dhole <dhole at openmailbox.org>
+Origin: Upstream, https://github.com/sugarlabs/sugar-toolkit-gtk3/commit/05a18a2
+Bug-Debian: https://bugs.debian.org/848633
+Last-Update: 2017-01-25
+
+--- a/src/sugar3/activity/bundlebuilder.py
++++ b/src/sugar3/activity/bundlebuilder.py
+@@ -387,8 +387,8 @@
+         if info.has_option('Activity', 'summary'):
+             cp.set(section, 'Comment', info.get('Activity', 'summary'))
+ 
+-        for path in glob(os.path.join(activity_path, 'locale',
+-                                      '*', 'activity.linfo')):
++        for path in sorted(glob(os.path.join(activity_path, 'locale',
++                                             '*', 'activity.linfo'))):
+             locale = path.split(os.path.sep)[-2]
+             info = ConfigParser()
+             info.read(path)
diff --git a/debian/patches/series b/debian/patches/series
index 53c88d7..03af722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 020161109~a6e62a5.patch
 020161109~ee93ad3.patch
+020170102~05a18a2.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