[boinc] 03/03: New upstream release

[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 acdfafd4e1a31de2c4c2dee4aa5e82e65bfb0c8c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Nov 11 12:16:53 2015 +0100

    New upstream release
---
 debian/changelog                                   |  5 ++-
 debian/patches/MainDocumentWarnings.patch          |  6 +--
 debian/patches/disable_new_version_check.patch     |  4 +-
 .../fix-localization-path-and-missing.patch        | 52 ----------------------
 debian/patches/series                              |  1 -
 debian/patches/some_extra_clang_warnings.patch     |  2 +-
 6 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9802b85..99df9fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-boinc (7.6.12+dfsg-2exp2) UNRELEASED; urgency=medium
+boinc (7.6.15+dfsg-1) unstable; urgency=medium
 
+  * New upstream release.
+    - drop fix-localization-path-and-missing.patch: upstream
   * remove menu file.
+  * Upload to unstable.
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 31 Oct 2015 14:02:43 +0100
 
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 24ea521..8801cee 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
 Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
 --- a/clientgui/MainDocument.cpp
 +++ b/clientgui/MainDocument.cpp
-@@ -1665,7 +1665,6 @@
+@@ -1666,7 +1666,6 @@
  }
  #else
  void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +10,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
      char currentDir[1024];
      char thePIDbuf[20];
      int id, iRetVal;
-@@ -1673,12 +1672,13 @@
+@@ -1674,12 +1673,13 @@
  
      if (g_use_sandbox) {
          snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -30,7 +30,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
      
          iRetVal = run_program(
              getcwd(currentDir, sizeof(currentDir)),
-@@ -1688,6 +1688,10 @@
+@@ -1689,6 +1689,10 @@
              0,
              id
          );
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index e7f3564..8a72e90 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
 
 --- a/client/client_state.cpp
 +++ b/client/client_state.cpp
-@@ -528,7 +528,7 @@
+@@ -609,7 +609,7 @@
  
      // inform the user if there's a newer version of client
      //
@@ -23,7 +23,7 @@ Last-Update: <2013-03-07>
      // now that we know the host's venue on each project
 --- a/client/scheduler_op.cpp
 +++ b/client/scheduler_op.cpp
-@@ -129,7 +129,7 @@
+@@ -134,7 +134,7 @@
          // and project list
          //
          if (!cc_config.no_info_fetch) {
diff --git a/debian/patches/fix-localization-path-and-missing.patch b/debian/patches/fix-localization-path-and-missing.patch
deleted file mode 100644
index 52620cb..0000000
--- a/debian/patches/fix-localization-path-and-missing.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 2164ce1..dee3e12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,4 +29,3 @@ 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/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index 58cd189..e8d3f56 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -57,5 +57,5 @@ Description: fixing some clang warning.
 -            ctrl_url = selData->project_url;
 +            char* ctrl_url = selData->project_url;
              project = pDoc->state.lookup_project(ctrl_url);
-             if ( project->project_files_downloaded_time > selData->project_files_downloaded_time ) {
+             if ( (project != NULL) && (project->project_files_downloaded_time > selData->project_files_downloaded_time) ) {
                  wxBitmap* projectBM = GetProjectSpecificBitmap(ctrl_url);

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