r8612 - in packages/trunk/box2d: . debian debian/patches

Miriam Ruiz miriam at alioth.debian.org
Mon Jan 5 20:53:17 UTC 2009


Author: miriam
Date: 2009-01-05 20:53:16 +0000 (Mon, 05 Jan 2009)
New Revision: 8612

Added:
   packages/trunk/box2d/debian/
   packages/trunk/box2d/debian/Makefile
   packages/trunk/box2d/debian/README.Debian
   packages/trunk/box2d/debian/changelog
   packages/trunk/box2d/debian/compat
   packages/trunk/box2d/debian/control
   packages/trunk/box2d/debian/copyright
   packages/trunk/box2d/debian/docs
   packages/trunk/box2d/debian/libbox2d-dev.install
   packages/trunk/box2d/debian/libbox2d0.install
   packages/trunk/box2d/debian/patches/
   packages/trunk/box2d/debian/patches/cstring.patch
   packages/trunk/box2d/debian/patches/maxproxies.patch
   packages/trunk/box2d/debian/patches/series
   packages/trunk/box2d/debian/rules
   packages/trunk/box2d/debian/watch.ex
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: packages/trunk/box2d/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: packages/trunk/box2d/debian/Makefile
===================================================================
--- packages/trunk/box2d/debian/Makefile	                        (rev 0)
+++ packages/trunk/box2d/debian/Makefile	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,119 @@
+all: libbox2d.so libbox2d.a
+
+fixed: libbox2d-fixed.so libbox2d-fixed.a
+
+MAJOR=0
+MINOR=0.0d1
+
+SOURCES = \
+	Source/Collision/b2Distance.cpp \
+	Source/Collision/b2TimeOfImpact.cpp \
+	Source/Collision/b2CollideCircle.cpp \
+	Source/Collision/b2CollidePoly.cpp \
+	Source/Collision/Shapes/b2PolygonShape.cpp \
+	Source/Collision/Shapes/b2CircleShape.cpp \
+	Source/Collision/Shapes/b2Shape.cpp \
+	Source/Collision/b2PairManager.cpp \
+	Source/Collision/b2Collision.cpp \
+	Source/Collision/b2BroadPhase.cpp \
+	Source/Dynamics/b2WorldCallbacks.cpp \
+	Source/Dynamics/Joints/b2PrismaticJoint.cpp \
+	Source/Dynamics/Joints/b2MouseJoint.cpp \
+	Source/Dynamics/Joints/b2GearJoint.cpp \
+	Source/Dynamics/Joints/b2Joint.cpp \
+	Source/Dynamics/Joints/b2PulleyJoint.cpp \
+	Source/Dynamics/Joints/b2DistanceJoint.cpp \
+	Source/Dynamics/Joints/b2RevoluteJoint.cpp \
+	Source/Dynamics/Contacts/b2CircleContact.cpp \
+	Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp \
+	Source/Dynamics/Contacts/b2Contact.cpp \
+	Source/Dynamics/Contacts/b2PolyContact.cpp \
+	Source/Dynamics/Contacts/b2ContactSolver.cpp \
+	Source/Dynamics/b2Island.cpp \
+	Source/Dynamics/b2Body.cpp \
+	Source/Dynamics/b2ContactManager.cpp \
+	Source/Dynamics/b2World.cpp \
+	Source/Common/b2BlockAllocator.cpp \
+	Source/Common/b2StackAllocator.cpp \
+	Source/Common/b2Settings.cpp \
+	Source/Common/b2Math.cpp
+
+OBJS = $(SOURCES:.cpp=.o)
+STATIC_OBJS = $(SOURCES:.cpp=.static.o)
+FIXED_OBJS = $(SOURCES:.cpp=.fixed.o)
+STATIC_FIXED_OBJS = $(SOURCES:.cpp=.static_fixed.o)
+
+STATIC_CFLAGS= -O2 -g -Wall
+CFLAGS= $(STATIC_CFLAGS) -fPIC
+LDFLAGS= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
+
+libbox2d.so.$(MAJOR).$(MINOR): $(OBJS)
+	g++ $(LDFLAGS) -shared \
+		-Wl,-soname,libbox2d.so.$(MAJOR) \
+		-o libbox2d.so.$(MAJOR).$(MINOR) \
+		$+ -o $@ $(LIBS)
+
+libbox2d.so: libbox2d.so.$(MAJOR).$(MINOR)
+	rm -f $@.$(MAJOR)
+	ln -s $@.$(MAJOR).$(MINOR) $@.$(MAJOR)
+	rm -f $@
+	ln -s $@.$(MAJOR) $@
+
+libbox2d.a: $(STATIC_OBJS)
+	ar cru $@ $+
+
+libbox2d-fixed.so.$(MAJOR).$(MINOR): $(FIXED_OBJS)
+	g++ $(LDFLAGS) -shared \
+		-Wl,-soname,libbox2d-fixed.so.$(MAJOR) \
+		-o libbox2d-fixed.so.$(MAJOR).$(MINOR) \
+		$+ -o $@ $(LIBS)
+
+libbox2d-fixed.so: libbox2d-fixed.so.$(MAJOR).$(MINOR)
+	rm -f $@.$(MAJOR)
+	ln -s $@.$(MAJOR).$(MINOR) $@.$(MAJOR)
+	rm -f $@
+	ln -s $@.$(MAJOR) $@
+
+libbox2d-fixed.a: $(STATIC_FIXED_OBJS)
+	ar cru $@ $+
+
+%.o: %.cpp
+	g++ -o $@ -c $+ $(CFLAGS) $(PKGCONFIG_CFLAGS)
+
+%.o: %.c
+	gcc -o $@ -c $+ $(CFLAGS) $(PKGCONFIG_CFLAGS)
+
+%.so : %.o
+	g++ $(LDFLAGS) -shared $^ -o $@
+
+%.static.o: %.cpp
+	g++ -o $@ -c $+ $(STATIC_CFLAGS) $(PKGCONFIG_CFLAGS)
+
+%.static.o: %.c
+	gcc -o $@ -c $+ $(STATIC_CFLAGS) $(PKGCONFIG_CFLAGS)
+
+%.fixed.o: %.cpp
+	g++ -o $@ -c $+ $(CFLAGS) -DTARGET_FLOAT32_IS_FIXED $(PKGCONFIG_CFLAGS)
+
+%.fixed.o: %.c
+	gcc -o $@ -c $+ $(CFLAGS) -DTARGET_FLOAT32_IS_FIXED $(PKGCONFIG_CFLAGS)
+
+%.static_fixed.o: %.cpp
+	g++ -o $@ -c $+ $(STATIC_CFLAGS) -DTARGET_FLOAT32_IS_FIXED $(PKGCONFIG_CFLAGS)
+
+%.static_fixed.o: %.c
+	gcc -o $@ -c $+ $(STATIC_CFLAGS) -DTARGET_FLOAT32_IS_FIXED $(PKGCONFIG_CFLAGS)
+
+clean:
+	rm -f $(OBJS)
+	rm -f $(STATIC_OBJS)
+	rm -f $(FIXED_OBJS)
+	rm -f $(STATIC_FIXED_OBJS)
+	rm -f *.so *.so* *.a
+
+DESTDIR=
+
+install:
+	mkdir -p "$(DESTDIR)/usr/lib/"
+	cp *.a "$(DESTDIR)/usr/lib/"
+	cp *.so* "$(DESTDIR)/usr/lib/"

