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

Andres Mejia ceros-guest at alioth.debian.org
Mon Nov 26 01:26:52 UTC 2007 

Author: ceros-guest
Date: 2007-11-26 01:26:52 +0000 (Mon, 26 Nov 2007)
New Revision: 4769

Added:
   packages/trunk/ogre/debian/libceguiogre-dev.install
   packages/trunk/ogre/debian/libceguiogre14.install
Modified:
   packages/trunk/ogre/debian/changelog
   packages/trunk/ogre/debian/control
   packages/trunk/ogre/debian/libogre-dev.install
   packages/trunk/ogre/debian/libogre14.install
   packages/trunk/ogre/debian/patches/disable_samples.diff
   packages/trunk/ogre/debian/rules
Log:
Checking in packaging for ogre-1.4.5-3

Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog	2007-11-26 01:19:53 UTC (rev 4768)
+++ packages/trunk/ogre/debian/changelog	2007-11-26 01:26:52 UTC (rev 4769)
@@ -1,3 +1,15 @@
+ogre (1.4.5-3) unstable; urgency=low
+
+  * Fixing build problem for kfreebsd. (Closes: 451669)
+    + Patch modifying Samples/Common/Makefile.am now checks for HAVE_CEGUI.
+    + Seperating CEGUI Renderer binaries into libceguiogre{14,14-dbg,-dev}
+      packages.
+    + CEGUI Renderer needs CEGUI (>= 0.5.0) so build dependency changed from
+      libcegui-mk2-dev to libcegui-mk2-dev (>= 0.5.0).
+  * Removing XS- in Vcs-* entries in debian/control. Vcs is now official.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Thu, 22 Nov 2007 00:33:54 -0500
+
 ogre (1.4.5-2) unstable; urgency=low
 
   [ Andres Mejia ]

Modified: packages/trunk/ogre/debian/control
===================================================================
--- packages/trunk/ogre/debian/control	2007-11-26 01:19:53 UTC (rev 4768)
+++ packages/trunk/ogre/debian/control	2007-11-26 01:26:52 UTC (rev 4769)
@@ -3,11 +3,11 @@
 Section: libs
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>, Federico Di Gregorio <fog at debian.org>
-Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev, libzzip-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libxrandr-dev, libxxf86vm-dev, libxaw7-dev, libxt-dev, libz-dev
+Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev (>= 0.5.0), libzzip-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libxrandr-dev, libxxf86vm-dev, libxaw7-dev, libxt-dev, libz-dev
 Standards-Version: 3.7.2
 Homepage: http://ogre3d.org/
-XS-Vcs-Svn: svn+ssh://svn.debian.org/pkg-games/packages/trunk/ogre
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ogre/?op=log
+Vcs-Svn: svn+ssh://svn.debian.org/pkg-games/packages/trunk/ogre
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ogre/?op=log
 
 Package: libogre14
 Section: libs
@@ -94,3 +94,37 @@
  .
  This package contains the Blender exporter for Ogre.
 
+Package: libceguiogre14
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: CEGUI Ogre Renderer (libraries)
+ Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
+ providing windowing and widgets. Or simply said: You can create GUI's with it.
+ The CEGUI Ogre Renderer purpose is to create user interfaces with Ogre.
+ .
+ This package contains the CEGUI Ogre Renderer library and plugins.
+
+Package: libceguiogre14-dbg
+Section: libdevel
+Architecture: any
+Depends: libceguiogre14 (= ${binary:Version})
+Description: CEGUI Ogre Renderer (debugging libs)
+ Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
+ providing windowing and widgets. Or simply said: You can create GUI's with it.
+ The CEGUI Ogre Renderer purpose is to create user interfaces with Ogre.
+ .
+ This package contains the debugging version of the CEGUI Ogre Renderer library
+ and plugins.
+
+Package: libceguiogre-dev
+Section: libdevel
+Architecture: any
+Depends: libceguiogre14 (= ${binary:Version}), libogre-dev (= ${binary:Version})
+Description: CEGUI Ogre Renderer (development files)
+ Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
+ providing windowing and widgets. Or simply said: You can create GUI's with it.
+ The CEGUI Ogre Renderer purpose is to create user interfaces with Ogre.
+ .
+ This package contains the headers and static libraries needed to develop
+ with the CEGUI Ogre Renderer.

