[SCM] BOINC packaging branch, master, updated. debian/6.4.5+dfsg-3-11-gf87328e

[rmayorga]

The following commit has been merged in the master branch:
commit 71064c6503f27bc2597c56a34f7c1b7588a0f61e
Author: rmayorga <rmayorga at debian.org>
Date:   Mon Nov 2 14:39:39 2009 -0600

    Refresh debian patches

diff --git a/debian/patches/003_use_sensible-browser.patch b/debian/patches/003_use_sensible-browser.patch
index 00091d2..f118225 100644
--- a/debian/patches/003_use_sensible-browser.patch
+++ b/debian/patches/003_use_sensible-browser.patch
@@ -7,12 +7,12 @@ The program "sensible-browser" is part of the essential package debianutils.
 --- boinc.orig/clientgui/hyperlink.cpp
 +++ boinc/clientgui/hyperlink.cpp
 @@ -171,7 +171,8 @@
- }
- 
- void wxHyperLink::ExecuteLink (const wxString &strLink) {
--    if (!wxLaunchDefaultBrowser(strLink)) {
-+    wxString cmd = wxT("sensible-browser ") + strLink;
-+    if (!::wxExecute(cmd, wxEXEC_ASYNC)) {
-         wxString strDialogTitle = wxEmptyString;
-         wxString strDialogMessage = wxEmptyString;
- 
+ }
+ 
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+-    if (!wxLaunchDefaultBrowser(strLink)) {
++    wxString cmd = wxT("sensible-browser ") + strLink;
++    if (!::wxExecute(cmd, wxEXEC_ASYNC)) {
+         wxString strDialogTitle = wxEmptyString;
+         wxString strDialogMessage = wxEmptyString;
+ 
diff --git a/debian/patches/006_correct_catalog_path.patch b/debian/patches/006_correct_catalog_path.patch
index c7327db..7885bf8 100644
--- a/debian/patches/006_correct_catalog_path.patch
+++ b/debian/patches/006_correct_catalog_path.patch
@@ -1,8 +1,8 @@
 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/client/Makefile.am
-+++ boinc/locale/client/Makefile.am
+--- boinc.orig/locale/Makefile.am
++++ boinc/locale/Makefile.am
 @@ -2,7 +2,7 @@
  
  include $(top_srcdir)/Makefile.incl
@@ -18,9 +18,9 @@ Description: Upstream place .mo files just in share/locale, on Debian
  	for ldir in $(locale_dirs) ; do \
 -	  $(INSTALL) -d $$mydir/$$ldir ; \
 +	  $(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/LC_MESSAGES/BOINC Manager.mo" ; \
+ 	  if [ -f $$ldir/BOINC-Manager.po ] ; then \
+-	    $(INSTALL) $$ldir/BOINC-Manager.po $$mydir/$$ldir/BOINC-Manager.po ; \
++	    $(INSTALL) "$$ldir/BOINC-Manager.po" "$$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.po" ; \
  	  fi ;\
  	done
  
diff --git a/debian/patches/series b/debian/patches/series
index 69c44a3..b4e5fb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-103_fix_ftbfs_on_kfreebsd.patch
-001_dont_install_ca-bundle.crt.patch
-002_remove_hardcoded_optimization.patch
+#103_fix_ftbfs_on_kfreebsd.patch  --   Needs to be removed maybe
+#001_dont_install_ca-bundle.crt.patch -- needs to be investigate
+#002_remove_hardcoded_optimization.patch -- needs to be investigate
 003_use_sensible-browser.patch 
-005_using_hyphen_as_minus.patch
+#005_using_hyphen_as_minus.patch Applied upstream
 006_correct_catalog_path.patch
-101_check_RSA_returned_values.patch
-102_gcc4.4_safe.patch
+#101_check_RSA_returned_values.patch # Might be applied upstream
+#102_gcc4.4_safe.patch # Applied upstram

-- 
BOINC packaging