diffstat for xboxdrv-0.8.5 xboxdrv-0.8.5

 changelog                             |    7 +++++++
 control                               |    3 ++-
 patches/fix-build-flags-parsing.patch |   34 ++++++++++++++++++++++++++++++++++
 patches/series                        |    1 +
 4 files changed, 44 insertions(+), 1 deletion(-)

diff -Nru xboxdrv-0.8.5/debian/changelog xboxdrv-0.8.5/debian/changelog
--- xboxdrv-0.8.5/debian/changelog	2013-05-05 10:18:08.000000000 +0000
+++ xboxdrv-0.8.5/debian/changelog	2016-04-13 04:45:47.000000000 +0000
@@ -1,3 +1,10 @@
+xboxdrv (0.8.5-1ubuntu1) xenial; urgency=medium
+
+  * debian/patches/fix-build-flags-parsing.patch: Grab patch from Debian Git
+    to fix FTBFS with *FLAGS environment variables containing >1 flags.
+
+ -- Logan Rosen <logan@ubuntu.com>  Wed, 13 Apr 2016 04:45:22 +0000
+
 xboxdrv (0.8.5-1) unstable; urgency=low
 
   * New upstream version
diff -Nru xboxdrv-0.8.5/debian/control xboxdrv-0.8.5/debian/control
--- xboxdrv-0.8.5/debian/control	2013-05-05 10:18:08.000000000 +0000
+++ xboxdrv-0.8.5/debian/control	2016-04-13 04:45:50.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xboxdrv
 Section: utils
 Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Andrey Rahmatullin <wrar@wrar.name>
 Build-Depends: debhelper (>= 9), scons, libusb-1.0-0-dev, libx11-dev,
  libboost-dev, libdbus-glib-1-dev, libudev-dev
diff -Nru xboxdrv-0.8.5/debian/patches/fix-build-flags-parsing.patch xboxdrv-0.8.5/debian/patches/fix-build-flags-parsing.patch
--- xboxdrv-0.8.5/debian/patches/fix-build-flags-parsing.patch	1970-01-01 00:00:00.000000000 +0000
+++ xboxdrv-0.8.5/debian/patches/fix-build-flags-parsing.patch	2016-04-13 04:44:46.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Fix handling *FLAGS environment variables containing >1 flags
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Forwarded: no
+Last-Update: 2016-02-13
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -4,6 +4,8 @@
+ import subprocess
+ import string
+ import re
++
++import SCons
+ 
+ def build_dbus_glue(target, source, env):
+     """
+@@ -76,13 +78,13 @@
+ opts = Variables(['custom.py'], ARGUMENTS)
+ 
+ opts.Add('CPPPATH', 'Additional preprocessor paths')
+-opts.Add('CPPFLAGS', 'Additional preprocessor flags')
++opts.Add('CPPFLAGS', 'Additional preprocessor flags', converter=SCons.Util.CLVar)
+ opts.Add('CPPDEFINES', 'defined constants')
+ opts.Add('LIBPATH', 'Additional library paths')
+ opts.Add('LIBS', 'Additional libraries')
+-opts.Add('CCFLAGS', 'C Compiler flags')
+-opts.Add('CXXFLAGS', 'C++ Compiler flags')
+-opts.Add('LINKFLAGS', 'Linker Compiler flags')
++opts.Add('CCFLAGS', 'C Compiler flags', converter=SCons.Util.CLVar)
++opts.Add('CXXFLAGS', 'C++ Compiler flags', converter=SCons.Util.CLVar)
++opts.Add('LINKFLAGS', 'Linker Compiler flags', converter=SCons.Util.CLVar)
+ opts.Add('CC', 'C Compiler')
+ opts.Add('CXX', 'C++ Compiler')
+ opts.Add('BUILD', 'Build type: release, custom, development')
diff -Nru xboxdrv-0.8.5/debian/patches/series xboxdrv-0.8.5/debian/patches/series
--- xboxdrv-0.8.5/debian/patches/series	2013-05-05 10:18:08.000000000 +0000
+++ xboxdrv-0.8.5/debian/patches/series	2016-04-13 04:42:55.000000000 +0000
@@ -1 +1,2 @@
 fix-xboxdrv-manpage.patch
+fix-build-flags-parsing.patch