[bullet] 12/19: Simplify the packaging by using libbullet2.85 for the installation of all core Bullet2 and Bullet3

Markus Koschany apo at moszumanska.debian.org
Mon Dec 26 22:49:22 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 b3b188406bab55474ad659dc4a57413daac3fd6b
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 26 21:37:05 2016 +0100

    Simplify the packaging by using libbullet2.85 for the installation of all core Bullet2 and Bullet3
    
    libraries and libbullet-extras2.85 for all extra libraries.
---
 debian/control                               | 241 ++-------------------------
 debian/libbullet-dev.install                 |   1 +
 debian/libbullet-extras-dev.install          |   1 +
 debian/libbullet-extras2.85.install          |  10 ++
 debian/libbullet2.85.install                 |   9 +
 debian/libbulletcollision2.85.install        |   2 -
 debian/libbulletdynamics2.85.install         |   2 -
 debian/libbulletfileloader2.85.install       |   1 -
 debian/libbulletsoftbody2.85.install         |   1 -
 debian/libbulletworldimporter2.85.install    |   1 -
 debian/libbulletxmlworldimporter2.85.install |   1 -
 debian/libconvexdecomposition2.85.install    |   1 -
 debian/libgimpactutils2.85.install           |   1 -
 debian/libhacd2.85.install                   |   1 -
 debian/liblinearmath2.85.install             |   1 -
 15 files changed, 31 insertions(+), 243 deletions(-)

diff --git a/debian/control b/debian/control
index c2de50f..f9905f2 100644
--- a/debian/control
+++ b/debian/control
@@ -20,246 +20,33 @@ Homepage: http://www.bulletphysics.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/bullet.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/bullet.git
 
-Package: libbulletsoftbody2.85
+Package: libbullet2.85
 Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Breaks:
- libbulletsoftbody2.83,
- libbulletsoftbody2.83.6,
- libbulletsoftbody2.83v5
-Replaces:
- libbulletsoftbody2.83,
- libbulletsoftbody2.83.6,
- libbulletsoftbody2.83v5
-Description: professional 3D Game Multiphysics Library -- soft body
+Description: professional 3D Game Multiphysics Library
  Bullet professional 3D Game Multiphysics Library provides state of the art
  collision detection, soft body and rigid body dynamics.
  .
- This package contains the BulletSoftbody shared library.
- .
- It features soft body dynamics for cloth, rope and deformable volumes with
- two-way interaction with rigid bodies, including constraint support.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libbulletcollision2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libbulletcollision2.83,
- libbulletcollision2.83.6,
- libbulletcollision2.83v5
-Replaces:
- libbulletcollision2.83,
- libbulletcollision2.83.6,
- libbulletcollision2.83v5
-Description: professional 3D Game Multiphysics Library -- collision
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the BulletCollision shared library.
- .
- It features discrete and continuous collision detection including ray and
- convex sweep test. Collision shapes include concave and convex meshes and all
- basic primitives.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libbulletdynamics2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libbulletdynamics2.83,
- libbulletdynamics2.83.6,
- libbulletdynamics2.83v5
-Replaces:
- libbulletdynamics2.83,
- libbulletdynamics2.83.6,
- libbulletdynamics2.83v5
-Description: professional 3D Game Multiphysics Library -- dynamics
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the BulletDynamics shared library.
- .
- It features fast and stable rigid body dynamics constraint solver, vehicle
- dynamics, character controller and slider, hinge, generic 6DOF and cone twist
- constraint for ragdolls.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: liblinearmath2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- liblinearmath2.83,
- liblinearmath2.83.6,
- liblinearmath2.83v5
-Replaces:
- liblinearmath2.83,
- liblinearmath2.83.6,
- liblinearmath2.83v5
-Description: professional 3D Game Multiphysics Library -- mathematics
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the LinearMath shared library which is required by most
- other Bullet libraries and provides basic data types and memory management.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libhacd2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libhacd2.83,
- libhacd2.83.6,
- libhacd2.83v5
-Replaces:
- libhacd2.83,
- libhacd2.83.6,
- libhacd2.83v5
-Description: professional 3D Game Multiphysics Library -- HACD
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the HACD shared library. HACD stands for Hierarchical
- Approximate Convex Decomposition and provides a sophisticated algorithm that
- can, in a CPU efficient way, compute a faithful approximation of the original
- mesh.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libconvexdecomposition2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libconvexdecomposition2.83,
- libconvexdecomposition2.83.6,
- libconvexdecomposition2.83v5
-Replaces:
- libconvexdecomposition2.83,
- libconvexdecomposition2.83.6,
- libconvexdecomposition2.83v5
-Description: professional 3D Game Multiphysics Library -- convex decomposition
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the ConvexDecomposition shared library. Convex
- decomposition can be used to decompose a concave mesh into several convex
- parts and then combine them into a new composite object.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libbulletfileloader2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libbulletfileloader2.83,
- libbulletfileloader2.83.6,
- libbulletfileloader2.83v5
-Replaces:
- libbulletfileloader2.83,
- libbulletfileloader2.83.6,
- libbulletfileloader2.83v5
-Description: professional 3D Game Multiphysics Library -- file loader
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the BulletFileLoader shared library.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libbulletworldimporter2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libbulletworldimporter2.83,
- libbulletworldimporter2.83.6,
- libbulletworldimporter2.83v5
-Replaces:
- libbulletworldimporter2.83,
- libbulletworldimporter2.83.6,
- libbulletworldimporter2.83v5
-Description: professional 3D Game Multiphysics Library -- world importer
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the BulletWorldImporter shared library which can be
- used by Blender and other software to export or import the Bullet physics
- file format.
- .
- For more information about Bullet, please refer to the libbullet-dev package.
-
-Package: libbulletxmlworldimporter2.85
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Breaks:
- libbulletxmlworldimporter2.83,
- libbulletxmlworldimporter2.83.6,
- libbulletxmlworldimporter2.83v5
-Replaces:
- libbulletxmlworldimporter2.83,
- libbulletxmlworldimporter2.83.6,
- libbulletxmlworldimporter2.83v5
-Description: professional 3D Game Multiphysics Library -- xml world importer
- Bullet professional 3D Game Multiphysics Library provides state of the art
- collision detection, soft body and rigid body dynamics.
- .
- This package contains the BulletXmlWorldImporter shared library which can be
- used by Blender and other software to export or import the Bullet physics file
- format.
+ This package contains shared runtime libraries including BulletCollision,
+ BulletDynamics, BulletSoftbody, LinearMath and all Bullet 3 libraries.
  .
  For more information about Bullet, please refer to the libbullet-dev package.
 
