diff -Nru player-3.0.2+dfsg/debian/changelog player-3.0.2+dfsg/debian/changelog --- player-3.0.2+dfsg/debian/changelog 2013-09-06 06:14:40.000000000 +0000 +++ player-3.0.2+dfsg/debian/changelog 2014-03-19 01:31:42.000000000 +0000 @@ -1,3 +1,10 @@ +player (3.0.2+dfsg-4.1+rpi1) jessie-staging; urgency=medium + + * Fix for API changes of libstatgrab version 0.90 (Closes: #735572) + - Update build dependency accordingly to "libstatgrab-dev (>= 0.90)" + + -- Peter Michael Green Wed, 19 Mar 2014 01:30:56 +0000 + player (3.0.2+dfsg-4.1) unstable; urgency=low * Non-maintainer upload. diff -Nru player-3.0.2+dfsg/debian/control player-3.0.2+dfsg/debian/control --- player-3.0.2+dfsg/debian/control 2012-03-25 23:17:30.000000000 +0000 +++ player-3.0.2+dfsg/debian/control 2014-03-19 01:32:07.000000000 +0000 @@ -2,7 +2,7 @@ Section: science Priority: extra Maintainer: Michael Janssen -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgsl0-dev, libcv-dev, libhighgui-dev, libcvaux-dev, libgtk2.0-dev, libdc1394-22-dev, libboost-signals-dev, libboost-thread-dev, swig, libjpeg-dev, python-support, doxygen, linux-libc-dev | linux-kernel-headers, libgnomecanvas2-dev, python-dev, freeglut3-dev, graphviz, ruby, ruby-dev, libtheora-dev, libgeos-dev, libpqxx3-dev, libxmu-dev, libcvaux-dev, libasound2-dev, libstatgrab-dev, cmake, libusb-dev, libv4l-dev +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgsl0-dev, libcv-dev, libhighgui-dev, libcvaux-dev, libgtk2.0-dev, libdc1394-22-dev, libboost-signals-dev, libboost-thread-dev, swig, libjpeg-dev, python-support, doxygen, linux-libc-dev | linux-kernel-headers, libgnomecanvas2-dev, python-dev, freeglut3-dev, graphviz, ruby, ruby-dev, libtheora-dev, libgeos-dev, libpqxx3-dev, libxmu-dev, libcvaux-dev, libasound2-dev, libstatgrab-dev (>= 0.90), cmake, libusb-dev, libv4l-dev XS-Python-Version: all Standards-Version: 3.9.3 Homepage: http://playerstage.sourceforge.net/ diff -Nru player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch --- player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch 1970-01-01 00:00:00.000000000 +0000 +++ player-3.0.2+dfsg/debian/patches/0010-fix-ftbfs-libstatgrab0.90.patch 2014-03-19 01:38:42.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Fix for API changes of libstatgrab version 0.90 +Author: Peter Michael Green +Bug-Debian: http://bugs.debian.org/735572 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- player-3.0.2+dfsg.orig/server/drivers/health/statgrab/statgrab_health.cpp ++++ player-3.0.2+dfsg/server/drivers/health/statgrab/statgrab_health.cpp +@@ -130,7 +130,7 @@ StatGrabDriver::StatGrabDriver(ConfigFil + int StatGrabDriver::MainSetup() + { + // Initialise statgrab +- sg_init(); ++ sg_init(1); + /* Drop setuid/setgid privileges. */ + if (sg_drop_privileges() != 0) + { +@@ -171,7 +171,7 @@ void StatGrabDriver::RefreshData() + //double receivedCpu; + float cpuIdle, cpuServer, cpuUser ; + //CPU +- cpu_percent = sg_get_cpu_percents(); ++ cpu_percent = sg_get_cpu_percents(NULL); + + cpuIdle = cpu_percent->idle; + mHealth.cpu_usage.idle = cpuIdle; +@@ -183,8 +183,8 @@ void StatGrabDriver::RefreshData() + + + //Virtual Memory +- mem_data = sg_get_mem_stats(); +- swap_stats = sg_get_swap_stats(); ++ mem_data = sg_get_mem_stats(NULL); ++ swap_stats = sg_get_swap_stats(NULL); + + mHealth.mem.total = mem_data->total; + mHealth.mem.used = mem_data->used; diff -Nru player-3.0.2+dfsg/debian/patches/series player-3.0.2+dfsg/debian/patches/series --- player-3.0.2+dfsg/debian/patches/series 2013-09-06 06:15:16.000000000 +0000 +++ player-3.0.2+dfsg/debian/patches/series 2014-03-19 01:38:10.000000000 +0000 @@ -8,3 +8,4 @@ 0008-Update-for-new-libgeos-FTBFS.patch 0009-Fix-zlib-1.2.6-FTBFS.patch boost1.54 +0010-fix-ftbfs-libstatgrab0.90.patch