[boinc] 01/01: Patch refresh, preparing the upload to unstable, low urgency

[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 634e07fbd5bcaba0f4b1cc1cff9f0da0b65a4db1
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri May 30 15:29:18 2014 +0200

    Patch refresh, preparing the upload to unstable, low urgency
---
 debian/changelog                                    |  5 +++--
 debian/patches/fix-747964.patch                     | 15 ++++++---------
 debian/patches/gui_urls_xml_added_to_Makefile.patch |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd6c283..02b6c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-boinc (7.3.19+dfsg-2) UNRELEASED; urgency=medium
+boinc (7.3.19+dfsg-2) unstable; urgency=low
 
   [ Guo Yixuan (郭溢譞) ]
   * Use more debhelper features.
@@ -9,11 +9,12 @@ boinc (7.3.19+dfsg-2) UNRELEASED; urgency=medium
       already removed in a previous adjustment.
 
   [ Gianfranco Costamagna ]
+  * Upload to unstable (Closes: #749843, #747964, #746830)
   * Fix typo in debian/rules, we were unnecessarily building server stuff.
   * Split the server dynamic linkage away from Missing_libSched.patch in a new
     boinc-server-dynamic-libs.patch patch
 
- -- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>  Mon, 26 May 2014 18:02:53 -0400
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 30 May 2014 15:27:55 +0200
 
 boinc (7.3.19+dfsg-1) experimental; urgency=low
 
diff --git a/debian/patches/fix-747964.patch b/debian/patches/fix-747964.patch
index bb93d47..fff2021 100644
--- a/debian/patches/fix-747964.patch
+++ b/debian/patches/fix-747964.patch
@@ -3,9 +3,9 @@ Bug-Debian: http://bugs.debian.org/747964
 Forwarded: <yes>
 Last-Update: <2014-05-13>
 
---- boinc-7.2.47+dfsg.orig/zip/zip/util.c
-+++ boinc-7.2.47+dfsg/zip/zip/util.c
-@@ -802,7 +802,7 @@ unsigned char *zmbsrchr(str, c)
+--- a/zip/zip/util.c
++++ b/zip/zip/util.c
+@@ -802,7 +802,7 @@
   |     to make the action of the code less obscure.
   ****************************************************************/
  
@@ -14,7 +14,7 @@ Last-Update: <2014-05-13>
      int *Pargc;
      char ***Pargv;
      char *envstr;
-@@ -825,7 +825,7 @@ void envargs(Pargc, Pargv, envstr, envst
+@@ -825,7 +825,7 @@
              while (isspace((uch)*envptr))
                  envptr++;
      if (envptr == NULL || *envptr == '\0')
@@ -23,7 +23,7 @@ Last-Update: <2014-05-13>
  
      /* count the args so we can allocate room for them */
      argc = count_args(envptr);
-@@ -902,6 +902,7 @@ void envargs(Pargc, Pargv, envstr, envst
+@@ -902,6 +902,7 @@
      /* save the values and return */
      *Pargv = argvect;
      *Pargc = argc;
@@ -31,11 +31,9 @@ Last-Update: <2014-05-13>
  }
  
  local int count_args(s)
-diff --git a/zip/zip/zip.h b/zip/zip/zip.h
-index ba03160..cc01701 100644
 --- a/zip/zip/zip.h
 +++ b/zip/zip/zip.h
-@@ -811,7 +811,7 @@ int  namecmp       OF((ZCONST char *string1, ZCONST char *string2));
+@@ -811,7 +811,7 @@
  
  zvoid far **search OF((ZCONST zvoid *, ZCONST zvoid far **, extent,
                         int (*)(ZCONST zvoid *, ZCONST zvoid far *)));
@@ -44,4 +42,3 @@ index ba03160..cc01701 100644
  void expand_args   OF((int *, char ***));
  
  int  is_text_buf   OF((ZCONST char *buf_ptr, unsigned buf_size));
-
diff --git a/debian/patches/gui_urls_xml_added_to_Makefile.patch b/debian/patches/gui_urls_xml_added_to_Makefile.patch
index c4874ba..9340813 100644
--- a/debian/patches/gui_urls_xml_added_to_Makefile.patch
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -9,4 +9,4 @@
 +    gui_urls.xml
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
- AM_LDFLAGS += -L../sched -L../lib/.libs
+ AM_LDFLAGS += -static -L../sched -L../lib/.libs

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