[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg2-89-gbcb410f

Andres Mejia mcitadel at gmail.com
Sun Jul 20 04:07:06 UTC 2008 

The following commit has been merged in the master branch:
commit bcb410f1ab8816d32cd758cb7aeb5d62c9451d9c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Jul 19 23:29:18 2008 -0400

      * Fixing debian-watch-file-should-mangle-version lintian warning.
      * Making patches compatible with quilt 3.0.

diff --git a/debian/changelog b/debian/changelog
index 6e3d294..79f800f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ ogre (1.4.8.dfsg2-1) unstable; urgency=low
   * Bumped to Standards-Version 3.8.0.
   * Add get-orig-source rule. Just runs external script.
   * Add note about correct Wings3D homepage in libogre-dev README.Debian file.
+  * Fixing debian-watch-file-should-mangle-version lintian warning.
+  * Making patches compatible with quilt 3.0.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sat, 19 Jul 2008 21:59:38 -0400
+ -- Andres Mejia <mcitadel at gmail.com>  Sat, 19 Jul 2008 23:28:49 -0400
 
 ogre (1.4.8.dfsg1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index a4bf453..c81948c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -428,3 +428,9 @@ Files: PlugIns/OctreeSceneManager/src/OgreOctreeSceneQuery.cpp
 Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
  Copyright (C) 2002 by Jon Anderson <janders at users.sf.net>
 License: LGPL-2.1+
+
+License: LGPL-2.1+
+ See /usr/share/common-licenses/LGPL-2.1
+
+License: LGPL-2+
+ See /usr/share/common-licenses/LGPL-2
diff --git a/debian/patches/change_pkglibdir_path.patch b/debian/patches/change_pkglibdir_path.patch
index 186e77f..8b35698 100644
--- a/debian/patches/change_pkglibdir_path.patch
+++ b/debian/patches/change_pkglibdir_path.patch
@@ -1,7 +1,7 @@
 Install plugins in a directory based on the ogre version
 =====================================================================
---- PlugIns/BSPSceneManager/src/Makefile.am.bak	2008-05-15 15:36:47.000000000 -0400
-+++ PlugIns/BSPSceneManager/src/Makefile.am	2008-05-15 15:38:43.000000000 -0400
+--- a/PlugIns/BSPSceneManager/src/Makefile.am.bak	2008-05-15 15:36:47.000000000 -0400
++++ b/PlugIns/BSPSceneManager/src/Makefile.am	2008-05-15 15:38:43.000000000 -0400
 @@ -1,5 +1,6 @@
  INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/BSPSceneManager/include -I$(top_srcdir)/OgreMain/include
  
@@ -9,8 +9,8 @@ Install plugins in a directory based on the ogre version
  pkglib_LTLIBRARIES = Plugin_BSPSceneManager.la
  
  Plugin_BSPSceneManager_la_SOURCES = OgreBspLevel.cpp \
---- PlugIns/EXRCodec/src/Makefile.am.bak	2008-05-15 15:37:14.000000000 -0400
-+++ PlugIns/EXRCodec/src/Makefile.am	2008-05-15 15:38:50.000000000 -0400
+--- a/PlugIns/EXRCodec/src/Makefile.am.bak	2008-05-15 15:37:14.000000000 -0400
++++ b/PlugIns/EXRCodec/src/Makefile.am	2008-05-15 15:38:50.000000000 -0400
 @@ -1,5 +1,6 @@
  INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/EXRCodec/include -I$(top_srcdir)/OgreMain/include $(OPENEXR_CFLAGS)
  
@@ -18,8 +18,8 @@ Install plugins in a directory based on the ogre version
  pkglib_LTLIBRARIES = Plugin_EXRCodec.la
  
  Plugin_EXRCodec_la_SOURCES = OgreEXRCodec.cpp \
---- PlugIns/OctreeSceneManager/src/Makefile.am.bak	2008-05-15 15:37:32.000000000 -0400
-+++ PlugIns/OctreeSceneManager/src/Makefile.am	2008-05-15 15:38:55.000000000 -0400
+--- a/PlugIns/OctreeSceneManager/src/Makefile.am.bak	2008-05-15 15:37:32.000000000 -0400
++++ b/PlugIns/OctreeSceneManager/src/Makefile.am	2008-05-15 15:38:55.000000000 -0400
 @@ -1,5 +1,6 @@
  INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/OctreeSceneManager/include -I$(top_srcdir)/OgreMain/include -DPLUGIN_TERRAIN_EXPORTS
  
@@ -27,8 +27,8 @@ Install plugins in a directory based on the ogre version
  pkglib_LTLIBRARIES = Plugin_OctreeSceneManager.la
  
  Plugin_OctreeSceneManager_la_SOURCES = \
---- PlugIns/ParticleFX/src/Makefile.am.bak	2008-05-15 15:37:56.000000000 -0400
-+++ PlugIns/ParticleFX/src/Makefile.am	2008-05-15 15:39:18.000000000 -0400
+--- a/PlugIns/ParticleFX/src/Makefile.am.bak	2008-05-15 15:37:56.000000000 -0400
++++ b/PlugIns/ParticleFX/src/Makefile.am	2008-05-15 15:39:18.000000000 -0400
 @@ -1,5 +1,6 @@
  INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/ParticleFX/include -I$(top_srcdir)/OgreMain/include -DPLUGIN_ParticleFX_EXPORTS
  
@@ -36,8 +36,8 @@ Install plugins in a directory based on the ogre version
  pkglib_LTLIBRARIES = Plugin_ParticleFX.la
  
  Plugin_ParticleFX_la_SOURCES = OgreAreaEmitter.cpp \
---- RenderSystems/GL/src/Makefile.am.bak	2008-05-15 16:09:58.000000000 -0400
-+++ RenderSystems/GL/src/Makefile.am	2008-05-15 16:10:24.000000000 -0400
+--- a/RenderSystems/GL/src/Makefile.am.bak	2008-05-15 16:09:58.000000000 -0400
++++ b/RenderSystems/GL/src/Makefile.am	2008-05-15 16:10:24.000000000 -0400
 @@ -9,6 +9,7 @@
  DIST_SUBDIRS = win32 GLX
  SUBDIRS = $(OGRE_GLSUPPORT) nvparse atifs GLSL
@@ -46,8 +46,8 @@ Install plugins in a directory based on the ogre version
  pkglib_LTLIBRARIES = RenderSystem_GL.la
  
  RenderSystem_GL_la_SOURCES = OgreGLEngineDll.cpp \
---- OGRE.pc.in.bak	2008-05-15 16:12:38.000000000 -0400
-+++ OGRE.pc.in	2008-05-15 16:13:57.000000000 -0400
+--- a/OGRE.pc.in.bak	2008-05-15 16:12:38.000000000 -0400
++++ b/OGRE.pc.in	2008-05-15 16:13:57.000000000 -0400
 @@ -2,7 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
diff --git a/debian/patches/disable_samples.diff b/debian/patches/disable_samples.diff
index 808ea3f..9f1aab7 100644
--- a/debian/patches/disable_samples.diff
+++ b/debian/patches/disable_samples.diff
@@ -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
+--- a/acinclude.m4.bak	2007-08-28 22:44:31.000000000 -0400
++++ b/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
+--- a/configure.in.bak    2007-12-30 16:05:11.000000000 -0500
++++ b/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
+--- a/Samples/Common/Makefile.am.bak	2007-08-28 16:27:47.000000000 -0400
++++ b/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
+--- a/Samples/Makefile.am.bak	2007-08-28 16:31:00.000000000 -0400
++++ b/Samples/Makefile.am	2007-08-28 17:05:34.000000000 -0400
 @@ -1,12 +1 @@
  SUBDIRS = Common
 -
diff --git a/debian/patches/fix_distclean.patch b/debian/patches/fix_distclean.patch
index e3fbaf5..5992611 100644
--- a/debian/patches/fix_distclean.patch
+++ b/debian/patches/fix_distclean.patch
@@ -1,8 +1,8 @@
 Fix problem when the same platform and gui are built and an attempt to
 distclean is made.
 =====================================================================
---- OgreMain/include/Makefile.am.bak	2008-05-15 14:39:07.000000000 -0400
-+++ OgreMain/include/Makefile.am	2008-05-15 14:39:32.000000000 -0400
+--- a/OgreMain/include/Makefile.am.bak	2008-05-15 14:39:07.000000000 -0400
++++ b/OgreMain/include/Makefile.am	2008-05-15 14:39:32.000000000 -0400
 @@ -2,6 +2,7 @@
  INCLUDE_SUBDIRS = $(OGRE_GUI)
  endif
diff --git a/debian/patches/fix_rpath.diff b/debian/patches/fix_rpath.diff
index 1ae386a..a45bde8 100644
--- a/debian/patches/fix_rpath.diff
+++ b/debian/patches/fix_rpath.diff
@@ -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
+--- a/OgreMain/src/Makefile.am.bak	2007-08-28 16:53:42.000000000 -0400
++++ b/OgreMain/src/Makefile.am	2007-08-28 17:07:13.000000000 -0400
 @@ -185,7 +185,7 @@
  
  platformdir = $(libdir)
diff --git a/debian/patches/nvidia_fbo_fix.patch b/debian/patches/nvidia_fbo_fix.patch
index d823e67..5a83dbb 100644
--- a/debian/patches/nvidia_fbo_fix.patch
+++ b/debian/patches/nvidia_fbo_fix.patch
@@ -1,7 +1,7 @@
 Patch that fixes problem using nvidia 169.12 drivers on Linux
 =====================================================================
---- RenderSystems/GL/src/OgreGLFBORenderTexture.cpp.bak	2008-05-19 00:52:46.000000000 -0400
-+++ RenderSystems/GL/src/OgreGLFBORenderTexture.cpp	2008-05-19 00:56:12.000000000 -0400
+--- a/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp.bak	2008-05-19 00:52:46.000000000 -0400
++++ b/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp	2008-05-19 00:56:12.000000000 -0400
 @@ -308,7 +308,9 @@
                      {
                          // Packed depth/stencil format
diff --git a/debian/patches/series b/debian/patches/series
index ab433cb..3d5dedd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-disable_samples.diff -p0
-fix_rpath.diff -p0
-fix_distclean.patch -p0
-nvidia_fbo_fix.patch -p0
+disable_samples.diff
+fix_rpath.diff
+fix_distclean.patch
+nvidia_fbo_fix.patch
diff --git a/debian/watch b/debian/watch
index 1ee589c..bff6814 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,12 +2,11 @@
 version=3
 
 # Ogre source download link from sourceforge.net
-opts=uversionmangle=s/\.\?.*// \
+opts=uversionmangle=s/\.\?.*//;s/-/\./g,dversionmangle=s/\.dfsg\d+// \
 http://downloads.sourceforge.net/ogre \
-     http://downloads.sourceforge.net/ogre/ogre-v(.*)\.tar\.bz2(.*) \
-     1-4-8
+     http://downloads.sourceforge.net/ogre/ogre-v(.*)\.tar\.bz2(.*)
 
 # Different check for ogre source, provided by uscan man page
+opts=uversionmangle=s/-/\./g,dversionmangle=s/\.dfsg\d+// \
 http://sf.net/ogre/ \
-     ogre-v(.*)\.tar\.bz2 \
-     1-4-8
+     ogre-v(.*)\.tar\.bz2

-- 
Packaging for ogre

More information about the Pkg-games-commits mailing list