r13361 - in packages/trunk/bullet/debian: . source

Paul Wise pabs at alioth.debian.org
Mon Mar 5 09:50:57 UTC 2012 

Author: pabs
Date: 2012-03-05 09:50:56 +0000 (Mon, 05 Mar 2012)
New Revision: 13361

Added:
   packages/trunk/bullet/debian/source/
   packages/trunk/bullet/debian/source/format
Modified:
   packages/trunk/bullet/debian/changelog
   packages/trunk/bullet/debian/compat
   packages/trunk/bullet/debian/control
   packages/trunk/bullet/debian/copyright
   packages/trunk/bullet/debian/libbullet-dev.install
   packages/trunk/bullet/debian/libbullet2.install
   packages/trunk/bullet/debian/rules
   packages/trunk/bullet/debian/watch
Log:
update

Modified: packages/trunk/bullet/debian/changelog
===================================================================
--- packages/trunk/bullet/debian/changelog	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/changelog	2012-03-05 09:50:56 UTC (rev 13361)
@@ -1,5 +1,8 @@
-bullet (2.73-sp1.dfsg-1) UNRELEASED; urgency=low
+bullet (2.80-rev2526+dfsg1-1) UNRELEASED; urgency=low
 
+  * DO NOT UPLOAD:
+    - upstream doesn't care about shared libraries, needs Debian-specific SONAMEs
+    - upstream breaks the physics model often
   * Initial release, thanks Wen-Yen Chuang (Closes: #476284)
   * DFSG: drop the Externals directory
 

Modified: packages/trunk/bullet/debian/compat
===================================================================
--- packages/trunk/bullet/debian/compat	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/compat	2012-03-05 09:50:56 UTC (rev 13361)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/bullet/debian/control
===================================================================
--- packages/trunk/bullet/debian/control	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/control	2012-03-05 09:50:56 UTC (rev 13361)
@@ -5,21 +5,23 @@
 Uploaders:
 Build-Depends:
  cmake,
- debhelper (>= 7),
+ debhelper (>= 9),
  freeglut3-dev,
  libglui-dev,
- libglut3-dev,
- quilt,
  zlib1g-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
 Homepage: http://www.bulletphysics.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bullet/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bullet/?op=log
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/bullet/
 
 Package: libbullet2
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: a 3D physics library - development files
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: 3D physics library - shared library
  Bullet is a professional open source multi-threaded 3D Collision Detection and
  Rigid Body Dynamics Library.
  .
@@ -33,8 +35,12 @@
 
 Package: libbullet-dev
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: a 3D physics library - development files
+Multi-Arch: same
+Depends:
+ libbullet2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: 3D physics library - development files
  Bullet is a professional open source multi-threaded 3D Collision Detection and
  Rigid Body Dynamics Library.
  .
@@ -45,3 +51,23 @@
  file format.
  .
  This package provides development files.
+
+Package: libbullet-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends:
+ libbullet2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: 3D physics library - debug files
+ Bullet is a professional open source multi-threaded 3D Collision Detection and
+ Rigid Body Dynamics Library.
+ .
+ The library is being used by several professional game developers on PC,
+ PlayStation 3, XBox 360 and Nintendo Wii.
+ .
+ Bullet is native part of Blender 3D modeler and it supports COLLADA Physics
+ file format.
+ .
+ This package provides debug files.

Modified: packages/trunk/bullet/debian/copyright
===================================================================
--- packages/trunk/bullet/debian/copyright	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/copyright	2012-03-05 09:50:56 UTC (rev 13361)
@@ -5,7 +5,7 @@
 
 Upstream Author: Erwin Coumans
 
-Copyright: 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright: 2003-2008 Erwin Coumans  http://bulletphysics.org/
 
 License:
     This software is provided 'as-is', without any express or implied warranty.
@@ -24,4 +24,4 @@
     3. This notice may not be removed or altered from any source distribution.
 
     Free for commercial use, but please mail bullet at erwincoumans.com to report
-    projects, and join the forum at www.continuousphysics.com/Bullet/phpBB2
+    projects, and join the forum at http://bulletphysics.org/

Modified: packages/trunk/bullet/debian/libbullet-dev.install
===================================================================
--- packages/trunk/bullet/debian/libbullet-dev.install	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/libbullet-dev.install	2012-03-05 09:50:56 UTC (rev 13361)
@@ -1,2 +1,3 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/*.so
+usr/include
+usr/lib/*/*.so
+usr/lib/pkgconfig

Modified: packages/trunk/bullet/debian/libbullet2.install
===================================================================
--- packages/trunk/bullet/debian/libbullet2.install	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/libbullet2.install	2012-03-05 09:50:56 UTC (rev 13361)
@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.*
+usr/lib/*.so.*

Modified: packages/trunk/bullet/debian/rules
===================================================================
--- packages/trunk/bullet/debian/rules	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/rules	2012-03-05 09:50:56 UTC (rev 13361)
@@ -2,52 +2,18 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+%:
+	dh $@ --parallel
 
-Makefile: patch
-	dh_testdir
-	cmake -DCMAKE_INSTALL_PREFIX=/usr  -DBUILD_SHARED_LIBS=true -DBUILD_EXTRAS=no -DBUILD_DEMOS=no .
-	#./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+override_dh_auto_configure:
+	dh_auto_configure -- -DBUILD_SHARED_LIBS=true -DBUILD_EXTRAS=no -DBUILD_DEMOS=no
 
-build: build-stamp
+override_dh_auto_install:
+	override_dh_auto_install
+	find debian/tmp -type d -empty -delete
 
-build-stamp: Makefile 
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: clean1 unpatch 
-clean1:
-	dh_testdir
-	dh_testroot
-	rm -rf build-stamp CMakeFiles
-	[ ! -f Jamfile ] || jam -q distclean
-	dh_clean bvh.bin bullet.pc file_convex.obj
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
+override_dh_compress:
 	dh_compress --exclude=BulletSpuOptimized.pdf --exclude=Bullet_Faq.pdf --exclude=Bullet_User_Manual.pdf
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install clean1 patch
+override_dh_strip:
+	dh_strip --dbg-package=libbullet-dbg

Added: packages/trunk/bullet/debian/source/format
===================================================================
--- packages/trunk/bullet/debian/source/format	                        (rev 0)
+++ packages/trunk/bullet/debian/source/format	2012-03-05 09:50:56 UTC (rev 13361)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/trunk/bullet/debian/watch
===================================================================
--- packages/trunk/bullet/debian/watch	2012-03-05 08:24:46 UTC (rev 13360)
+++ packages/trunk/bullet/debian/watch	2012-03-05 09:50:56 UTC (rev 13361)
@@ -1,3 +1,4 @@
 version=3
-opts=dversionmangle=s/\.dfsg\.\d+$// \
-  http://code.google.com/p/bullet/downloads/list .*/bullet-(\d[\d\.]*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+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))|zip)

More information about the Pkg-games-commits mailing list