[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-18-g31f173f

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 09758ad0722166921046ddd550624e36beebbcb1
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Apr 27 21:06:39 2010 +0200

    Adjusted to partial adoption in upstream

diff --git a/debian/patches/006_correct_catalog_path.patch b/debian/patches/006_correct_catalog_path.patch
index 248b4a0..107622d 100644
--- a/debian/patches/006_correct_catalog_path.patch
+++ b/debian/patches/006_correct_catalog_path.patch
@@ -1,8 +1,10 @@
 Author: René Mayorga
 Description: Upstream place .mo files just in share/locale, on Debian 
  almost all .mo files are placed correctly under LC_MESSAGES
---- boinc.orig/locale/Makefile.am
-+++ boinc/locale/Makefile.am
+Index: boinc/locale/Makefile.am
+===================================================================
+--- boinc.orig/locale/Makefile.am	2010-04-27 01:48:06.000000000 +0200
++++ boinc/locale/Makefile.am	2010-04-27 21:04:25.000000000 +0200
 @@ -2,7 +2,7 @@
  
  include $(top_srcdir)/Makefile.incl
@@ -11,16 +13,16 @@ Description: Upstream place .mo files just in share/locale, on Debian
 +datadir = $(prefix)/share/locale
  
  locale_dirs = \
-         af_ZA \
-@@ -45,9 +45,9 @@
+ 	ar \
+@@ -40,9 +40,9 @@
  install-exec-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.po ] ; then \
--	    $(INSTALL) $$ldir/BOINC-Manager.po $$mydir/$$ldir/BOINC-Manager.po ; \
-+	    $(INSTALL) "$$ldir/BOINC-Manager.mo" "$$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo" ; \
++	  $(INSTALL) -d "$$mydir/$$ldir"/LC_MESSAGES ; \
+ 	  if [ -f $$ldir/BOINC-Manager.mo ] ; then \
+-	    $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \
++	    $(INSTALL) "$$ldir/BOINC-Manager.mo "$$mydir/$$ldir/BOINC-Manager.mo" ; \
  	  fi ;\
  	done
  

-- 
BOINC packaging