[bullet] 06/06: Rebase do-not-build-with-embedded-tinyxml-library.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository bullet.

commit 960692fddcdd7609c1a2fa22b010a6f79e1a1495
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jan 14 15:40:49 2016 +0100

    Rebase do-not-build-with-embedded-tinyxml-library.patch
---
 .../do-not-build-with-embedded-tinyxml-library.patch   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/do-not-build-with-embedded-tinyxml-library.patch b/debian/patches/do-not-build-with-embedded-tinyxml-library.patch
index 3ca4850..95d8c18 100644
--- a/debian/patches/do-not-build-with-embedded-tinyxml-library.patch
+++ b/debian/patches/do-not-build-with-embedded-tinyxml-library.patch
@@ -1,21 +1,21 @@
 From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Jan 2013 22:20:29 +0100
+Date: Thu, 14 Jan 2016 15:43:35 +0100
 Subject: do not build with embedded tinyxml library
 
 Unbundle the embedded tinyxml library. Use Debian's version instead.
 
 Forwarded: not-needed
 ---
- .../BulletXmlWorldImporter/CMakeLists.txt          |   23 ++++++++++++++------
- .../btBulletXmlWorldImporter.cpp                   |    2 +-
+ .../BulletXmlWorldImporter/CMakeLists.txt          | 23 +++++++++++++++-------
+ .../btBulletXmlWorldImporter.cpp                   |  2 +-
  2 files changed, 17 insertions(+), 8 deletions(-)
 
 diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
-index 6f311af..5f8819a 100644
+index f453421..f8a467d 100644
 --- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
 +++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
 @@ -10,19 +10,28 @@ ADD_LIBRARY(
- 	btBulletXmlWorldImporter.h 
+ 	btBulletXmlWorldImporter.h
  	string_split.cpp
  	string_split.h
 -	tinyxml.cpp
@@ -30,7 +30,7 @@ index 6f311af..5f8819a 100644
 +FIND_PATH(TINYXML_INCLUDE_DIR NAMES tinyxml.h)
 +MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
 +
-+# # Look for the library.
++# Look for the library.
 +FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml)
 +MARK_AS_ADVANCED(TINYXML_LIBRARY)
 +
@@ -45,13 +45,13 @@ index 6f311af..5f8819a 100644
  SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
  
  IF (BUILD_SHARED_LIBS)
--        TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
-+        TARGET_LINK_LIBRARIES(BulletXmlWorldImporter tinyxml BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
+-	TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
++	TARGET_LINK_LIBRARIES(BulletXmlWorldImporter tinyxml BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
  ENDIF (BUILD_SHARED_LIBS)
  
  IF (INSTALL_EXTRA_LIBS)
 diff --git a/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp b/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
-index 5419572..cabfee8 100644
+index f3615d6..06e51e5 100644
 --- a/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
 +++ b/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
 @@ -14,7 +14,7 @@ subject to the following restrictions:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/bullet.git