-Package: libgimpactutils2.85
+Package: libbullet-extras2.85
 Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Breaks:
- libgimpactutils2.83,
- libgimpactutils2.83.6,
- libgimpactutils2.83v5
-Replaces:
- libgimpactutils2.83,
- libgimpactutils2.83.6,
- libgimpactutils2.83v5
-Description: professional 3D Game Multiphysics Library -- GIMPACT
+Description: professional 3D Game Multiphysics Library -- extra libraries
  Bullet professional 3D Game Multiphysics Library provides state of the art
  collision detection, soft body and rigid body dynamics.
  .
- This package contains the GIMPACT shared library. GIMPACT is a software
- library with tools for geometry processing and collision detection, focused on
- solving most common problems on Virtual Reality development.
+ This package contains all extra shared runtime libraries for Bullet including
+ HACD, GIMPACTUtils, InverseDynamics, Serialize, ConvexDecomposition and VHACD.
  .
  For more information about Bullet, please refer to the libbullet-dev package.
 
@@ -268,10 +55,7 @@ Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends:
- libbulletcollision2.85 (= ${binary:Version}),
- libbulletdynamics2.85 (= ${binary:Version}),
- libbulletsoftbody2.85 (= ${binary:Version}),
- liblinearmath2.85 (= ${binary:Version}),
+ libbullet2.85 (= ${binary:Version}),
  ${misc:Depends}
 Description: professional 3D Game Multiphysics Library -- development files
  Bullet professional 3D Game Multiphysics Library provides state of the art
@@ -305,12 +89,7 @@ Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends:
- libbulletfileloader2.85 (= ${binary:Version}),
- libbulletworldimporter2.85 (= ${binary:Version}),
- libbulletxmlworldimporter2.85 (= ${binary:Version}),
- libconvexdecomposition2.85 (= ${binary:Version}),
- libgimpactutils2.85 (= ${binary:Version}),
- libhacd2.85 (= ${binary:Version}),
+ libbullet-extras2.85 (= ${binary:Version}),
  ${misc:Depends}
 Description: professional 3D Game Multiphysics Library -- extra development
  Bullet professional 3D Game Multiphysics Library provides state of the art
diff --git a/debian/libbullet-dev.install b/debian/libbullet-dev.install
index a069359..87077e7 100644
--- a/debian/libbullet-dev.install
+++ b/debian/libbullet-dev.install
@@ -11,3 +11,4 @@ usr/lib/*/libBullet3Common.so
 usr/lib/*/libBulletInverseDynamics.so
 usr/lib/*/libBulletInverseDynamicsUtils.so
 usr/lib/*/pkgconfig
