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

Andres Mejia ceros-guest at alioth.debian.org
Fri Jun 8 06:05:29 UTC 2007 

Author: ceros-guest
Date: 2007-06-08 06:05:28 +0000 (Fri, 08 Jun 2007)
New Revision: 2877

Modified:
   packages/trunk/ogre/debian/blender-ogrexml.docs
   packages/trunk/ogre/debian/blender-ogrexml.install
   packages/trunk/ogre/debian/changelog
   packages/trunk/ogre/debian/control
   packages/trunk/ogre/debian/docs
   packages/trunk/ogre/debian/ogre-doc.docs
   packages/trunk/ogre/debian/patches/disable_samples.dpatch
   packages/trunk/ogre/debian/patches/gcc_mips.dpatch
   packages/trunk/ogre/debian/patches/remove_rpath.dpatch
   packages/trunk/ogre/debian/rules
Log:
Updating debian files to address lintian errors and other potential policy violations.

Modified: packages/trunk/ogre/debian/blender-ogrexml.docs
===================================================================
--- packages/trunk/ogre/debian/blender-ogrexml.docs	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/blender-ogrexml.docs	2007-06-08 06:05:28 UTC (rev 2877)
@@ -1,4 +1,4 @@
-ogrenew/BUGS
-ogrenew/LINUX.DEV
-ogrenew/Docs/README.linux
-ogrenew/Tools/BlenderExport/ogrehelp/*
+ogre-free/BUGS
+ogre-free/LINUX.DEV
+ogre-free/Docs/README.linux
+ogre-free/Tools/BlenderExport/ogrehelp/*

Modified: packages/trunk/ogre/debian/blender-ogrexml.install
===================================================================
--- packages/trunk/ogre/debian/blender-ogrexml.install	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/blender-ogrexml.install	2007-06-08 06:05:28 UTC (rev 2877)
@@ -1,2 +1,2 @@
-ogrenew/Tools/BlenderExport/ogremeshesexporter.py usr/lib/blender/scripts
-ogrenew/Tools/BlenderExport/ogrepkg usr/lib/blender/scripts
+ogre-free/Tools/BlenderExport/ogremeshesexporter.py usr/lib/blender/scripts
+ogre-free/Tools/BlenderExport/ogrepkg usr/lib/blender/scripts

Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/changelog	2007-06-08 06:05:28 UTC (rev 2877)
@@ -9,6 +9,14 @@
   * lib packages will be name libogre14 to reflect upstream version of 1.4.x.
   * No longer using dbs.
   * Using dpatch for patching.
+  * Modified Build-Depends.
+    + Taking out dependency on xorg metapackage as it breaks policy.
+  * Modified patches to disable building of non-distributable samples only.
+  * Repackaged tarball as ogre-free.
+    + Only including distributable content in tarball.
+    + Taking out autocache folders distributed in upstream source.
+    + Taking out Mac folder as it is not needed for Debian build.
+    + Taking out SDK folder as it is only useful for building for Windows.
 
  -- Andres Mejia <mcitadel at gmail.com>  Wed,  6 Jun 2007 16:54:01 -0400
 

Modified: packages/trunk/ogre/debian/control
===================================================================
--- packages/trunk/ogre/debian/control	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/control	2007-06-08 06:05:28 UTC (rev 2877)
@@ -2,7 +2,7 @@
 Priority: optional
 Section: libs
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libfreeimage-dev | libdevil-dev, libfreetype6-dev, libjpeg62-dev, liblcms1-dev, libmng-dev, libpng-dev, libtiff-dev, zlib1g-dev, libopenexr-dev, libx11-dev, libxrandr-dev, libxt-dev, libxxf86vm-dev, xorg-dev, texi2html, libtool, automake, autoconf, pkg-config, libxaw7-dev, libsdl1.2-dev, libzzip-dev, libcegui-mk2-dev, libois-dev, libstlport5.1-dev
+Build-Depends: debhelper (>= 5), dpatch, texi2html, libtool, automake | automake1.7, autoconf, pkg-config, libfreeimage-dev | libdevil-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev, libois-dev, libstlport5.1-dev, libzzip-dev, libglu1-mesa-dev, libgl1-mesa-dev, libxext-dev, libxrandr-dev, libxxf86vm-dev, libx11-dev, libxaw7-dev, libxt-dev, zlib1g-dev
 Standards-Version: 3.7.2
 
 Package: libogre14

Modified: packages/trunk/ogre/debian/docs
===================================================================
--- packages/trunk/ogre/debian/docs	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/docs	2007-06-08 06:05:28 UTC (rev 2877)
@@ -1,3 +1,3 @@
-ogrenew/BUGS
-ogrenew/LINUX.DEV
-ogrenew/Docs/README.linux
+ogre-free/BUGS
+ogre-free/LINUX.DEV
+ogre-free/Docs/README.linux

Modified: packages/trunk/ogre/debian/ogre-doc.docs
===================================================================
--- packages/trunk/ogre/debian/ogre-doc.docs	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/ogre-doc.docs	2007-06-08 06:05:28 UTC (rev 2877)
@@ -1,15 +1,15 @@
-ogrenew/BUGS
-ogrenew/LINUX.DEV
-ogrenew/Docs/ChangeLog.html
-ogrenew/Docs/CodingStandards.html
-ogrenew/Docs/ContributorLicenseAgreement.html
-ogrenew/Docs/ogre-logo.gif
-ogrenew/Docs/ReadMe.html
-ogrenew/Docs/README.linux
-ogrenew/Docs/style.css
-ogrenew/Docs/api
-ogrenew/Docs/licenses
-ogrenew/Docs/manual
-ogrenew/Docs/Readme
-ogrenew/Docs/shadows
-ogrenew/Docs/vbo-update
+ogre-free/BUGS
+ogre-free/LINUX.DEV
+ogre-free/Docs/ChangeLog.html
+ogre-free/Docs/CodingStandards.html
+ogre-free/Docs/ContributorLicenseAgreement.html
+ogre-free/Docs/ogre-logo.gif
+ogre-free/Docs/ReadMe.html
+ogre-free/Docs/README.linux
+ogre-free/Docs/style.css
+ogre-free/Docs/api
+ogre-free/Docs/licenses
+ogre-free/Docs/manual
+ogre-free/Docs/Readme
+ogre-free/Docs/shadows
+ogre-free/Docs/vbo-update

Modified: packages/trunk/ogre/debian/patches/disable_samples.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.dpatch	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/patches/disable_samples.dpatch	2007-06-08 06:05:28 UTC (rev 2877)
@@ -2,7 +2,7 @@
 ## disable_samples.dpatch by Federico Di Gregorio <fog at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disabling build of ogre samples.
+## DP: Disabling build of non-distributable samples.
 
 dir=
 if [ $# -eq 3 -a "$2" = '-d' ]; then
@@ -25,8 +25,8 @@
 esac
 exit 0
 
---- ogrenew/acinclude.m4~	2007-04-27 12:37:44.000000000 -0400
-+++ ogrenew/acinclude.m4	2007-05-27 20:26:47.000000000 -0400
+--- ogre-free/acinclude.m4~	2007-04-27 12:37:44.000000000 -0400
++++ ogre-free/acinclude.m4	2007-05-27 20:26:47.000000000 -0400
 @@ -450,14 +450,12 @@
          AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \
                           Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc
@@ -45,14 +45,12 @@
      fi
      AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
  ])
---- ogrenew/configure.in~	2007-05-06 04:39:05.000000000 -0400
-+++ ogrenew/configure.in	2007-05-27 20:35:53.000000000 -0400
-@@ -139,88 +139,6 @@
-     RenderSystems/Direct3D9/Makefile \
-     RenderSystems/Direct3D9/src/Makefile \
+--- 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 @@
      RenderSystems/Direct3D9/include/Makefile \
--    Samples/Makefile \
--    Samples/Common/Makefile \
+     Samples/Makefile \
+     Samples/Common/Makefile \
 -    Samples/Common/include/Makefile \
 -    Samples/Common/bin/Makefile \
 -    Samples/BezierPatch/Makefile \
@@ -136,16 +134,8 @@
      Tests/Makefile \
      Tests/src/Makefile \
      Tools/Makefile \
---- ogrenew/Makefile.am~	2007-05-27 20:37:43.000000000 -0400
-+++ ogrenew/Makefile.am	2007-05-27 20:38:01.000000000 -0400
-@@ -1,4 +1,4 @@
--SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests
-+SUBDIRS = OgreMain PlugIns RenderSystems Tools Tests
- ACLOCAL_AMFLAGS = -I Scripts/m4
- AUTOMAKE_OPTIONS = foreign
- 
---- ogrenew/Samples/Common/Makefile.am~	2006-02-02 23:04:39.000000000 -0500
-+++ ogrenew/Samples/Common/Makefile.am	2007-05-27 20:39:54.000000000 -0400
+--- ogre-free/Samples/Common/Makefile.am~	2006-02-02 23:04:39.000000000 -0500
++++ ogre-free/Samples/Common/Makefile.am	2007-05-27 20:39:54.000000000 -0400
 @@ -1,5 +1 @@
 -SUBDIRS = include bin
 -
@@ -153,8 +143,8 @@
 -SUBDIRS += CEGUIRenderer
 -endif
 +SUBDIRS = CEGUIRenderer
---- ogrenew/Samples/Makefile.am~	2007-02-02 15:14:24.000000000 -0500
-+++ ogrenew/Samples/Makefile.am	2007-05-27 20:41:00.000000000 -0400
+--- ogre-free/Samples/Makefile.am~	2007-02-02 15:14:24.000000000 -0500
++++ ogre-free/Samples/Makefile.am	2007-05-27 20:41:00.000000000 -0400
 @@ -1,12 +1 @@
  SUBDIRS = Common
 -

Modified: packages/trunk/ogre/debian/patches/gcc_mips.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/gcc_mips.dpatch	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/patches/gcc_mips.dpatch	2007-06-08 06:05:28 UTC (rev 2877)
@@ -25,8 +25,8 @@
 esac
 exit 0
 
---- ogrenew/OgreMain/src/OgreMaterialSerializer.cpp~	2007-05-27 20:24:06.000000000 -0400
-+++ ogrenew/OgreMain/src/OgreMaterialSerializer.cpp	2007-03-23 13:25:26.000000000 -0400
+--- ogre-free/OgreMain/src/OgreMaterialSerializer.cpp~	2007-05-27 20:24:06.000000000 -0400
++++ ogre-free/OgreMain/src/OgreMaterialSerializer.cpp	2007-03-23 13:25:26.000000000 -0400
 @@ -759,7 +759,7 @@
                  context);
          }

Modified: packages/trunk/ogre/debian/patches/remove_rpath.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/remove_rpath.dpatch	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/patches/remove_rpath.dpatch	2007-06-08 06:05:28 UTC (rev 2877)
@@ -25,8 +25,8 @@
 esac
 exit 0
 
---- ogrenew/OgreMain/src/Makefile.am~	2007-04-23 12:36:07.000000000 -0400
-+++ ogrenew/OgreMain/src/Makefile.am	2007-05-27 20:47:05.000000000 -0400
+--- 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)

Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules	2007-06-08 00:32:54 UTC (rev 2876)
+++ packages/trunk/ogre/debian/rules	2007-06-08 06:05:28 UTC (rev 2877)
@@ -26,7 +26,7 @@
 
 unpack: unpack-stamp
 unpack-stamp:
-	tar -xvzf ogrenew.tar.gz
+	tar -xvzf ogre-free.tar.gz
 	touch unpack-stamp
 
 # Using dpatch for patching.
@@ -35,7 +35,7 @@
 configure: unpack patch configure-stamp
 configure-stamp:
 	dh_testdir
-	cd ogrenew && \
+	cd ogre-free && \
 	./bootstrap && \
 	./configure --prefix=/usr \
 	    --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -47,14 +47,14 @@
 build: configure build-stamp
 build-stamp:
 	dh_testdir
-	cd ogrenew && $(MAKE)
+	cd ogre-free && $(MAKE)
 	touch build-stamp
 
 clean: unpatch clean-stamp
 clean-stamp:
 	dh_testdir
 	dh_testroot
-	rm -rf ogrenew
+	rm -rf ogre-free
 	rm -f unpack-stamp configure-stamp build-stamp
 	dh_clean
 
@@ -63,7 +63,7 @@
 	dh_testroot
 	dh_clean -k
 	install -d debian/tmp
-	cd ogrenew && $(MAKE) install DESTDIR=$(PWD)/debian/tmp
+	cd ogre-free && $(MAKE) install DESTDIR=$(PWD)/debian/tmp
 	ldconfig -n debian/tmp/usr/lib
 
 # Build architecture-independent files here.
@@ -73,11 +73,12 @@
 	dh_installdocs -pogre-doc -X*.dot -X*.md5
 	dh_installdocs -pblender-ogrexml
 	dh_install -i
-	dh_installchangelogs -i -Nogre-doc ogrenew/Docs/ChangeLog.html
+	dh_installchangelogs -i -Nogre-doc ogre-free/Docs/ChangeLog.html
 	dh_installchangelogs -pogre-doc
 	dh_installdocs -i
 	dh_fixperms -i
-	dh_compress -i
+	dh_compress -pogre-doc -X.txt
+	dh_compress -pblender-ogrexml
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
@@ -94,7 +95,7 @@
 	   install -m 755 debian/extras/update-ogre-plugins \
 	   debian/tmp/usr/sbin/update-ogre-plugins
 	dh_install -a --sourcedir=debian/tmp
-	dh_installchangelogs -a ogrenew/Docs/ChangeLog.html
+	dh_installchangelogs -a ogre-free/Docs/ChangeLog.html
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installman -a

More information about the Pkg-games-commits mailing list