[bullet] 02/20: Apply patch from Bret Curtis
Markus Koschany
apo-guest at moszumanska.debian.org
Fri May 8 23:13:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository bullet.
commit c2cc626c83416ec55a7d5bd3db94d0e223be77b3
Author: Markus Koschany <apo at gambaru.de>
Date: Wed May 6 13:31:53 2015 +0200
Apply patch from Bret Curtis
---
debian/changelog | 6 ++
debian/control | 64 ++++++++--------
...o-not-build-with-embedded-tinyxml-library.patch | 86 +++++++++++-----------
debian/rules | 6 +-
debian/watch | 4 +-
5 files changed, 86 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6dfe1a2..a4658ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bullet (2.83-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Bret Curtis <psi29a at gmail.com> Tue, 05 May 2015 08:29:21 +0100
+
bullet (2.82-r2704+dfsg-2) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 23fe165..f9a8381 100644
--- a/debian/control
+++ b/debian/control
@@ -15,12 +15,12 @@ Build-Depends-Indep:
graphviz,
rdfind,
symlinks
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.bulletphysics.org/
Vcs-Git: git://anonscm.debian.org/pkg-games/bullet.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/bullet.git
-Package: libbulletsoftbody2.82
+Package: libbulletsoftbody2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -39,7 +39,7 @@ Description: professional 3D Game Multiphysics Library -- soft body
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libbulletcollision2.82
+Package: libbulletcollision2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -59,7 +59,7 @@ Description: professional 3D Game Multiphysics Library -- collision
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libbulletdynamics2.82
+Package: libbulletdynamics2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -79,7 +79,7 @@ Description: professional 3D Game Multiphysics Library -- dynamics
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: liblinearmath2.82
+Package: liblinearmath2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -96,7 +96,7 @@ Description: professional 3D Game Multiphysics Library -- mathematics
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libhacd2.82
+Package: libhacd2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -115,7 +115,7 @@ Description: professional 3D Game Multiphysics Library -- HACD
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libconvexdecomposition2.82
+Package: libconvexdecomposition2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -133,7 +133,7 @@ Description: professional 3D Game Multiphysics Library -- convex decomposition
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libbulletfileloader2.82
+Package: libbulletfileloader2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -149,7 +149,7 @@ Description: professional 3D Game Multiphysics Library -- file loader
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libbulletworldimporter2.82
+Package: libbulletworldimporter2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -167,7 +167,7 @@ Description: professional 3D Game Multiphysics Library -- world importer
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libbulletxmlworldimporter2.82
+Package: libbulletxmlworldimporter2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -185,7 +185,7 @@ Description: professional 3D Game Multiphysics Library -- xml world importer
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libgimpactutils2.82
+Package: libgimpactutils2.83
Architecture: any
Multi-Arch: same
Pre-Depends:
@@ -208,10 +208,10 @@ Architecture: any
Section: libdevel
Multi-Arch: same
Depends:
- libbulletcollision2.82 (= ${binary:Version}),
- libbulletdynamics2.82 (= ${binary:Version}),
- libbulletsoftbody2.82 (= ${binary:Version}),
- liblinearmath2.82 (= ${binary:Version}),
+ libbulletcollision2.83 (= ${binary:Version}),
+ libbulletdynamics2.83 (= ${binary:Version}),
+ libbulletsoftbody2.83 (= ${binary:Version}),
+ liblinearmath2.83 (= ${binary:Version}),
${misc:Depends}
Description: professional 3D Game Multiphysics Library -- development files
Bullet professional 3D Game Multiphysics Library provides state of the art
@@ -245,12 +245,12 @@ Architecture: any
Section: libdevel
Multi-Arch: same
Depends:
- libbulletfileloader2.82 (= ${binary:Version}),
- libbulletworldimporter2.82 (= ${binary:Version}),
- libbulletxmlworldimporter2.82 (= ${binary:Version}),
- libconvexdecomposition2.82 (= ${binary:Version}),
- libgimpactutils2.82 (= ${binary:Version}),
- libhacd2.82 (= ${binary:Version}),
+ libbulletfileloader2.83 (= ${binary:Version}),
+ libbulletworldimporter2.83 (= ${binary:Version}),
+ libbulletxmlworldimporter2.83 (= ${binary:Version}),
+ libconvexdecomposition2.83 (= ${binary:Version}),
+ libgimpactutils2.83 (= ${binary:Version}),
+ libhacd2.83 (= ${binary:Version}),
${misc:Depends}
Description: professional 3D Game Multiphysics Library -- extra development
Bullet professional 3D Game Multiphysics Library provides state of the art
@@ -260,22 +260,22 @@ Description: professional 3D Game Multiphysics Library -- extra development
.
For more information about Bullet, please refer to the libbullet-dev package.
-Package: libbullet2.82-dbg
+Package: libbullet2.83-dbg
Priority: extra
Section: debug
Architecture: any
Multi-Arch: same
Depends:
- libbulletcollision2.82 (= ${binary:Version}),
- libbulletdynamics2.82 (= ${binary:Version}),
- libbulletfileloader2.82 (= ${binary:Version}),
- libbulletsoftbody2.82 (= ${binary:Version}),
- libbulletworldimporter2.82 (= ${binary:Version}),
- libbulletxmlworldimporter2.82 (= ${binary:Version}),
- libconvexdecomposition2.82 (= ${binary:Version}),
- libgimpactutils2.82 (= ${binary:Version}),
- libhacd2.82 (= ${binary:Version}),
- liblinearmath2.82 (= ${binary:Version}),
+ libbulletcollision2.83 (= ${binary:Version}),
+ libbulletdynamics2.83 (= ${binary:Version}),
+ libbulletfileloader2.83 (= ${binary:Version}),
+ libbulletsoftbody2.83 (= ${binary:Version}),
+ libbulletworldimporter2.83 (= ${binary:Version}),
+ libbulletxmlworldimporter2.83 (= ${binary:Version}),
+ libconvexdecomposition2.83 (= ${binary:Version}),
+ libgimpactutils2.83 (= ${binary:Version}),
+ libhacd2.83 (= ${binary:Version}),
+ liblinearmath2.83 (= ${binary:Version}),
${misc:Depends}
Description: professional 3D Game Multiphysics Library -- debugging symbols
Bullet professional 3D Game Multiphysics Library provides state of the art
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 11c01e9..4d19aee 100644
--- a/debian/patches/do-not-build-with-embedded-tinyxml-library.patch
+++ b/debian/patches/do-not-build-with-embedded-tinyxml-library.patch
@@ -12,51 +12,51 @@ index 6f311af..5f8819a 100644
--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
+++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
@@ -10,19 +10,28 @@ ADD_LIBRARY(
- btBulletXmlWorldImporter.h
- string_split.cpp
- string_split.h
-- tinyxml.cpp
-- tinyxml.h
-- tinystr.cpp
-- tinystr.h
-- tinyxmlerror.cpp
-- tinyxmlparser.cpp
- )
-
-+# Look for the header file.
-+FIND_PATH(TINYXML_INCLUDE_DIR NAMES tinyxml.h)
-+MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
-+
-+# # Look for the library.
-+FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml)
-+MARK_AS_ADVANCED(TINYXML_LIBRARY)
-+
-+# all listed variables are TRUE
-+INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXML DEFAULT_MSG TINYXML_LIBRARY TINYXML_INCLUDE_DIR)
-+
-+SET(TINYXML_LIBRARIES ${TINYXML_LIBRARY})
-+SET(TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR})
-+
- SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
- 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)
- ENDIF (BUILD_SHARED_LIBS)
-
- IF (INSTALL_EXTRA_LIBS)
+ btBulletXmlWorldImporter.h
+ string_split.cpp
+ string_split.h
+- tinyxml.cpp
+- tinyxml.h
+- tinystr.cpp
+- tinystr.h
+- tinyxmlerror.cpp
+- tinyxmlparser.cpp
+ )
+
++# Look for the header file.
++FIND_PATH(TINYXML_INCLUDE_DIR NAMES tinyxml.h)
++MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
++
++# # Look for the library.
++FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml)
++MARK_AS_ADVANCED(TINYXML_LIBRARY)
++
++# all listed variables are TRUE
++INCLUDE(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXML DEFAULT_MSG TINYXML_LIBRARY TINYXML_INCLUDE_DIR)
++
++SET(TINYXML_LIBRARIES ${TINYXML_LIBRARY})
++SET(TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR})
++
+ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
+ 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)
+ 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
--- a/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
+++ b/Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
@@ -14,7 +14,7 @@ subject to the following restrictions:
- */
-
- #include "btBulletXmlWorldImporter.h"
--#include "tinyxml.h"
-+#include <tinyxml.h>
- #include "btBulletDynamicsCommon.h"
- #include "string_split.h"
-
+ */
+
+ #include "btBulletXmlWorldImporter.h"
+-#include "tinyxml.h"
++#include <tinyxml.h>
+ #include "btBulletDynamicsCommon.h"
+ #include "string_split.h"
+
diff --git a/debian/rules b/debian/rules
index bddffff..bc2f4ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DTYPE := +dfsg
PKG := bullet
VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*(\d[\d\.]*(?:-r(?:ev)?\d+))}')
-VERSION=2.82
+VERSION=2.83
%:
dh $@ --parallel --buildsystem=cmake
@@ -15,7 +15,9 @@ override_dh_auto_configure:
dh_auto_configure -- \
-DBUILD_SHARED_LIBS=on \
-DBUILD_EXTRAS=on \
- -DBUILD_DEMOS=off \
+ -DBUILD_BULLET2_DEMOS=off \
+ -DBUILD_OPENGL3_DEMOS=off \
+ -DBUILD_CPU_DEMOS=off \
-DINSTALL_LIBS=on \
-DINSTALL_EXTRA_LIBS=on \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
diff --git a/debian/watch b/debian/watch
index 8c8d9ae..2632b95 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
version=3
-opts=dversionmangle=s/[\.\+]dfsg\.?\d*$// \
- http://code.google.com/p/bullet/downloads/list?can=1 \
- .*/bullet-(\d[\d\.]*(?:-r(?:ev)?\d+)?)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://github.com/bulletphysics/bullet3/releases .*archive/([0-9\.]*).tar.gz
--
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