Author: goneri-guest
Date: 2007-03-03 01:17:31 +0000 (Sat, 03 Mar 2007)
New Revision: 2444
Modified:
packages/trunk/ode/debian/changelog
packages/trunk/ode/debian/libode0-dev.install
packages/trunk/ode/debian/libode0-dev.links
packages/trunk/ode/debian/libode0c2.links
packages/trunk/ode/debian/patches/fix_makeinstall.diff
packages/trunk/ode/debian/rules
Log:
now it builds fine. Still a Warning to fix:
W: libode0c2: missing-depends-line
Modified: packages/trunk/ode/debian/changelog
===================================================================
--- packages/trunk/ode/debian/changelog 2007-03-02 23:43:09 UTC (rev 2443)
+++ packages/trunk/ode/debian/changelog 2007-03-03 01:17:31 UTC (rev 2444)
@@ -2,14 +2,14 @@
* new upstream release
- remove add_fPIC_flag.diff (patch accepted)
->> TODO - remove fix_makeinstall.diff (updated)
+ - update fix_makeinstall.diff to not create the symlink
- remove fix_dTRIMESH_ENABLED_undef.diff (useless)
-
* remove --disable-opcode. its support had been improved since the
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)
+ * clean up in debian/rules
-- Gonéri Le Bouder <[EMAIL PROTECTED]> Sun, 31 Dec 2006 19:11:24 +0100
Modified: packages/trunk/ode/debian/libode0-dev.install
===================================================================
--- packages/trunk/ode/debian/libode0-dev.install 2007-03-02 23:43:09 UTC
(rev 2443)
+++ packages/trunk/ode/debian/libode0-dev.install 2007-03-03 01:17:31 UTC
(rev 2444)
@@ -1,4 +1,3 @@
debian/tmp/usr/include/*
debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
debian/tmp/usr/bin/ode-config
Modified: packages/trunk/ode/debian/libode0-dev.links
===================================================================
--- packages/trunk/ode/debian/libode0-dev.links 2007-03-02 23:43:09 UTC (rev
2443)
+++ packages/trunk/ode/debian/libode0-dev.links 2007-03-03 01:17:31 UTC (rev
2444)
@@ -1 +1 @@
-usr/lib/libode.so usr/lib/libode.so.0.6.1
+usr/lib/libode.so.0.8.0 usr/lib/libode.so
Modified: packages/trunk/ode/debian/libode0c2.links
===================================================================
--- packages/trunk/ode/debian/libode0c2.links 2007-03-02 23:43:09 UTC (rev
2443)
+++ packages/trunk/ode/debian/libode0c2.links 2007-03-03 01:17:31 UTC (rev
2444)
@@ -1,2 +1,2 @@
-usr/lib/libode.so.0 usr/lib/libode.so.0.6.1
-usr/lib/libode.so.0.6 usr/lib/libode.so.0.6.1
+usr/lib/libode.so.0.8.0 usr/lib/libode.so.0
+usr/lib/libode.so.0.8.0 usr/lib/libode.so.0.8
Modified: packages/trunk/ode/debian/patches/fix_makeinstall.diff
===================================================================
--- packages/trunk/ode/debian/patches/fix_makeinstall.diff 2007-03-02
23:43:09 UTC (rev 2443)
+++ packages/trunk/ode/debian/patches/fix_makeinstall.diff 2007-03-03
01:17:31 UTC (rev 2444)
@@ -1,32 +1,5 @@
-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)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
-- $(libdir)/libode.so
-- ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
-- $(libdir)/@ODE_SONAME@
-- ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
-- $(libdir)/@[EMAIL PROTECTED]@ODE_REVISION@
-- /sbin/ldconfig
-+ ln -s @[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
-+ $(PREFIX)/$(libdir)/libode.so
-+ ln -s @[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
-+ $(PREFIX)/$(libdir)/@ODE_SONAME@
-+ ln -s @[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
-+ $(PREFIX)/$(libdir)/@[EMAIL PROTECTED]@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
+--- ./Makefile.in.orig 2007-03-03 00:42:00.000000000 +0100
++++ ./Makefile.in 2007-03-03 00:42:42.000000000 +0100
@@ -660,13 +660,13 @@
rm -rf ${PACKAGE}-${VERSION}
@@ -38,13 +11,36 @@
[EMAIL PROTECTED]@ ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(libdir)/@[EMAIL PROTECTED]@ODE_REVISION@
[EMAIL PROTECTED]@ /sbin/ldconfig
[EMAIL PROTECTED]@ ln -s @[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(PREFIX)/$(libdir)/libode.so
[EMAIL PROTECTED]@ ln -s @[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(PREFIX)/$(libdir)/@ODE_SONAME@
[EMAIL PROTECTED]@ ln -s @[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(PREFIX)/$(libdir)/@[EMAIL PROTECTED]@ODE_REVISION@
[EMAIL PROTECTED]@ ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(libdir)/libode.so
[EMAIL PROTECTED]@ ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(libdir)/@ODE_SONAME@
[EMAIL PROTECTED]@ ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ODE_AGE@ \
[EMAIL PROTECTED]@ $(libdir)/@[EMAIL PROTECTED]@ODE_REVISION@
[EMAIL PROTECTED]@ /sbin/ldconfig
@[EMAIL PROTECTED]:
# 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.
+--- ./Makefile.am.orig 2007-03-03 00:42:06.000000000 +0100
++++ ./Makefile.am 2007-03-03 00:42:28.000000000 +0100
+@@ -25,13 +25,13 @@
+
+ if USE_SONAME
+ install-exec-hook:
+- ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
+- $(libdir)/libode.so
+- ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
+- $(libdir)/@ODE_SONAME@
+- ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
+- $(libdir)/@[EMAIL PROTECTED]@ODE_REVISION@
+- /sbin/ldconfig
++# ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
++# $(libdir)/libode.so
++# ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
++# $(libdir)/@ODE_SONAME@
++# ln -s $(libdir)/@[EMAIL PROTECTED]@[EMAIL PROTECTED]@ODE_AGE@ \
++# $(libdir)/@[EMAIL PROTECTED]@ODE_REVISION@
++# /sbin/ldconfig
+ else
+ install-exec-hook:
+ endif
Modified: packages/trunk/ode/debian/rules
===================================================================
--- packages/trunk/ode/debian/rules 2007-03-02 23:43:09 UTC (rev 2443)
+++ packages/trunk/ode/debian/rules 2007-03-03 01:17:31 UTC (rev 2444)
@@ -15,8 +15,8 @@
endif
# shared library versions, option 1
-version=2.0.5
-major=2
+#version=2.0.5
+#major=2
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
#version=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
@@ -36,14 +36,7 @@
build-stamp: configure-stamp
dh_testdir
- CXXFLAGS="-fPIC" $(MAKE)
-# $(MAKE) ode-lib PICFLAGS=-fPIC
-# mv lib/libode.a lib/libode-pic.a
-# $(MAKE) ode-shared-lib
-# mv lib/libode.so.0 lib/libode.so.0.bak
-# $(MAKE) clean
-# $(MAKE) ode-lib
-# mv lib/libode.so.0.bak lib/libode.so.0
+ $(MAKE)
touch build-stamp
@@ -84,13 +77,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
docbook-to-man debian/ode-config.man.sgml > \
debian/ode-config.1
-# cp -a include/ode debian/libode0-dev/usr/include/
-# cp -a config/user-settings debian/libode0-dev/usr/include/ode/config/
-# cp -a lib/libode*.a debian/libode0-dev/usr/lib/
-# cp -a lib/libode*.so.* debian/libode0c2/usr/lib/
-# ln -s libode.so.0 debian/libode0-dev/usr/lib/libode.so
-# chmod a-x debian/libode0-dev/usr/include/ode/*.h
-#
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -99,31 +86,17 @@
binary-arch: build install
dh_testdir
dh_testroot
-# dh_movefiles
-# dh_installdebconf
dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
dh_installman -plibode0-dev debian/ode-config.1
-# dh_installinfo
dh_install
-# dh_undocumented
dh_installchangelogs CHANGELOG.txt
dh_link
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs
+ dh_makeshlibs -V 'libode0c2 (>= 0.8)'
dh_installdeb
-# dh_perl
- dh_shlibdeps -V (>= 0.8-1)
dh_gencontrol
dh_md5sums
dh_builddeb
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
