[bullet] 06/19: Rename and update test-InverseDynamics.patch to test-dependencies.patch
Markus Koschany
apo at moszumanska.debian.org
Mon Dec 26 22:49:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch experimental
in repository bullet.
commit ddf467581bf53c1b52373159991e9e65bf3930ff
Author: Markus Koschany <apo at debian.org>
Date: Mon Dec 26 20:00:03 2016 +0100
Rename and update test-InverseDynamics.patch to test-dependencies.patch
---
debian/patches/series | 2 +-
debian/patches/test-InverseDynamics.patch | 36 -----------------
debian/patches/test-dependencies.patch | 67 +++++++++++++++++++++++++++++++
3 files changed, 68 insertions(+), 37 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 463cb81..c9fdc0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
do-not-build-with-embedded-tinyxml-library.patch
-test-InverseDynamics.patch
+test-dependencies.patch
diff --git a/debian/patches/test-InverseDynamics.patch b/debian/patches/test-InverseDynamics.patch
deleted file mode 100644
index dbd987f..0000000
--- a/debian/patches/test-InverseDynamics.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 26 Dec 2016 19:56:19 +0100
-Subject: test InverseDynamics
-
-Update CMakelists.txt because those files have been removed from Debian's
-tarball.
-
-Forwarded: not-needed
----
- test/InverseDynamics/CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/test/InverseDynamics/CMakeLists.txt b/test/InverseDynamics/CMakeLists.txt
-index e31ea6e..ce61ad8 100644
---- a/test/InverseDynamics/CMakeLists.txt
-+++ b/test/InverseDynamics/CMakeLists.txt
-@@ -66,7 +66,6 @@ ENDIF()
- ../../examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
- ../../examples/Importers/ImportURDFDemo/URDF2Bullet.h
- ../../examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
-- ../../examples/ThirdPartyLibs/stb_image/stb_image.cpp
- ../../examples/Utils/b3Clock.cpp
- ../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
- ../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp
-@@ -82,11 +81,6 @@ ENDIF()
- ../../examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h
- ../../examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
- ../../examples/Importers/ImportColladaDemo/ColladaGraphicsInstance.h
-- ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
-- ../../examples/ThirdPartyLibs/tinyxml/tinystr.cpp
-- ../../examples/ThirdPartyLibs/tinyxml/tinyxml.cpp
-- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
-- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
-
- )
-
diff --git a/debian/patches/test-dependencies.patch b/debian/patches/test-dependencies.patch
new file mode 100644
index 0000000..6647c89
--- /dev/null
+++ b/debian/patches/test-dependencies.patch
@@ -0,0 +1,67 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 26 Dec 2016 19:56:19 +0100
+Subject: test dependencies
+
+Forwarded: not-needed
+---
+ test/InverseDynamics/CMakeLists.txt | 6 ------
+ test/SharedMemory/CMakeLists.txt | 8 --------
+ 2 files changed, 14 deletions(-)
+
+diff --git a/test/InverseDynamics/CMakeLists.txt b/test/InverseDynamics/CMakeLists.txt
+index e31ea6e..ce61ad8 100644
+--- a/test/InverseDynamics/CMakeLists.txt
++++ b/test/InverseDynamics/CMakeLists.txt
+@@ -66,7 +66,6 @@ ENDIF()
+ ../../examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
+ ../../examples/Importers/ImportURDFDemo/URDF2Bullet.h
+ ../../examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
+- ../../examples/ThirdPartyLibs/stb_image/stb_image.cpp
+ ../../examples/Utils/b3Clock.cpp
+ ../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
+ ../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp
+@@ -82,11 +81,6 @@ ENDIF()
+ ../../examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h
+ ../../examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
+ ../../examples/Importers/ImportColladaDemo/ColladaGraphicsInstance.h
+- ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinystr.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinyxml.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
+
+ )
+
+diff --git a/test/SharedMemory/CMakeLists.txt b/test/SharedMemory/CMakeLists.txt
+index 496ca50..c8bff8f 100644
+--- a/test/SharedMemory/CMakeLists.txt
++++ b/test/SharedMemory/CMakeLists.txt
+@@ -4,7 +4,6 @@ INCLUDE_DIRECTORIES(
+ ../../src
+ ../gtest-1.7.0/include
+ ../../examples
+- ../../examples/ThirdPartyLibs
+ )
+
+
+@@ -59,12 +58,6 @@ ENDIF()
+ ../../examples/TinyRenderer/tgaimage.cpp
+ ../../examples/TinyRenderer/our_gl.cpp
+ ../../examples/TinyRenderer/TinyRenderer.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinystr.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinyxml.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlerror.cpp
+- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlparser.cpp
+- ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
+- ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h
+ ../../examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
+ ../../examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp
+ ../../examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp
+@@ -74,7 +67,6 @@ ENDIF()
+ ../../examples/Importers/ImportURDFDemo/UrdfParser.cpp
+ ../../examples/Importers/ImportURDFDemo/urdfStringSplit.cpp
+ ../../examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
+- ../../examples/ThirdPartyLibs/stb_image/stb_image.cpp
+
+ )
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/bullet.git
More information about the Pkg-games-commits
mailing list