r2927 - in packages/trunk/ogre/debian: . patches

Andres Mejia ceros-guest at alioth.debian.org
Tue Jun 12 04:33:09 UTC 2007 

Author: ceros-guest
Date: 2007-06-12 04:33:05 +0000 (Tue, 12 Jun 2007)
New Revision: 2927

Added:
   packages/trunk/ogre/debian/patches/fix_soname_and_rpath.dpatch
Removed:
   packages/trunk/ogre/debian/libogre-dev.dirs
   packages/trunk/ogre/debian/libogre14.dirs
   packages/trunk/ogre/debian/ogre-tools.dirs
   packages/trunk/ogre/debian/patches/remove_rpath.dpatch
Modified:
   packages/trunk/ogre/debian/libogre-dev.install
   packages/trunk/ogre/debian/libogre14.install
   packages/trunk/ogre/debian/patches/00list
   packages/trunk/ogre/debian/patches/disable_samples.dpatch
   packages/trunk/ogre/debian/rules
Log:
Using version-info instead of release for soname. Other minor updates.

Deleted: packages/trunk/ogre/debian/libogre-dev.dirs
===================================================================
--- packages/trunk/ogre/debian/libogre-dev.dirs	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/libogre-dev.dirs	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include

Modified: packages/trunk/ogre/debian/libogre-dev.install
===================================================================
--- packages/trunk/ogre/debian/libogre-dev.install	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/libogre-dev.install	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1,2 +1,5 @@
 usr/include/*
+usr/lib/*.so
+usr/lib/*.la
+usr/lib/OGRE/*.la
 usr/lib/pkgconfig/*

Deleted: packages/trunk/ogre/debian/libogre14.dirs
===================================================================
--- packages/trunk/ogre/debian/libogre14.dirs	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/libogre14.dirs	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1,3 +0,0 @@
-usr/lib/OGRE
-usr/sbin
-etc/OGRE

Modified: packages/trunk/ogre/debian/libogre14.install
===================================================================
--- packages/trunk/ogre/debian/libogre14.install	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/libogre14.install	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1,6 +1,4 @@
-usr/lib/*.so
-usr/lib/*.la
+usr/lib/*.so.*
 usr/lib/OGRE/*.so
-usr/lib/OGRE/*.la
 usr/sbin/update-ogre-plugins
 etc/OGRE/*.cfg

Deleted: packages/trunk/ogre/debian/ogre-tools.dirs
===================================================================
--- packages/trunk/ogre/debian/ogre-tools.dirs	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/ogre-tools.dirs	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1 +0,0 @@
-usr/bin

Modified: packages/trunk/ogre/debian/patches/00list
===================================================================
--- packages/trunk/ogre/debian/patches/00list	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/patches/00list	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1,3 +1,3 @@
 disable_samples.dpatch
 gcc_mips.dpatch
-remove_rpath.dpatch
+fix_soname_and_rpath.dpatch

Modified: packages/trunk/ogre/debian/patches/disable_samples.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.dpatch	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/patches/disable_samples.dpatch	2007-06-12 04:33:05 UTC (rev 2927)
@@ -45,9 +45,25 @@
      fi
      AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
  ])
---- ogre-free/configure.in~	2007-05-06 04:39:05.000000000 -0400
-+++ ogre-free/configure.in	2007-05-27 20:35:53.000000000 -0400
-@@ -141,86 +141,6 @@
+## DP: Also adding versioning info to use version-info instead of release in soname
+--- ogre-free/configure.in~	2007-06-11 17:45:54.000000000 -0400
++++ ogre-free/configure.in	2007-06-11 21:07:51.000000000 -0400
+@@ -100,6 +100,14 @@
+ CXXFLAGS="$CXXFLAGS"
+ LIBS="$LIBS"
+ 
++dnl Added versioning info. Versioning info doesn't exist upstream.
++dnl This should end with a versuffix of 14.0.2
++OGREMAIN_CURRENT=14
++OGREMAIN_REVISION=2
++OGREMAIN_AGE=0
++OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
++AC_SUBST(OGREMAIN_VERSION_INFO)
++
+ dnl Define samples absolute install path
+ ogreexecdir='${abs_top_builddir}/Samples/Common/bin'
+ AC_SUBST(abs_top_builddir)
+@@ -141,86 +149,6 @@
      RenderSystems/Direct3D9/include/Makefile \
      Samples/Makefile \
      Samples/Common/Makefile \
@@ -134,7 +150,7 @@
      Tests/Makefile \
      Tests/src/Makefile \
      Tools/Makefile \
-@@ -256,7 +176,6 @@
+@@ -256,7 +184,6 @@
  echo "    Use FreeImage                   : $build_freeimage"
  echo "    Use DevIL                       : $build_il"
  echo "    Build OGRE demos                : $build_ogre_demos"

Added: packages/trunk/ogre/debian/patches/fix_soname_and_rpath.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/fix_soname_and_rpath.dpatch	                        (rev 0)
+++ packages/trunk/ogre/debian/patches/fix_soname_and_rpath.dpatch	2007-06-12 04:33:05 UTC (rev 2927)
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+## fix_soname_and_rpath.dpatch by Andres Mejia <mcitadel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixing soname to use version-info instead of release.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- ogre-free/OgreMain/src/Makefile.am~	2007-06-11 17:45:28.000000000 -0400
++++ ogre-free/OgreMain/src/Makefile.am	2007-06-11 21:06:45.000000000 -0400
+@@ -185,8 +185,7 @@
+ 
+ platformdir = $(libdir)
+ libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS)
+-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
+-#-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@
+ #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
+ 
+ if OGRE_BUILD_SSE
+--- ogre-free/Samples/Common/CEGUIRenderer/src/Makefile.am~	2007-06-11 22:20:13.000000000 -0400
++++ ogre-free/Samples/Common/CEGUIRenderer/src/Makefile.am	2007-06-11 22:27:17.000000000 -0400
+@@ -4,5 +4,5 @@
+ 
+ libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp OgreCEGUITexture.cpp OgreCEGUIResourceProvider.cpp
+ libCEGUIOgreRenderer_la_LIBADD  = $(STLPORT_LIBS)
+-libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
++libCEGUIOgreRenderer_la_LDFLAGS = -version-info @OGREMAIN_VERSION_INFO@
+ 


Property changes on: packages/trunk/ogre/debian/patches/fix_soname_and_rpath.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/trunk/ogre/debian/patches/remove_rpath.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/remove_rpath.dpatch	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/patches/remove_rpath.dpatch	2007-06-12 04:33:05 UTC (rev 2927)
@@ -1,38 +0,0 @@
-#! /bin/sh -e
-## remove_rpath.dpatch by Federico Di Gregorio <fog at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: removing rpath
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- ogre-free/OgreMain/src/Makefile.am~	2007-04-23 12:36:07.000000000 -0400
-+++ ogre-free/OgreMain/src/Makefile.am	2007-05-27 20:47:05.000000000 -0400
-@@ -185,7 +185,7 @@
- 
- platformdir = $(libdir)
- libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS)
--libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
-+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
- #-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
- #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
- 

Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules	2007-06-11 22:12:12 UTC (rev 2926)
+++ packages/trunk/ogre/debian/rules	2007-06-12 04:33:05 UTC (rev 2927)
@@ -85,7 +85,6 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdirs -a
 	install -d debian/tmp/etc/OGRE && \
 	   install -m 644 debian/extras/*.cfg debian/tmp/etc/OGRE
 	install -d debian/tmp/usr/sbin && \

More information about the Pkg-games-commits mailing list