r1992 - packages/trunk/ogre/debian

[Cyril Brulebois]

Author: kibi-guest
Date: 2006-11-17 03:28:17 +0100 (Fri, 17 Nov 2006)
New Revision: 1992

Modified:
   packages/trunk/ogre/debian/changelog
   packages/trunk/ogre/debian/libogre12.install
   packages/trunk/ogre/debian/rules
Log:
Adjusted *.install files to not ship libOgrePlatform.so twice
Adjusted debian/rules to not ship blender-ogrexml override in libogre12


Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog	2006-11-17 00:34:53 UTC (rev 1991)
+++ packages/trunk/ogre/debian/changelog	2006-11-17 02:28:17 UTC (rev 1992)
@@ -53,7 +53,9 @@
   * Added a call to `chrpath' on a .so file declaring a rpath on /usr/lib and
     added also a build dependency on this package.
   * Added the `/usr/lib/libOgrePlatform.so' in debian/libogre-dev.install so
-    that it is shipped as well as `/usr/lib/libCEGUIOgreRenderer.so' is.
+    that it is shipped as well as `/usr/lib/libCEGUIOgreRenderer.so' is, and
+    thus removed from debian/libogre12.install.
+    TODO: Check that nothing is broken this way!
   * Removed unneeded call to libtool_clean.sh and removed that script since
     it's not longer needed.
   * Deleted (unused) library version declarations.

Modified: packages/trunk/ogre/debian/libogre12.install
===================================================================
--- packages/trunk/ogre/debian/libogre12.install	2006-11-17 00:34:53 UTC (rev 1991)
+++ packages/trunk/ogre/debian/libogre12.install	2006-11-17 02:28:17 UTC (rev 1992)
@@ -1,5 +1,4 @@
 usr/lib/lib*.so.*
-usr/lib/libOgrePlatform.so
 usr/lib/OGRE/*.so
 usr/lib/OGRE/*.la
 usr/sbin/update-ogre-plugins

Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules	2006-11-17 00:34:53 UTC (rev 1991)
+++ packages/trunk/ogre/debian/rules	2006-11-17 02:28:17 UTC (rev 1992)
@@ -125,7 +125,8 @@
 	# Suppression of the rpath on /usr/lib
 	chrpath -d debian/tmp/usr/lib/libOgreMain.so.12.0.0
 	
-	# Installing the lintian overrides
+	# Installing the lintian overrides, deleting blender-ogrexml if needed
+	-rm debian/tmp/usr/share/lintian/overrides/blender-ogrexml
 	install -d debian/tmp/usr/share/lintian/overrides
 	install -m 644 debian/libogre12.lintian-overrides		\
 		debian/tmp/usr/share/lintian/overrides/libogre12