[SCM] BOINC packaging branch, backports/squeeze, updated. debian/7.0.33+dfsg-1-37-g4e715c2

[Steffen Moeller]

The following commit has been merged in the backports/squeeze branch:
commit 4e715c2160cb5ff4fc360e80e83da18b2b0a3888
Merge: 103353acb954cc99531e56e3b0ef3ef1fc57e104 4ad1ad60747183a640f62426fdb9585a6c73c19d
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Sep 2 01:10:02 2012 +0200

    Merge branch 'master' into backports/squeeze
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --combined debian/changelog
index cb5e05e,042df8f..81c6dc5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,19 +1,39 @@@
++boinc (7.0.34+dfsg-5~bpo60+1) squeeze-backports; urgency=low
++
++  * Updated upload to squeeze-backports.
++  * Corrected debian/control.in (libnotify version remains unspecified)
++
++ -- Steffen Moeller <moeller at debian.org>  Sun, 02 Sep 2012 01:07:35 +0200
++
+ boinc (7.0.34+dfsg-5) UNRELEASED; urgency=low
+ 
+   * Added better error messages for opendir() failures
+ 
 - -- Steffen Moeller <moeller at debian.org>  Sat, 01 Sep 2012 15:13:26 +0200
++ -- Steffen Moeller <moeller at debian.org>  Sat, 01 Sep 2012 20:13:26 +0200
+ 
+ boinc (7.0.34+dfsg-4) unstable; urgency=low
+ 
+   [ Guo Yixuan ]
+   * Fix of debian/patch on pathlength
+   [ Steffen Moeller ]
+   * Corrected handling of memory reallocation in client/stream.cpp
+   * Improved cpptest cleanliness
+ 
+  -- Steffen Moeller <moeller at debian.org>  Sat, 01 Sep 2012 15:13:26 +0200
+ 
 +boinc (7.0.34+dfsg-3~bpo60+1) squeeze-backports; urgency=low
 +
 +  [ Steffen Moeller ]
 +  * Initial update to backports
 +    - libnotify remains at version 0.5
 +    - removed dependency on libXss to avoid build problem, also means
 +      issue as with regular version in Squeeze to detect user activity.
 +
 +  [ Guo Yixuan ]
 +  * Removed dependency on dpkg-dev >= 1.16.1.1, disabled hardening flags.
 +
 + -- Steffen Moeller <moeller at debian.org>  Wed, 29 Aug 2012 17:26:36 +0200
 +
  boinc (7.0.34+dfsg-3) UNRELEASED; urgency=low
  
    [ Steffen Moeller ]
@@@ -19,6 -22,7 +42,7 @@@
  
    [ Guo Yixuan ]
    * Removed dependency on dh-buildinfo, no longer used.
+   * Fixed a bug in our patches that truncated filename.
  
   -- Steffen Moeller <moeller at debian.org>  Sun, 26 Aug 2012 18:20:13 +0200
  
diff --combined debian/control.in
index 54de778,0b37f4f..5fbde9c
--- a/debian/control.in
+++ b/debian/control.in
@@@ -9,12 -9,15 +9,12 @@@ Uploaders: Steffen Moeller <moeller at deb
  DM-Upload-Allowed: yes
  Standards-Version: 3.9.3
  Build-Depends: debhelper (>= 7.0.50~), po-debconf, pkg-config (>= 0.15),
   libtool, autoconf (>= 2.59), autotools-dev, automake1.9 (>= 1.9.3), gettext,
   docbook2x, docbook-xml, libxml2-utils,
   zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1),
-- libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev (>= 0.7.0),
++ libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev,
   freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
 - libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
 - libxcb-util0-dev,
 - libxss-dev
 + libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev
  Homepage: http://boinc.berkeley.edu/
  Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
  Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
diff --combined debian/patches/series
index de3dc7e,7a49d50..f085184
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,6 +1,8 @@@
  # patches to get Debian going
- #texfont_removal.patch
 -libnotify-0.7.patch
 +#libnotify-0.7.patch
  # undisputed patches above
 +#libnotify-0.7.patch
 +# undisputed for Wheezy and beyond above
  sched_driver_f_free.patch
  sched_driver_char_buffers.patch
  improve_opendir_warning.patch
@@@ -71,3 -68,5 +70,5 @@@ opendir_error_messages.patc
  more_maxpathlen.patch
  slot_dir_source_trace.patch
  ignored_return_value.patch
+ cppcheck_avoid_redundant_check.patch
+ opendir_errno.patch

-- 
BOINC packaging