Added: packages/trunk/box2d/debian/README.Debian
===================================================================
--- packages/trunk/box2d/debian/README.Debian	                        (rev 0)
+++ packages/trunk/box2d/debian/README.Debian	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,6 @@
+box2d for Debian
+----------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 05 Jan 2009 19:51:00 +0100

Added: packages/trunk/box2d/debian/changelog
===================================================================
--- packages/trunk/box2d/debian/changelog	                        (rev 0)
+++ packages/trunk/box2d/debian/changelog	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,5 @@
+box2d (2.0.1-1) UNRELEASED; urgency=low
+
+  * Initial release (Closes: #496991)
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 05 Jan 2009 19:51:00 +0100

Added: packages/trunk/box2d/debian/compat
===================================================================
--- packages/trunk/box2d/debian/compat	                        (rev 0)
+++ packages/trunk/box2d/debian/compat	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1 @@
+7

Added: packages/trunk/box2d/debian/control
===================================================================
--- packages/trunk/box2d/debian/control	                        (rev 0)
+++ packages/trunk/box2d/debian/control	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,34 @@
+Source: box2d
+Section: libs
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>
+Build-Depends: debhelper (>= 7), quilt, dh-buildinfo
+Standards-Version: 3.8.0
+Homepage: http://www.box2d.org/
+
+Package: libbox2d-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libbox2d0 (= ${binary:Version})
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+ .
+ This package contains the development libraries and headers.
+
+Package: libbox2d0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+
+Package: libbox2d0-dbg
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, libbox2d0 (= ${binary:Version})
+Priority: extra
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+ .
+ This package contains the debugging symbols.

Added: packages/trunk/box2d/debian/copyright
===================================================================
--- packages/trunk/box2d/debian/copyright	                        (rev 0)
+++ packages/trunk/box2d/debian/copyright	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,34 @@
+This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
+Mon, 05 Jan 2009 19:51:00 +0100.
+
+It was downloaded from http://sourceforge.net/projects/box2d
+
+Upstream Author:
+
+    Erin Catto
+
+Copyright:
+
+    Copyright (c) 2006-2007 Erin Catto - http://www.gphysics.com
+
+License:
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+    
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+    
+    1. The origin of this software must not be misrepresented; you must not
+       claim that you wrote the original software. If you use this software
+       in a product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+    2. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+    3. This notice may not be removed or altered from any source distribution.
+
+
+The Debian packaging is copyright 2009, Miriam Ruiz <little_miry at yahoo.es> and
+is licensed under the same license as the program, see above.

Added: packages/trunk/box2d/debian/docs
===================================================================
--- packages/trunk/box2d/debian/docs	                        (rev 0)
+++ packages/trunk/box2d/debian/docs	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,2 @@
+Readme.txt
+TODO.txt

Added: packages/trunk/box2d/debian/libbox2d-dev.install
===================================================================
--- packages/trunk/box2d/debian/libbox2d-dev.install	                        (rev 0)
+++ packages/trunk/box2d/debian/libbox2d-dev.install	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,4 @@
+#debian/tmp/usr/include/* usr/include
+debian/tmp/usr/lib/lib*.a usr/lib
+debian/tmp/usr/lib/lib*.so usr/lib
+#debian/tmp/usr/lib/lib*.la usr/lib

Added: packages/trunk/box2d/debian/libbox2d0.install
===================================================================
--- packages/trunk/box2d/debian/libbox2d0.install	                        (rev 0)
+++ packages/trunk/box2d/debian/libbox2d0.install	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.* usr/lib

Added: packages/trunk/box2d/debian/patches/cstring.patch
===================================================================
--- packages/trunk/box2d/debian/patches/cstring.patch	                        (rev 0)
+++ packages/trunk/box2d/debian/patches/cstring.patch	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,60 @@
+Index: box2d-2.0.1/Source/Collision/b2BroadPhase.cpp
+===================================================================
+--- box2d-2.0.1.orig/Source/Collision/b2BroadPhase.cpp	2008-03-10 21:42:36.000000000 +0100
++++ box2d-2.0.1/Source/Collision/b2BroadPhase.cpp	2009-01-05 20:30:40.000000000 +0100
+@@ -16,6 +16,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+ 
++#include <cstring>
+ #include "b2BroadPhase.h"
+ #include <algorithm>
+ 
+Index: box2d-2.0.1/Source/Common/b2BlockAllocator.cpp
+===================================================================
+--- box2d-2.0.1.orig/Source/Common/b2BlockAllocator.cpp	2007-11-24 11:25:02.000000000 +0100
++++ box2d-2.0.1/Source/Common/b2BlockAllocator.cpp	2009-01-05 20:30:40.000000000 +0100
+@@ -16,6 +16,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+ 
++#include <cstring>
+ #include "b2BlockAllocator.h"
+ #include <cstdlib>
+ #include <memory>
+Index: box2d-2.0.1/Source/Dynamics/Contacts/b2CircleContact.cpp
+===================================================================
+--- box2d-2.0.1.orig/Source/Dynamics/Contacts/b2CircleContact.cpp	2008-04-10 23:37:08.000000000 +0200
++++ box2d-2.0.1/Source/Dynamics/Contacts/b2CircleContact.cpp	2009-01-05 20:30:40.000000000 +0100
+@@ -16,6 +16,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+ 
++#include <cstring>
+ #include "b2CircleContact.h"
+ #include "../b2Body.h"
+ #include "../b2WorldCallbacks.h"
+Index: box2d-2.0.1/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
+===================================================================
+--- box2d-2.0.1.orig/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2008-04-12 14:29:14.000000000 +0200
++++ box2d-2.0.1/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp	2009-01-05 20:30:40.000000000 +0100
+@@ -16,6 +16,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+ 
++#include <cstring>
+ #include "b2PolyAndCircleContact.h"
+ #include "../b2Body.h"
+ #include "../b2WorldCallbacks.h"
+Index: box2d-2.0.1/Source/Dynamics/Contacts/b2PolyContact.cpp
+===================================================================
+--- box2d-2.0.1.orig/Source/Dynamics/Contacts/b2PolyContact.cpp	2008-04-10 23:38:38.000000000 +0200
++++ box2d-2.0.1/Source/Dynamics/Contacts/b2PolyContact.cpp	2009-01-05 20:30:40.000000000 +0100
+@@ -16,6 +16,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+ 
++#include <cstring>
+ #include "b2PolyContact.h"
+ #include "../b2Body.h"
+ #include "../b2WorldCallbacks.h"

Added: packages/trunk/box2d/debian/patches/maxproxies.patch
===================================================================
--- packages/trunk/box2d/debian/patches/maxproxies.patch	                        (rev 0)
+++ packages/trunk/box2d/debian/patches/maxproxies.patch	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,13 @@
+Index: box2d-2.0.1/Source/Common/b2Settings.h
+===================================================================
+--- box2d-2.0.1.orig/Source/Common/b2Settings.h	2008-04-10 23:44:06.000000000 +0200
++++ box2d-2.0.1/Source/Common/b2Settings.h	2009-01-05 20:30:42.000000000 +0100
+@@ -73,7 +73,7 @@
+ // Collision
+ const int32 b2_maxManifoldPoints = 2;
+ const int32 b2_maxPolygonVertices = 8;
+-const int32 b2_maxProxies = 512;				// this must be a power of two
++const int32 b2_maxProxies = 512*4;				// this must be a power of two
+ const int32 b2_maxPairs = 8 * b2_maxProxies;	// this must be a power of two
+ 
+ // Dynamics

Added: packages/trunk/box2d/debian/patches/series
===================================================================
--- packages/trunk/box2d/debian/patches/series	                        (rev 0)
+++ packages/trunk/box2d/debian/patches/series	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,2 @@
+cstring.patch
+maxproxies.patch

Added: packages/trunk/box2d/debian/rules
===================================================================
--- packages/trunk/box2d/debian/rules	                        (rev 0)
+++ packages/trunk/box2d/debian/rules	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,80 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+config: config-stamp
+config-stamp:
+	dh_testdir
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	touch $@
+
+build: build-stamp
+build-stamp: config-stamp  
+	dh_testdir
+	$(MAKE) -f debian/Makefile
+	#docbook-to-man debian/box2d.sgml > box2d.1
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp config-stamp
+	$(MAKE) -f debian/Makefile clean
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep 
+	dh_installdirs
+	$(MAKE) -f debian/Makefile DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: install
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip --dbg-package=libbox2d0-dbg
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	test -e /usr/bin/dh_buildinfo && dh_buildinfo
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+get-orig-source:
+	rm -f ../box2d_2.0.1.orig.tar.gz Box2D_v2.0.1.zip
+	wget http://surfnet.dl.sourceforge.net/sourceforge/box2d/Box2D_v2.0.1.zip
+	unzip Box2D_v2.0.1.zip
+	rm Box2D_v2.0.1.zip
+	rm -r Box2D_v2.0.1/Box2D/Contrib/freeglut/
+	rm -r Box2D_v2.0.1/Box2D/Contrib/glui/
+	cd Box2D_v2.0.1 && tar cvfz ../../box2d_2.0.1.orig.tar.gz Box2D
+	rm -r Box2D_v2.0.1 
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install config get-orig-source


Property changes on: packages/trunk/box2d/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/box2d/debian/watch.ex
===================================================================
--- packages/trunk/box2d/debian/watch.ex	                        (rev 0)
+++ packages/trunk/box2d/debian/watch.ex	2009-01-05 20:53:16 UTC (rev 8612)
@@ -0,0 +1,23 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php box2d-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/box2d-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/box2d-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/box2d/box2d-(.*)\.tar\.gz
+
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html box2d-(.*)\.tar\.gz




More information about the Pkg-games-commits mailing list