[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-37-gf354b10

Steffen Moeller steffen_moeller at gmx.de
Mon Jul 2 14:22:47 UTC 2012 

The following commit has been merged in the master branch:
commit 28cf02c328b7db2f157538248b1db509d886a951
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Jun 30 22:42:18 2012 +0200

    Adjustments for 7.0.30.

diff --git a/debian/changelog b/debian/changelog
index 8c575ea..604ba68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.30+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 30 Jun 2012 21:59:59 +0200
+
 boinc (7.0.28+dfsg-3) UNRELEASED; urgency=low
 
   [ Steffen Moeller ]
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index f1d6b7f..275ba8b 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,7 +1,7 @@
 Index: boinc/lib/Makefile.am
 ===================================================================
---- boinc.orig/lib/Makefile.am	2012-05-29 16:17:23.176263313 +0200
-+++ boinc/lib/Makefile.am	2012-05-29 17:00:22.337518324 +0200
+--- boinc.orig/lib/Makefile.am	2012-06-30 22:00:36.063690282 +0200
++++ boinc/lib/Makefile.am	2012-06-30 22:01:07.023273444 +0200
 @@ -146,13 +146,13 @@
  libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -30,9 +30,9 @@ Index: boinc/lib/Makefile.am
  parse_test_LDADD = $(LIBBOINC)
 Index: boinc/client/Makefile.am
 ===================================================================
---- boinc.orig/client/Makefile.am	2012-05-03 13:38:04.248172480 +0200
-+++ boinc/client/Makefile.am	2012-05-29 16:55:00.989851700 +0200
-@@ -85,7 +85,7 @@
+--- boinc.orig/client/Makefile.am	2012-06-30 21:59:09.960849517 +0200
++++ boinc/client/Makefile.am	2012-06-30 22:01:07.027273390 +0200
+@@ -88,7 +88,7 @@
  if OS_DARWIN
  boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
  endif
diff --git a/debian/patches/ensure_there_is_no_newline_in_passwd.patch b/debian/patches/ensure_there_is_no_newline_in_passwd.patch
new file mode 100644
index 0000000..368431e
--- /dev/null
+++ b/debian/patches/ensure_there_is_no_newline_in_passwd.patch
@@ -0,0 +1,20 @@
+Index: boinc/configure.ac
+===================================================================
+--- boinc.orig/configure.ac	2012-06-30 22:00:21.975879957 +0200
++++ boinc/configure.ac	2012-06-30 22:05:20.819855979 +0200
+@@ -894,12 +894,12 @@
+ 
+ dnl Some info about the person compiling used for making some packages.
+ LOGNAME=`${WHOAMI}`
+-FULLNAME=`grep ^${LOGNAME}: /etc/passwd | awk -F: '{print $5}'`
++FULLNAME=`grep ^${LOGNAME}: /etc/passwd | head -n 1 | awk -F: '{print $5}'`
+ if test -z "${FULLNAME}" ; then
+-  FULLNAME=`ypcat passwd 2>/dev/null | grep ^${LOGNAME}: | awk -F: '{print $5}'`
++  FULLNAME=`ypcat passwd 2>/dev/null | grep ^${LOGNAME}: | head -n 1 | awk -F: '{print $5}'`
+ fi
+ if test -z "${FULLNAME}" ; then
+-  FULLNAME=`nidump passwd / 2>/dev/null | grep ^${LOGNAME}: | awk -F: '{print $5}'`
++  FULLNAME=`nidump passwd / 2>/dev/null | grep ^${LOGNAME}: | head -n 1 | awk -F: '{print $5}'`
+ fi
+ if test -z "${FULLNAME}" ; then
+   FULLNAME=$LOGNAME
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index ab8b578..82c1e89 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,8 +1,8 @@
 Index: boinc/lib/coproc.cpp
 ===================================================================
---- boinc.orig/lib/coproc.cpp	2012-04-21 12:55:43.000000000 +0200
-+++ boinc/lib/coproc.cpp	2012-04-21 12:59:48.631727184 +0200
-@@ -448,7 +448,7 @@
+--- boinc.orig/lib/coproc.cpp	2012-06-30 21:59:10.012848816 +0200
++++ boinc/lib/coproc.cpp	2012-06-30 22:00:39.043650160 +0200
+@@ -480,7 +480,7 @@
      display_driver_version = 0;
      strcpy(prop.name, "");
      prop.deviceHandle = 0;
@@ -11,7 +11,7 @@ Index: boinc/lib/coproc.cpp
      prop.sharedMemPerBlock = 0;
      prop.regsPerBlock = 0;
      prop.warpSize = 0;
-@@ -477,7 +477,7 @@
+@@ -510,7 +510,7 @@
      while (!xp.get_tag()) {
          if (xp.match_tag("/coproc_cuda")) {
              if (!peak_flops) {
diff --git a/debian/patches/series b/debian/patches/series
index 055389d..f85daaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,4 +59,5 @@ screen_saver_boinc_extra.patch
 #socklenBuildFixByDavid.patch
 boinclib_shared.patch
 dynamic_libboinc.patch
-boinc_manager_project_info_page.patch
+#boinc_manager_project_info_page.patch
+ensure_there_is_no_newline_in_passwd.patch
diff --git a/debian/patches/unlink_undefined.patch b/debian/patches/unlink_undefined.patch
index 83407fc..2473f59 100644
--- a/debian/patches/unlink_undefined.patch
+++ b/debian/patches/unlink_undefined.patch
@@ -1,7 +1,7 @@
 Index: boinc/tools/process_input_template.cpp
 ===================================================================
---- boinc.orig/tools/process_input_template.cpp	2012-05-10 12:51:41.351949895 +0200
-+++ boinc/tools/process_input_template.cpp	2012-05-10 12:52:24.000000000 +0200
+--- boinc.orig/tools/process_input_template.cpp	2012-06-30 21:30:06.832322542 +0200
++++ boinc/tools/process_input_template.cpp	2012-06-30 22:00:54.927436303 +0200
 @@ -17,6 +17,7 @@
  
  #include <stdio.h>
@@ -12,8 +12,8 @@ Index: boinc/tools/process_input_template.cpp
  
 Index: boinc/sched/single_job_assimilator.cpp
 ===================================================================
---- boinc.orig/sched/single_job_assimilator.cpp	2012-03-31 13:44:26.867113620 +0200
-+++ boinc/sched/single_job_assimilator.cpp	2012-05-10 13:05:44.388571200 +0200
+--- boinc.orig/sched/single_job_assimilator.cpp	2012-06-30 21:30:06.792323083 +0200
++++ boinc/sched/single_job_assimilator.cpp	2012-06-30 22:00:54.931436249 +0200
 @@ -24,6 +24,7 @@
  #include <string>
  #include <cstdlib>
@@ -24,9 +24,9 @@ Index: boinc/sched/single_job_assimilator.cpp
  #include "error_numbers.h"
 Index: boinc/tools/create_work.cpp
 ===================================================================
---- boinc.orig/tools/create_work.cpp	2012-03-31 13:44:27.107110342 +0200
-+++ boinc/tools/create_work.cpp	2012-05-10 13:06:35.687877523 +0200
-@@ -26,6 +26,7 @@
+--- boinc.orig/tools/create_work.cpp	2012-06-30 21:30:06.820322705 +0200
++++ boinc/tools/create_work.cpp	2012-06-30 22:00:54.935436195 +0200
+@@ -27,6 +27,7 @@
  #include <cstring>
  #include <ctime>
  #include <string>
@@ -36,8 +36,8 @@ Index: boinc/tools/create_work.cpp
  #include "boinc_db.h"
 Index: boinc/vda/vda.cpp
 ===================================================================
---- boinc.orig/vda/vda.cpp	2012-03-31 13:47:01.892995979 +0200
-+++ boinc/vda/vda.cpp	2012-05-10 13:07:12.487379494 +0200
+--- boinc.orig/vda/vda.cpp	2012-06-30 14:43:21.007806400 +0200
++++ boinc/vda/vda.cpp	2012-06-30 22:00:54.939436141 +0200
 @@ -21,6 +21,7 @@
  // vda add path     add a file
  
@@ -48,8 +48,8 @@ Index: boinc/vda/vda.cpp
  #include "filesys.h"
 Index: boinc/vda/vdad.cpp
 ===================================================================
---- boinc.orig/vda/vdad.cpp	2012-04-19 18:05:13.228502956 +0200
-+++ boinc/vda/vdad.cpp	2012-05-10 13:09:12.785751379 +0200
+--- boinc.orig/vda/vdad.cpp	2012-06-30 14:43:21.007806400 +0200
++++ boinc/vda/vdad.cpp	2012-06-30 22:00:54.943436087 +0200
 @@ -27,6 +27,7 @@
  #include <sys/types.h>
  #include <vector>

-- 
BOINC packaging

More information about the pkg-boinc-commits mailing list