r2436 - in packages/trunk/ode/debian: . patches
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Sun Feb 25 04:10:30 CET 2007
Author: goneri-guest
Date: 2007-02-25 04:10:29 +0100 (Sun, 25 Feb 2007)
New Revision: 2436
Added:
packages/trunk/ode/debian/patches/fix_makeinstall.diff
Removed:
packages/trunk/ode/debian/patches/add_fPIC_flag.diff
packages/trunk/ode/debian/patches/fix_dTRIMESH_ENABLED_undef.diff
packages/trunk/ode/debian/patches/fix_makeinstall.diff
Modified:
packages/trunk/ode/debian/changelog
packages/trunk/ode/debian/patches/series
packages/trunk/ode/debian/rules
Log:
TODO, fix fix_makeinstall.diff for the 0.8 release. I need to read desdir for that
+ * new upstream release
+ - remove add_fPIC_flag.diff (patch accepted)
+ - remove fix_makeinstall.diff (updated)
+ - remove fix_dTRIMESH_ENABLED_undef.diff (useless)
+
* remove --disable-opcode. its support had been improved since the
- 0.5 release
+ 0.5 release (Closes: #383868, 408023)
- update fix_dTRIMESH_ENABLED_undef.diff to build trimesh tests
+ - use the -V flag to force packages build with this release to use at last
+ ode >= 0.8-1, thanks Yaroslav Halchenko (Closes: #412026)
Modified: packages/trunk/ode/debian/changelog
===================================================================
--- packages/trunk/ode/debian/changelog 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/changelog 2007-02-25 03:10:29 UTC (rev 2436)
@@ -1,8 +1,15 @@
-ode (1:0.7-2) UNRELEASED; urgency=low
+ode (1:0.8-1) UNRELEASED; urgency=low
+ * new upstream release
+ - remove add_fPIC_flag.diff (patch accepted)
+>> TODO - remove fix_makeinstall.diff (updated)
+ - remove fix_dTRIMESH_ENABLED_undef.diff (useless)
+
* remove --disable-opcode. its support had been improved since the
- 0.5 release
+ 0.5 release (Closes: #383868, 408023)
- update fix_dTRIMESH_ENABLED_undef.diff to build trimesh tests
+ - use the -V flag to force packages build with this release to use at last
+ ode >= 0.8-1, thanks Yaroslav Halchenko (Closes: #412026)
-- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 31 Dec 2006 19:11:24 +0100
Deleted: packages/trunk/ode/debian/patches/add_fPIC_flag.diff
===================================================================
--- packages/trunk/ode/debian/patches/add_fPIC_flag.diff 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/patches/add_fPIC_flag.diff 2007-02-25 03:10:29 UTC (rev 2436)
@@ -1,22 +0,0 @@
-Index: ode-0.7/ode/src/Makefile.in
-===================================================================
---- ode-0.7.orig/ode/src/Makefile.in 2006-10-11 17:44:15.000000000 +0200
-+++ ode-0.7/ode/src/Makefile.in 2006-10-11 17:45:29.000000000 +0200
-@@ -439,7 +439,7 @@
- AM_CFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/include \
- -I$(top_builddir)/include $(am__append_11)
- lib_LIBRARIES = libode.a
--libode_a_CPPFLAGS = -O2 $(am__append_1)
-+libode_a_CPPFLAGS = -O2 $(am__append_1) -fPIC
-
- # Fake an executable in order to get a shared library
- # Note the elegant and cunning way to trick Autotools to install a program
-@@ -453,7 +453,7 @@
-
- # convenience library to simulate per object cflags
- noinst_LIBRARIES = libfast.a $(am__append_6)
--libfast_a_CFLAGS = -O1 $(am__append_5)
-+libfast_a_CFLAGS = -O1 $(am__append_5) -fPIC
- libfast_a_SOURCES = fastldlt.c fastltsolve.c fastdot.c fastlsolve.c
- libode_a_DEPENDENCIES = libfast.a $(am__append_8)
- libode_a_LIBADD = $(libfast_a_OBJECTS) $(am__append_9)
Deleted: packages/trunk/ode/debian/patches/fix_dTRIMESH_ENABLED_undef.diff
===================================================================
--- packages/trunk/ode/debian/patches/fix_dTRIMESH_ENABLED_undef.diff 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/patches/fix_dTRIMESH_ENABLED_undef.diff 2007-02-25 03:10:29 UTC (rev 2436)
@@ -1,20 +0,0 @@
-Index: ode-0.7/ode/src/heightfield.cpp
-===================================================================
---- ode-0.7.orig/ode/src/heightfield.cpp 2006-10-11 17:09:42.000000000 +0200
-+++ ode-0.7/ode/src/heightfield.cpp 2006-10-11 17:11:16.000000000 +0200
-@@ -782,13 +782,13 @@
- CollideNPlane = dCollideConvexPlane;
- GetDepth = NULL;// TODO: dGeomConvexPointDepth;
- break;
--
-+#ifdef dTRIMESH_ENABLED
- case dTriMeshClass:
- CollideRayN = dCollideRayTrimesh;
- CollideNPlane = dCollideTrimeshPlane;
- GetDepth = NULL;// N/A?
- break;
--
-+#endif
- default:
- dIASSERT(0); // Shouldn't ever get here.
- break;
Deleted: packages/trunk/ode/debian/patches/fix_makeinstall.diff
===================================================================
--- packages/trunk/ode/debian/patches/fix_makeinstall.diff 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/patches/fix_makeinstall.diff 2007-02-25 03:10:29 UTC (rev 2436)
@@ -1,50 +0,0 @@
-Index: ode-0.7/Makefile.am
-===================================================================
---- ode-0.7.orig/Makefile.am 2006-09-18 09:13:16.000000000 +0200
-+++ ode-0.7/Makefile.am 2006-09-18 09:13:18.000000000 +0200
-@@ -20,13 +20,13 @@
-
- if USE_SONAME
- install-exec-hook:
-- ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-- $(prefix)/lib/libode.so
-- ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-- $(prefix)/lib/@ODE_SONAME@
-- ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-- $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION@
-- /sbin/ldconfig
-+ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-+ $(DESTDIR)/$(libdir)/libode.so
-+ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-+ $(DESTDIR)/$(libdir)/@ODE_SONAME@
-+ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-+ $(DESTDIR)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@
-+ -/sbin/ldconfig
- else
- install-exec-hook:
- endif
-Index: ode-0.7/Makefile.in
-===================================================================
---- ode-0.7.orig/Makefile.in 2006-09-18 09:13:16.000000000 +0200
-+++ ode-0.7/Makefile.in 2006-09-18 09:14:18.000000000 +0200
-@@ -646,13 +646,13 @@
- rm -rf ${PACKAGE}-${VERSION}
-
- @USE_SONAME_TRUE at install-exec-hook:
-- at USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-- at USE_SONAME_TRUE@ $(prefix)/lib/libode.so
-- at USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-- at USE_SONAME_TRUE@ $(prefix)/lib/@ODE_SONAME@
-- at USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-- at USE_SONAME_TRUE@ $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION@
-- at USE_SONAME_TRUE@ /sbin/ldconfig
-+ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-+ at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/libode.so
-+ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-+ at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/@ODE_SONAME@
-+ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
-+ at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@
-+ at USE_SONAME_TRUE@ -/sbin/ldconfig
- @USE_SONAME_FALSE at install-exec-hook:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Added: packages/trunk/ode/debian/patches/fix_makeinstall.diff
===================================================================
--- packages/trunk/ode/debian/patches/fix_makeinstall.diff 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/patches/fix_makeinstall.diff 2007-02-25 03:10:29 UTC (rev 2436)
@@ -0,0 +1,50 @@
+Index: ode-0.8/Makefile.am
+===================================================================
+--- ode-0.8.orig/Makefile.am 2007-02-25 03:49:37.057162000 +0100
++++ ode-0.8/Makefile.am 2007-02-25 03:50:11.000000000 +0100
+@@ -25,13 +25,13 @@
+
+ if USE_SONAME
+ install-exec-hook:
+- ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- $(libdir)/libode.so
+- ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- $(libdir)/@ODE_SONAME@
+- ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- $(libdir)/@ODE_SONAME at .@ODE_REVISION@
+- /sbin/ldconfig
++ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ $(PREFIX)/$(libdir)/libode.so
++ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ $(PREFIX)/$(libdir)/@ODE_SONAME@
++ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ $(PREFIX)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@
++# /sbin/ldconfig
+ else
+ install-exec-hook:
+ endif
+Index: ode-0.8/Makefile.in
+===================================================================
+--- ode-0.8.orig/Makefile.in 2007-02-25 03:50:16.079992000 +0100
++++ ode-0.8/Makefile.in 2007-02-25 03:50:55.000000000 +0100
+@@ -660,13 +660,13 @@
+ rm -rf ${PACKAGE}-${VERSION}
+
+ @USE_SONAME_TRUE at install-exec-hook:
+- at USE_SONAME_TRUE@ ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- at USE_SONAME_TRUE@ $(libdir)/libode.so
+- at USE_SONAME_TRUE@ ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- at USE_SONAME_TRUE@ $(libdir)/@ODE_SONAME@
+- at USE_SONAME_TRUE@ ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- at USE_SONAME_TRUE@ $(libdir)/@ODE_SONAME at .@ODE_REVISION@
+- at USE_SONAME_TRUE@ /sbin/ldconfig
++ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ at USE_SONAME_TRUE@ $(PREFIX)/$(libdir)/libode.so
++ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ at USE_SONAME_TRUE@ $(PREFIX)/$(libdir)/@ODE_SONAME@
++ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ at USE_SONAME_TRUE@ $(PREFIX)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@
++#@USE_SONAME_TRUE@ /sbin/ldconfig
+ @USE_SONAME_FALSE at install-exec-hook:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Modified: packages/trunk/ode/debian/patches/series
===================================================================
--- packages/trunk/ode/debian/patches/series 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/patches/series 2007-02-25 03:10:29 UTC (rev 2436)
@@ -1,3 +1 @@
-add_fPIC_flag.diff
fix_makeinstall.diff
-fix_dTRIMESH_ENABLED_undef.diff
Modified: packages/trunk/ode/debian/rules
===================================================================
--- packages/trunk/ode/debian/rules 2007-02-21 23:30:31 UTC (rev 2435)
+++ packages/trunk/ode/debian/rules 2007-02-25 03:10:29 UTC (rev 2436)
@@ -123,7 +123,7 @@
dh_makeshlibs
dh_installdeb
# dh_perl
- dh_shlibdeps
+ dh_shlibdeps -V (>= 0.8-1)
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the Pkg-games-commits
mailing list