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

[Andres Mejia]

Author: ceros-guest
Date: 2008-05-15 18:37:32 +0000 (Thu, 15 May 2008)
New Revision: 7052

Modified:
   packages/trunk/ogre/debian/changelog
   packages/trunk/ogre/debian/patches/disable_samples.diff
   packages/trunk/ogre/debian/patches/fix_rpath.diff
   packages/trunk/ogre/debian/patches/series
Log:
Fix patches

Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog	2008-05-15 18:24:40 UTC (rev 7051)
+++ packages/trunk/ogre/debian/changelog	2008-05-15 18:37:32 UTC (rev 7052)
@@ -14,6 +14,7 @@
   * No longer providing ogre-tools-dbg. 'nostrip' option will be used instead.
   * Place update-ogre-plugins in /usr/bin instead of /usr/sbin.
   * Added 'DM-Upload-Allowed: yes' field.
+  * Fix patches.
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 27 Mar 2008 13:42:44 -0400
 

Modified: packages/trunk/ogre/debian/patches/disable_samples.diff
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.diff	2008-05-15 18:24:40 UTC (rev 7051)
+++ packages/trunk/ogre/debian/patches/disable_samples.diff	2008-05-15 18:37:32 UTC (rev 7052)
@@ -1,5 +1,5 @@
---- ./acinclude.m4.bak	2007-08-28 22:44:31.000000000 -0400
-+++ ./acinclude.m4	2007-08-28 22:53:48.000000000 -0400
+--- acinclude.m4.bak	2007-08-28 22:44:31.000000000 -0400
++++ acinclude.m4	2007-08-28 22:53:48.000000000 -0400
 @@ -450,14 +450,12 @@
          AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \
                           Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc
@@ -18,8 +18,8 @@
      fi
      AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
  ])
---- ./configure.in.bak    2007-12-30 16:05:11.000000000 -0500
-+++ ./configure.in        2007-12-30 16:06:36.000000000 -0500
+--- configure.in.bak    2007-12-30 16:05:11.000000000 -0500
++++ configure.in        2007-12-30 16:06:36.000000000 -0500
 @@ -154,86 +154,6 @@
      RenderSystems/Direct3D9/include/Makefile \
      Samples/Makefile \
@@ -115,8 +115,8 @@
  echo "    Build CEGUI demos               : $build_cegui_sample"
  echo "    Build the OpenEXR plugin        : $build_exr"
  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
+--- 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,5 @@
 -SUBDIRS = include bin
 -
@@ -126,8 +126,8 @@
 +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
+--- 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 @@
  SUBDIRS = Common
 -

Modified: packages/trunk/ogre/debian/patches/fix_rpath.diff
===================================================================
--- packages/trunk/ogre/debian/patches/fix_rpath.diff	2008-05-15 18:24:40 UTC (rev 7051)
+++ packages/trunk/ogre/debian/patches/fix_rpath.diff	2008-05-15 18:37:32 UTC (rev 7052)
@@ -1,5 +1,5 @@
---- ./OgreMain/src/Makefile.am.bak	2007-08-28 16:53:42.000000000 -0400
-+++ ./OgreMain/src/Makefile.am	2007-08-28 17:07:13.000000000 -0400
+--- OgreMain/src/Makefile.am.bak	2007-08-28 16:53:42.000000000 -0400
++++ OgreMain/src/Makefile.am	2007-08-28 17:07:13.000000000 -0400
 @@ -185,7 +185,7 @@
  
  platformdir = $(libdir)

Modified: packages/trunk/ogre/debian/patches/series
===================================================================
--- packages/trunk/ogre/debian/patches/series	2008-05-15 18:24:40 UTC (rev 7051)
+++ packages/trunk/ogre/debian/patches/series	2008-05-15 18:37:32 UTC (rev 7052)
@@ -1,3 +1,3 @@
-disable_samples.diff
-fix_rpath.diff
+disable_samples.diff -p0
+fix_rpath.diff -p0
 change_pkglibdir_path.patch -p0