The following commit has been merged in the master branch: commit 3663da62f953222ff25edea76ea6864da2775630 Author: Andres Mejia <[EMAIL PROTECTED]> Date: Sun May 18 17:08:04 2008 -0400
Don't place plugins in directory based on ogre version. diff --git a/debian/blender-ogrexml.README.Debian b/debian/blender-ogrexml.README.Debian index 7df0b0f..b8db888 100644 --- a/debian/blender-ogrexml.README.Debian +++ b/debian/blender-ogrexml.README.Debian @@ -4,15 +4,15 @@ Ogre's Blender export plugin On a Debian GNU/Linux system Blender python scripts live in the directory /usr/lib/blender/scripts/ - + and are linked to the user's private scripts directory the first time Blender is run and after each upgrade. Until this procedure is changed (there is a patch pending) the two steps detailed below should be executed to make the Ogre export script available in Blender: 1/ ln -sf /usr/lib/blender/scripts/ogreexport.py $HOME/.blender/scripts/ - + 2/ Run Blender and then from a Scripts Window use the Scripts->Update Menus menu item. - + After that "Ogre XML" will be available from the File->Export menu. diff --git a/debian/changelog b/debian/changelog index 9afeb45..1cbb3d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,10 +15,9 @@ ogre (1.4.8.dfsg1-1) unstable; urgency=low * Place update-ogre-plugins in /usr/bin instead of /usr/sbin. * Added 'DM-Upload-Allowed: yes' field. * Fix patches. - * Install plugins in a directory based on the upstream version of ogre. * Allow some files to be slightly autogenerated based on the version of ogre that's being built. - * Convert to git repository. + * Convert to git repository for packaging. -- Andres Mejia <[EMAIL PROTECTED]> Fri, 16 May 2008 19:43:38 -0400 diff --git a/debian/extras/plugins-VERSION.cfg b/debian/extras/plugins-VERSION.cfg deleted file mode 100644 index 5c936a1..0000000 --- a/debian/extras/plugins-VERSION.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/OGRE/[EMAIL PROTECTED]@.cfg - ogre plugins installed on Debian systems -# -# Warning: this file is autogenerated but anything between this line and -# the line saying "-*- ogre-plugins -*-" will be copied as-is on updates. - -PluginFolder=/usr/lib/[EMAIL PROTECTED]@ - -# default plugins installed with the [EMAIL PROTECTED]@ package. -Plugin=RenderSystem_GL.so -Plugin=Plugin_ParticleFX.so -Plugin=Plugin_BSPSceneManager.so -Plugin=Plugin_OctreeSceneManager.so -Plugin=Plugin_EXRCodec.so - -# Don't edit anything starting from next line; it was autogenerated. -# -*- ogre-plugins -*- [Please, don't remove or modify this marker] diff --git a/debian/extras/plugins.cfg b/debian/extras/plugins.cfg new file mode 100644 index 0000000..af6b264 --- /dev/null +++ b/debian/extras/plugins.cfg @@ -0,0 +1,16 @@ +# /etc/OGRE/plugins.cfg - ogre plugins installed on Debian systems +# +# Warning: this file is autogenerated but anything between this line and +# the line saying "-*- ogre-plugins -*-" will be copied as-is on updates. + +PluginFolder=/usr/lib/OGRE + +# default plugins installed with the libogremain package. +Plugin=RenderSystem_GL.so +Plugin=Plugin_ParticleFX.so +Plugin=Plugin_BSPSceneManager.so +Plugin=Plugin_OctreeSceneManager.so +Plugin=Plugin_EXRCodec.so + +# Don't edit anything starting from next line; it was autogenerated. +# -*- ogre-plugins -*- [Please, don't remove or modify this marker] diff --git a/debian/extras/update-ogre-plugins b/debian/extras/update-ogre-plugins new file mode 100755 index 0000000..f612825 --- /dev/null +++ b/debian/extras/update-ogre-plugins @@ -0,0 +1,35 @@ +#!/bin/sh + +# This script is used to update the plugins configuration files. + +USAGE="\n\ +This script is used to update the plugins configuration file. It takes no\n\ +options.\n\ +Usage: update-ogre-plugins\n\ +\n" + +while [ "$#" -gt "0" ] +do + case "$1" in + *) + echo "${USAGE}" + exit 1 + ;; + esac +done + +echo "Updating /etc/OGRE/plugins.cfg." +sed -e '/# -\*- ogre-plugins -\*-/ q' \ + /etc/OGRE/plugins.cfg \ + >/etc/OGRE/plugins.cfg-new + +PARTS="`ls 2>/dev/null /etc/OGRE/plugins.cfg.*`" +for f in $PARTS ; do + if [ -z "`echo $f | grep dpkg`" ] ; then + echo Adding $f + cat $f >>/etc/OGRE/plugins.cfg-new + fi +done + +mv /etc/OGRE/plugins.cfg-new /etc/OGRE/plugins.cfg + diff --git a/debian/extras/update-ogre-plugins.1 b/debian/extras/update-ogre-plugins.1 index 019fbe5..205e7c5 100644 --- a/debian/extras/update-ogre-plugins.1 +++ b/debian/extras/update-ogre-plugins.1 @@ -22,26 +22,14 @@ update-ogre-plugins \- rebuild /etc/OGRE/plugins-<version>.cfg .br .SH DESCRIPTION \fBupdate-ogre-plugins\fP uses the information placed by Ogre plugin -packages in /etc/OGRE to build the plugins-<version>.cfg configuration file, +packages in /etc/OGRE to build the plugins.cfg configuration file, used by the Ogre system to locate and load plugins' shared libraries. .PP An application can provide its own plugins.cfg file but -/etc/OGRE/plugins-<version>.cfg is the official list of all installed plugins. -.PP -The <version> indicates a particular version of the plugins file this script -updates. By default, it will update the latest version of the plugins -configuration file. +/etc/OGRE/plugins.cfg is the official list of all installed plugins. .SH OPTIONS -Options processed by the script: -.TP -\fB\-h\fR, \fB\-\-help\fR -Display a short help summary -.TP -\fB\-v VERSION\fR, \fB\-\-version=VERSION\fR -Update the file /etc/OGRE/plugins-\fIVERSION\fR.cfg -.TP -\fB\-s\fR, \fB\-\-show\fR -Show the default version of this script will use. +This script does not take any options, yet supplying an option would display a +help message. .SH AUTHOR This manual page was written by Federico Di Gregorio <[EMAIL PROTECTED]> for the Debian GNU/Linux system, but may be used by others. diff --git a/debian/extras/update-ogre-plugins.in b/debian/extras/update-ogre-plugins.in deleted file mode 100755 index 1b47183..0000000 --- a/debian/extras/update-ogre-plugins.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# This script is used to update the plugins configuration files. - -USAGE="\n\ -This script is used to update the plugins configuration file. It updates the\n\ -latest plugins configuration file by default, but a specific version can be\n\ -selected as well. This script can also display the default version it uses.\n\ -Usage: update-ogre-plugins [OPTION]\n\ -\n\ - -h, --help Display this help message.\n\ - -v VERSION, --version=VERSION Select the version to use.\n\ - -s, --show Show the default version.\n" - -OGRE_VERSION="@VERSION@" - -while [ "$#" -gt "0" ] -do - case "$1" in - -v) - OGRE_VERSION="$2" - break - ;; - --version=*) - OGRE_VERSION=$(echo "$1" | sed 's/--version=//') - break - ;; - -s|--show) - echo $OGRE_VERSION - exit 0 - ;; - -h|--help|*) - echo "${USAGE}" - exit 1 - ;; - esac -done - -if [ -f /etc/OGRE/plugins-$OGRE_VERSION.cfg ]; then - echo "Updating /etc/OGRE/plugins-$OGRE_VERSION.cfg." - sed -e '/# -\*- ogre-plugins -\*-/ q' \ - /etc/OGRE/plugins-$OGRE_VERSION.cfg \ - >/etc/OGRE/plugins-$OGRE_VERSION.cfg-new - - PARTS="`ls 2>/dev/null /etc/OGRE/plugins-$OGRE_VERSION.cfg.*`" - for f in $PARTS ; do - if [ -z "`echo $f | grep dpkg`" ] ; then - echo Adding $f - cat $f >>/etc/OGRE/plugins-$OGRE_VERSION.cfg-new - fi - done - - mv /etc/OGRE/plugins-$OGRE_VERSION.cfg-new /etc/OGRE/plugins-$OGRE_VERSION.cfg -else - echo "/etc/OGRE/plugins-$OGRE_VERSION.cfg doesn't exist or is not a file." - exit 1 -fi diff --git a/debian/libogremain-VERSION.install b/debian/libogremain-VERSION.install index 583da92..31d4078 100644 --- a/debian/libogremain-VERSION.install +++ b/debian/libogremain-VERSION.install @@ -1,5 +1,5 @@ usr/lib/libOgreMain-*.so -usr/lib/[EMAIL PROTECTED]@/*.so -usr/lib/[EMAIL PROTECTED]@/*.la +usr/lib/OGRE/*.so +usr/lib/OGRE/*.la usr/bin/update-ogre-plugins etc/OGRE/*.cfg diff --git a/debian/patches/series b/debian/patches/series index 2d1a826..189d657 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ disable_samples.diff -p0 fix_rpath.diff -p0 -change_pkglibdir_path.patch -p0 fix_distclean.patch -p0 diff --git a/debian/rules b/debian/rules index e51a942..6f50b60 100755 --- a/debian/rules +++ b/debian/rules @@ -47,22 +47,12 @@ OGRE_CONFIG_OPTIONS ?= $(confflags) \ build-setup: build-setup-stamp build-setup-stamp: dh_testdir - cp -f debian/extras/update-ogre-plugins.in debian/extras/update-ogre-plugins - cp -f debian/extras/ogre-plugins-config.in debian/extras/ogre-plugins-config - cp -f debian/extras/plugins-VERSION.cfg \ - debian/extras/plugins-$(OGRE_VERSION).cfg cp -f debian/libceguiogrerenderer-VERSION.install \ debian/libceguiogrerenderer-$(OGRE_VERSION).install cp -f debian/libogremain-VERSION.install \ debian/libogremain-$(OGRE_VERSION).install cp -f debian/libogremain-VERSION.manpages \ debian/libogremain-$(OGRE_VERSION).manpages - sed -i 's/@VERSION@/$(OGRE_VERSION)/g' debian/extras/update-ogre-plugins - sed -i 's/@VERSION@/$(OGRE_VERSION)/g' debian/extras/ogre-plugins-config - sed -i 's/@VERSION@/$(OGRE_VERSION)/g' \ - debian/extras/plugins-$(OGRE_VERSION).cfg - sed -i 's/@VERSION@/$(OGRE_VERSION)/g' \ - debian/libogremain-$(OGRE_VERSION).install patch: patch-stamp patch-stamp: @@ -104,10 +94,7 @@ unpatch: reverse-build-setup: dh_testdir - rm -f debian/extras/update-ogre-plugins \ - debian/extras/ogre-plugins-config \ - debian/extras/plugins-$(OGRE_VERSION).cfg \ - debian/libceguiogrerenderer-$(OGRE_VERSION).install \ + rm -f debian/libceguiogrerenderer-$(OGRE_VERSION).install \ debian/libogremain-$(OGRE_VERSION).install \ debian/libogremain-$(OGRE_VERSION).manpages @@ -117,6 +104,11 @@ install: build dh_clean -k install -d debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + install -d debian/tmp/etc/OGRE + install -m 644 debian/extras/plugins.cfg debian/tmp/etc/OGRE + install -d debian/tmp/usr/bin + install -m 755 debian/extras/update-ogre-plugins \ + debian/tmp/usr/bin/update-ogre-plugins # Build architecture-independent files here. binary-indep: install @@ -126,7 +118,6 @@ binary-indep: install dh_installdocs -pogre-doc -X*.dot -X*.md5 -X*.tmp dh_install -i -Nlibogre-dev -Nlibceguiogre-dev dh_install -plibogre-dev -XCEGUI --sourcedir=debian/tmp - dh_installman -plibogre-dev debian/extras/ogre-plugins-config.1 dh_install -plibceguiogre-dev --sourcedir=debian/tmp dh_installchangelogs -i -Nogre-doc Docs/ChangeLog.html dh_installchangelogs -pogre-doc @@ -144,14 +135,6 @@ binary-indep: install binary-arch: install dh_testdir dh_testroot - install -d debian/tmp/etc/OGRE - install -m 644 debian/extras/plugins-$(OGRE_VERSION).cfg debian/tmp/etc/OGRE - ln -s plugins-$(OGRE_VERSION).cfg debian/tmp/etc/OGRE/plugins.cfg - install -d debian/tmp/usr/bin && \ - install -m 755 debian/extras/update-ogre-plugins \ - debian/tmp/usr/bin/update-ogre-plugins - install -m 755 debian/extras/ogre-plugins-config \ - debian/tmp/usr/bin/ogre-plugins-config dh_install -a --sourcedir=debian/tmp dh_installchangelogs -a Docs/ChangeLog.html dh_installdocs -a -- Packaging for ogre _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits