diff -Nru performous-0.7.0/debian/changelog performous-0.7.0/debian/changelog --- performous-0.7.0/debian/changelog 2012-11-23 14:33:35.000000000 +0000 +++ performous-0.7.0/debian/changelog 2013-06-03 23:00:49.000000000 +0000 @@ -1,3 +1,17 @@ +performous (0.7.0-1+rpi1) jessie-staging; urgency=low + + (raspbian specific change) + * Force zlib include directory as it isn't being picked up for some reason + (changes proposed to debian) + * debian/control: Set build-depends to 1.49 explicitly due to build failure with + newer boost versions. + * debian/patches/backported_TIME_UTC_change.patch Adjust code to take account of + debian backport of TIME_UTC -> TIME_UTC_ name change. + * debian/control: Version boost build-depencies on version that introduced + the backported name change. + + -- Peter Michael Green Mon, 03 Jun 2013 20:29:42 +0000 + performous (0.7.0-1) unstable; urgency=low [ Miriam Ruiz ] diff -Nru performous-0.7.0/debian/control performous-0.7.0/debian/control --- performous-0.7.0/debian/control 2012-11-21 17:48:38.000000000 +0000 +++ performous-0.7.0/debian/control 2013-06-03 22:59:40.000000000 +0000 @@ -6,9 +6,9 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6), pkg-config, help2man, gettext, libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev, - libboost-thread-dev (>= 1.36), libboost-serialization-dev (>= 1.36), - libboost-program-options-dev (>= 1.36), libboost-regex-dev (>= 1.36), - libboost-filesystem-dev (>= 1.36), + libboost-thread1.49-dev (>= 1.49.0-4), libboost-serialization1.49-dev (>= 1.49.0-4), + libboost-program-options1.49-dev (>= 1.49.0-4), libboost-regex1.49-dev (>= 1.49.0-4), + libboost-filesystem1.49-dev (>= 1.49.0-4), libavcodec-dev, libavformat-dev, libswscale-dev, libmagick++-dev, libsamplerate0-dev, libxml++2.6-dev, libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev, diff -Nru performous-0.7.0/debian/patches/backported_TIME_UTC_change.patch performous-0.7.0/debian/patches/backported_TIME_UTC_change.patch --- performous-0.7.0/debian/patches/backported_TIME_UTC_change.patch 1970-01-01 00:00:00.000000000 +0000 +++ performous-0.7.0/debian/patches/backported_TIME_UTC_change.patch 2013-06-03 22:59:40.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Deal with backported TIME_UTC name change in debian + For compatibility with new eglibc debian has backported the TIME_UTC -> TIME_UTC_ name change. + name change to boost 1.49. So use the new name unconditionally rather than only + when building with boost 1.50+ +Author: Peter Michael Green + +--- performous-0.7.0.orig/game/xtime.hh ++++ performous-0.7.0/game/xtime.hh +@@ -21,11 +21,11 @@ namespace { + } + boost::xtime now() { + boost::xtime time; +-#if (BOOST_VERSION / 100 % 1000 >= 50) ++//#if (BOOST_VERSION / 100 % 1000 >= 50) + boost::xtime_get(&time, boost::TIME_UTC_); +-#else +- boost::xtime_get(&time, boost::TIME_UTC); +-#endif ++//#else ++// boost::xtime_get(&time, boost::TIME_UTC); ++//#endif + return time; + } + double seconds(boost::xtime const& time) { diff -Nru performous-0.7.0/debian/patches/series performous-0.7.0/debian/patches/series --- performous-0.7.0/debian/patches/series 2012-11-20 23:01:24.000000000 +0000 +++ performous-0.7.0/debian/patches/series 2013-06-03 22:59:40.000000000 +0000 @@ -2,3 +2,4 @@ boost_filesystem_v2.patch libav0.8.diff +backported_TIME_UTC_change.patch diff -Nru performous-0.7.0/debian/rules performous-0.7.0/debian/rules --- performous-0.7.0/debian/rules 2012-11-22 13:16:53.000000000 +0000 +++ performous-0.7.0/debian/rules 2013-06-03 20:43:36.000000000 +0000 @@ -3,6 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# For some unknown reason zlib's include path isn't found by this package's +# build process in raspbian jessie at the monent. Force it for now + CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) @@ -35,7 +38,8 @@ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \ -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" + -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \ + -DZ_INCLUDE_DIR:=/usr/include touch $@ build-stamp: configure-stamp