[boinc] 04/04: New upstream release

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to annotated tag debian/7.4.22+dfsg-1
in repository boinc.

commit 5bfdd0d9f361bf4f5bb1ec4973f8363ab9724cf0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Sep 24 10:52:32 2014 +0200

    New upstream release
---
 debian/changelog                               |  4 +++-
 debian/patches/MainDocumentWarnings.patch      |  6 +++---
 debian/patches/series                          |  1 -
 debian/patches/some_extra_clang_warnings.patch | 10 +++++-----
 debian/patches/termios_is_everywhere.patch     | 12 ------------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 279b3ac..1ece1c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-boinc (7.4.18+dfsg-2) UNRELEASED; urgency=medium
+boinc (7.4.22+dfsg-1) unstable; urgency=low
 
+  * New upstream release.
+  * Remove termios_is_everywhere.patch, fixed upstream.
   * Remove libx11-dev, libxcb-dpms0-dev, libxss-dev, libxext-dev
     from build dependencies, upstream now uses /dev to
     get devices information.
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index b071823..24ea521 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
-@@ -1664,7 +1664,6 @@
+@@ -1665,7 +1665,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;
-@@ -1672,12 +1671,13 @@
+@@ -1673,12 +1672,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)),
-@@ -1687,6 +1687,10 @@
+@@ -1688,6 +1688,10 @@
              0,
              id
          );
diff --git a/debian/patches/series b/debian/patches/series
index fbb8cd0..b8d3ceb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 # patches to get Debian going
 make_project_overcomes_Apache24_security.patch
 # undisputed patches above
-termios_is_everywhere.patch
 stripchart_debian.patch
 #upstream_sztaki_configureEval.patch
 disable_svn_version.patch
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index ddc480d..b96a9a9 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -1,6 +1,6 @@
 --- a/clientgui/sg_ProjectPanel.cpp
 +++ b/clientgui/sg_ProjectPanel.cpp
-@@ -414,8 +414,7 @@
+@@ -423,8 +423,7 @@
      CMainDocument* pDoc = wxGetApp().GetDocument();
      ProjectSelectionData* selData;
      PROJECT* project;
@@ -10,7 +10,7 @@
  
      if ( pDoc->IsConnected() ) {
          int projCnt = pDoc->GetSimpleProjectCount();
-@@ -423,10 +422,11 @@
+@@ -432,10 +431,11 @@
          oldProjectSelection = m_ProjectSelectionCtrl->GetSelection();
          
          // If a new project has been added, figure out which one
@@ -24,7 +24,7 @@
                  ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
                  if (!strcmp(project->master_url, ctrl_url)) {
                      found = true;
-@@ -438,7 +438,7 @@
+@@ -447,7 +447,7 @@
              if ( !found ) {
                  wxString projname(project->project_name.c_str(), wxConvUTF8);
  #if SORTPROJECTLIST
@@ -33,7 +33,7 @@
                  for(j = 0; j < ctrlCount; ++j) {
                      alphaOrder = (m_ProjectSelectionCtrl->GetString(j)).CmpNoCase(projname);
                      if (alphaOrder > 0) {
-@@ -470,8 +470,8 @@
+@@ -479,8 +479,8 @@
          if ( projCnt < ctrlCount ) {
              project = NULL;
              // Check items in descending order so deletion won't change indexes of items yet to be checked
@@ -44,7 +44,7 @@
                  project = pDoc->state.lookup_project(ctrl_url);
                  if ( project == NULL ) {
                      selData = (ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j);
-@@ -499,9 +499,9 @@
+@@ -508,9 +508,9 @@
      
          // Check to see if we need to reload the project icon
          ctrlCount = m_ProjectSelectionCtrl->GetCount();
diff --git a/debian/patches/termios_is_everywhere.patch b/debian/patches/termios_is_everywhere.patch
deleted file mode 100644
index aac56f0..0000000
--- a/debian/patches/termios_is_everywhere.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Helping compilation on freebsd machines.
---- a/zip/unzip/ttyio.c
-+++ b/zip/unzip/ttyio.c
-@@ -54,6 +54,7 @@
- #  define HAVE_TERMIOS_H
- #endif
- 
-+#include <unistd.h>	/* defines _POSIX_VERSION */
- #ifdef _POSIX_VERSION
- #  ifndef USE_POSIX_TERMIOS
- #    define USE_POSIX_TERMIOS  /* use POSIX style termio (termios) */

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