+usr/lib/*/cmake/bullet/*
diff --git a/debian/libbullet-extras-dev.install b/debian/libbullet-extras-dev.install
index 19a03a5..fd7c3ca 100644
--- a/debian/libbullet-extras-dev.install
+++ b/debian/libbullet-extras-dev.install
@@ -4,6 +4,7 @@ usr/include/bullet/BulletXmlWorldImporter/*
 usr/include/bullet/ConvexDecomposition/*
 usr/include/bullet/GIMPACTUtils/*
 usr/include/bullet/HACD/*
+usr/lib/*/libBullet2FileLoader.so
 usr/lib/*/libBulletFileLoader.so
 usr/lib/*/libBulletWorldImporter.so
 usr/lib/*/libBulletXmlWorldImporter.so
diff --git a/debian/libbullet-extras2.85.install b/debian/libbullet-extras2.85.install
new file mode 100644
index 0000000..2332d52
--- /dev/null
+++ b/debian/libbullet-extras2.85.install
@@ -0,0 +1,10 @@
+usr/lib/*/libBullet2FileLoader.so.*
+usr/lib/*/libBulletFileLoader.so.*
+usr/lib/*/libBulletXmlWorldImporter.so.*
+usr/lib/*/libBulletWorldImporter.so.*
+usr/lib/*/libConvexDecomposition.so.*
+usr/lib/*/libGIMPACTUtils.so.*
+usr/lib/*/libHACD.so.*
+usr/lib/*/libBulletInverseDynamicsUtils.so.*
+usr/lib/*/libBulletInverseDynamics.so.*
+
diff --git a/debian/libbullet2.85.install b/debian/libbullet2.85.install
new file mode 100644
index 0000000..ba6ca27
--- /dev/null
+++ b/debian/libbullet2.85.install
@@ -0,0 +1,9 @@
+usr/lib/*/libBulletCollision.so.*
+usr/lib/*/libBullet3Collision.so.*
+usr/lib/*/libBulletDynamics.so.*
+usr/lib/*/libBullet3Dynamics.so.*
+usr/lib/*/libBulletSoftBody.so.*
+usr/lib/*/libLinearMath.so.*
+usr/lib/*/libBullet3Common.so.*
+usr/lib/*/libBullet3Geometry.so.*
+usr/lib/*/libBullet3OpenCL_clew.so.*
diff --git a/debian/libbulletcollision2.85.install b/debian/libbulletcollision2.85.install
deleted file mode 100644
index 188909f..0000000
--- a/debian/libbulletcollision2.85.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libBulletCollision.so.*
-usr/lib/*/libBullet3Collision.so.*
diff --git a/debian/libbulletdynamics2.85.install b/debian/libbulletdynamics2.85.install
deleted file mode 100644
index 3eff0e7..0000000
--- a/debian/libbulletdynamics2.85.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libBulletDynamics.so.*
-usr/lib/*/libBullet3Dynamics.so.*
diff --git a/debian/libbulletfileloader2.85.install b/debian/libbulletfileloader2.85.install
deleted file mode 100644
index 3c3fcac..0000000
--- a/debian/libbulletfileloader2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libBullet2FileLoader.so.*
diff --git a/debian/libbulletsoftbody2.85.install b/debian/libbulletsoftbody2.85.install
deleted file mode 100644
index 7fdd950..0000000
--- a/debian/libbulletsoftbody2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libBulletSoftBody.so.*
diff --git a/debian/libbulletworldimporter2.85.install b/debian/libbulletworldimporter2.85.install
deleted file mode 100644
index 7d56bec..0000000
--- a/debian/libbulletworldimporter2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libBulletWorldImporter.so.*
diff --git a/debian/libbulletxmlworldimporter2.85.install b/debian/libbulletxmlworldimporter2.85.install
deleted file mode 100644
index bee02af..0000000
--- a/debian/libbulletxmlworldimporter2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libBulletXmlWorldImporter.so.*
diff --git a/debian/libconvexdecomposition2.85.install b/debian/libconvexdecomposition2.85.install
deleted file mode 100644
index dbbad4e..0000000
--- a/debian/libconvexdecomposition2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libConvexDecomposition.so.*
diff --git a/debian/libgimpactutils2.85.install b/debian/libgimpactutils2.85.install
deleted file mode 100644
index 49fc84e..0000000
--- a/debian/libgimpactutils2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libGIMPACTUtils.so.*
diff --git a/debian/libhacd2.85.install b/debian/libhacd2.85.install
deleted file mode 100644
index 20caba7..0000000
--- a/debian/libhacd2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libHACD.so.*
diff --git a/debian/liblinearmath2.85.install b/debian/liblinearmath2.85.install
deleted file mode 100644
index d66b6fc..0000000
--- a/debian/liblinearmath2.85.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libLinearMath.so.*

-- 
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