[boinc] 01/01: Fix LC messages, thanks Josef Andersson (northar)

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit a56f9babccffaf1ee9b37941e69116b87b370f77
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Oct 6 07:24:56 2015 +0200

    Fix LC messages, thanks Josef Andersson (northar)
---
 debian/boinc-client.install                        |  2 +-
 debian/boinc-manager.install                       |  2 +-
 debian/changelog                                   |  8 ++++
 .../fix-localization-path-and-missing.patch        | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 -
 6 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/debian/boinc-client.install b/debian/boinc-client.install
index 6b86d70..51bc336 100644
--- a/debian/boinc-client.install
+++ b/debian/boinc-client.install
@@ -6,4 +6,4 @@ debian/extra/update-boinc-applinks  usr/bin
 usr/bin/boinc
 usr/bin/boinccmd
 usr/bin/switcher                    usr/lib/boinc-client
-usr/share/locale/*/BOINC-Client.mo
+usr/share/locale/*/LC_MESSAGES/BOINC-Client.mo
diff --git a/debian/boinc-manager.install b/debian/boinc-manager.install
index 9c549e0..8cfdfb8 100644
--- a/debian/boinc-manager.install
+++ b/debian/boinc-manager.install
@@ -2,4 +2,4 @@ debian/boinc-manager.desktop       usr/share/applications
 debian/icons/hicolor               usr/share/icons
 debian/icons/pixmaps/boincmgr.xpm  usr/share/pixmaps
 usr/bin/boincmgr
-usr/share/locale/*/BOINC-Manager.mo
+usr/share/locale/*/LC_MESSAGES/BOINC-Manager.mo
diff --git a/debian/changelog b/debian/changelog
index 6a4ec35..eb9ce9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.6.11+dfsg-2) UNRELEASED; urgency=medium
+
+  * fix-localization-path-and-missing.patch (forwarded upstream)
+    - Install locales in LC_MESSAGES subdir (LP: #1315614)
+    - Add sv localization to install (LP: #1502568, Closes: #800838)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 06 Oct 2015 06:32:18 +0200
+
 boinc (7.6.11+dfsg-1exp1) experimental; urgency=medium
 
   * Upload to experimental again, with the boinc-server-* packages.
diff --git a/debian/patches/fix-localization-path-and-missing.patch b/debian/patches/fix-localization-path-and-missing.patch
new file mode 100644
index 0000000..52620cb
--- /dev/null
+++ b/debian/patches/fix-localization-path-and-missing.patch
@@ -0,0 +1,52 @@
+Description: Fix localization missing and install path
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+Author: Josef Andersson (northar)
+
+--- boinc-7.6.11+dfsg.orig/locale/Makefile.am
++++ boinc-7.6.11+dfsg/locale/Makefile.am
+@@ -16,16 +16,20 @@ locale_dirs = \
+ 	el \
+ 	es \
+ 	fa \
++	fa_IR \
+ 	fi \
+ 	fr \
+ 	gl \
++	he \
+ 	hr \
+ 	hu \
+ 	it_IT \
+ 	ja \
++	ka \
+ 	ko \
+ 	lt \
+ 	lv \
++	ms \
+ 	nb \
+ 	nl \
+ 	nn \
+@@ -36,7 +40,7 @@ locale_dirs = \
+ 	ru \
+ 	sk \
+ 	sl \
+-	sv_SE \
++	sv \
+ 	tr \
+ 	uk \
+ 	zh_CN \
+@@ -45,12 +49,12 @@ locale_dirs = \
+ install-data-hook:
+ 	mydir=$(DESTDIR)$(datadir) ;\
+ 	for ldir in $(locale_dirs) ; do \
+-	  $(INSTALL) -d $$mydir/$$ldir ; \
++	  $(INSTALL) -d $$mydir/$$ldir/LC_MESSAGES ; \
+ 	  if [ -f $$ldir/BOINC-Manager.mo ] ; then \
+-	    $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \
++	    $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo ; \
+ 	  fi ;\
+ 	  if [ -f $$ldir/BOINC-Client.mo ] ; then \
+-	    $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/BOINC-Client.mo ; \
++	    $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Client.mo ; \
+ 	  fi ;\
+ 	done
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dee3e12..2164ce1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
 envargs.patch
 fix-underlinking.patch
+fix-localization-path-and-missing.patch
diff --git a/debian/rules b/debian/rules
index 4865d7a..477d693 100755
--- a/debian/rules
+++ b/debian/rules
@@ -329,7 +329,6 @@ override_dh_auto_clean:
 	  missing \
 	  sched/credit_test \
 	  svn_version.h \
-	  locale/client/ar/BOINC\ Manager.mo \
 	  config.guess \
 	  config.sub \
 	  client/scripts/Makefile \

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