Added: packages/trunk/ogre/debian/libceguiogre-dev.install
===================================================================
--- packages/trunk/ogre/debian/libceguiogre-dev.install	                        (rev 0)
+++ packages/trunk/ogre/debian/libceguiogre-dev.install	2007-11-26 01:26:52 UTC (rev 4769)
@@ -0,0 +1,4 @@
+usr/include/OGRE/*CEGUI*
+usr/lib/libCEGUIOgreRenderer.so
+usr/lib/libCEGUIOgreRenderer.la
+usr/lib/pkgconfig/CEGUI-OGRE.pc

Added: packages/trunk/ogre/debian/libceguiogre14.install
===================================================================
--- packages/trunk/ogre/debian/libceguiogre14.install	                        (rev 0)
+++ packages/trunk/ogre/debian/libceguiogre14.install	2007-11-26 01:26:52 UTC (rev 4769)
@@ -0,0 +1 @@
+usr/lib/libCEGUIOgreRenderer.so.*

Modified: packages/trunk/ogre/debian/libogre-dev.install
===================================================================
--- packages/trunk/ogre/debian/libogre-dev.install	2007-11-26 01:19:53 UTC (rev 4768)
+++ packages/trunk/ogre/debian/libogre-dev.install	2007-11-26 01:26:52 UTC (rev 4769)
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/*.so
-usr/lib/*.la
-usr/lib/pkgconfig/*
+usr/lib/libOgreMain.so
+usr/lib/libOgreMain.la
+usr/lib/pkgconfig/OGRE.pc

Modified: packages/trunk/ogre/debian/libogre14.install
===================================================================
--- packages/trunk/ogre/debian/libogre14.install	2007-11-26 01:19:53 UTC (rev 4768)
+++ packages/trunk/ogre/debian/libogre14.install	2007-11-26 01:26:52 UTC (rev 4769)
@@ -1,4 +1,4 @@
-usr/lib/*.so.*
+usr/lib/libOgreMain.so.*
 usr/lib/OGRE/*.so
 usr/lib/OGRE/*.la
 usr/sbin/update-ogre-plugins

Modified: packages/trunk/ogre/debian/patches/disable_samples.diff
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.diff	2007-11-26 01:19:53 UTC (rev 4768)
+++ packages/trunk/ogre/debian/patches/disable_samples.diff	2007-11-26 01:26:52 UTC (rev 4769)
@@ -132,13 +132,15 @@
  echo "    Build the Cg plugin             : $build_cg"
 --- ./Samples/Common/Makefile.am.bak	2007-08-28 16:27:47.000000000 -0400
 +++ ./Samples/Common/Makefile.am	2007-08-28 17:04:04.000000000 -0400
-@@ -1,5 +1 @@
+@@ -1,5 +1,5 @@
 -SUBDIRS = include bin
 -
--if HAVE_CEGUI
++CEGUI_SUBDIR = CEGUIRenderer
+ if HAVE_CEGUI
 -SUBDIRS += CEGUIRenderer
-+SUBDIRS = CEGUIRenderer
--endif
++INCLUDE_CEGUI = $(CEGUI_SUBDIR)
+ endif
++SUBDIRS = $(INCLUDE_CEGUI)
 --- ./Samples/Makefile.am.bak	2007-08-28 16:31:00.000000000 -0400
 +++ ./Samples/Makefile.am	2007-08-28 17:05:34.000000000 -0400
 @@ -1,12 +1 @@

Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules	2007-11-26 01:19:53 UTC (rev 4768)
+++ packages/trunk/ogre/debian/rules	2007-11-26 01:26:52 UTC (rev 4769)
@@ -95,13 +95,15 @@
 	install -d debian/tmp/usr/sbin && \
 	   install -m 755 debian/extras/update-ogre-plugins \
 	   debian/tmp/usr/sbin/update-ogre-plugins
-	dh_install -a --sourcedir=debian/tmp
+	dh_install -a -Nlibogre-dev --sourcedir=debian/tmp
+	dh_install -plibogre-dev -XCEGUI --sourcedir=debian/tmp
 	dh_installchangelogs -a Docs/ChangeLog.html
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installman -a
 	dh_strip -plibogre14 --dbg-package=libogre14-dbg
 	dh_strip -pogre-tools --dbg-package=ogre-tools-dbg
+	dh_strip -plibceguiogre14 --dbg-package=libceguiogre14-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a

More information about the Pkg-games-commits mailing list