Author: ceros-guest
Date: 2008-05-16 23:43:58 +0000 (Fri, 16 May 2008)
New Revision: 7080
Added:
packages/trunk/ogre/debian/extras/ogre-plugins-config.in
packages/trunk/ogre/debian/extras/plugins-VERSION.cfg
packages/trunk/ogre/debian/extras/update-ogre-plugins.in
packages/trunk/ogre/debian/libceguiogrerenderer-VERSION.install
packages/trunk/ogre/debian/libogremain-VERSION.install
packages/trunk/ogre/debian/libogremain-VERSION.manpages
Removed:
packages/trunk/ogre/debian/extras/plugins.cfg
packages/trunk/ogre/debian/extras/update-ogre-plugins
packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install
packages/trunk/ogre/debian/libogremain-1.4.8.install
packages/trunk/ogre/debian/libogremain-1.4.8.manpages
Modified:
packages/trunk/ogre/debian/changelog
packages/trunk/ogre/debian/libogre-dev.install
packages/trunk/ogre/debian/rules
Log:
* Allow some files to be slightly autogenerated based on the version of ogre
that's being built.
Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog 2008-05-16 19:27:20 UTC (rev
7079)
+++ packages/trunk/ogre/debian/changelog 2008-05-16 23:43:58 UTC (rev
7080)
@@ -16,8 +16,10 @@
* 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.
- -- Andres Mejia <[EMAIL PROTECTED]> Thu, 27 Mar 2008 13:42:44 -0400
+ -- Andres Mejia <[EMAIL PROTECTED]> Fri, 16 May 2008 19:43:38 -0400
ogre (1.4.6.dfsg1-1) unstable; urgency=low
Added: packages/trunk/ogre/debian/extras/ogre-plugins-config.in
===================================================================
--- packages/trunk/ogre/debian/extras/ogre-plugins-config.in
(rev 0)
+++ packages/trunk/ogre/debian/extras/ogre-plugins-config.in 2008-05-16
23:43:58 UTC (rev 7080)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# This script is used to find the correct plugins configuration file that is
+# installed in a particular version of ogre. This file is automatically
+# generated during a build of ogre.
+
+USAGE="\n\
+This script is used to find the correct plugins configuration file that is\n\
+installed by a particular version of ogre.\n\
+Usage: ogre-plugins-config [OPTION]\n\
+\n\
+ -h, --help Display this help message.\n\
+ -f, --plugins-file Keep the upstream source tarball.\n\
+ -p, --plugins-file-path Keep the generated orig directory.\n"
+
+if [ "$#" = "0" ]; then
+ echo "${USAGE}"
+ exit 1
+fi
+while [ "$#" -gt "0" ]
+do
+ case "$1" in
+ -f|--plugins-file)
+ echo "[EMAIL PROTECTED]@.cfg"
+ exit 0
+ ;;
+ -p|--plugins-file-path)
+ echo "/etc/OGRE/[EMAIL PROTECTED]@.cfg"
+ exit 0
+ ;;
+ -h|--help|*)
+ echo "${USAGE}"
+ exit 1
+ ;;
+ esac
+done
Property changes on: packages/trunk/ogre/debian/extras/ogre-plugins-config.in
___________________________________________________________________
Name: svn:executable
+ *
Copied: packages/trunk/ogre/debian/extras/plugins-VERSION.cfg (from rev 7057,
packages/trunk/ogre/debian/extras/plugins.cfg)
===================================================================
--- packages/trunk/ogre/debian/extras/plugins-VERSION.cfg
(rev 0)
+++ packages/trunk/ogre/debian/extras/plugins-VERSION.cfg 2008-05-16
23:43:58 UTC (rev 7080)
@@ -0,0 +1,16 @@
+# /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]
Deleted: packages/trunk/ogre/debian/extras/plugins.cfg
===================================================================
--- packages/trunk/ogre/debian/extras/plugins.cfg 2008-05-16 19:27:20 UTC
(rev 7079)
+++ packages/trunk/ogre/debian/extras/plugins.cfg 2008-05-16 23:43:58 UTC
(rev 7080)
@@ -1,16 +0,0 @@
-# /etc/OGRE/plugins.cfg - ogre plugins installed on Debian GNU/Linux 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 libogre14 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]
Deleted: packages/trunk/ogre/debian/extras/update-ogre-plugins
===================================================================
--- packages/trunk/ogre/debian/extras/update-ogre-plugins 2008-05-16
19:27:20 UTC (rev 7079)
+++ packages/trunk/ogre/debian/extras/update-ogre-plugins 2008-05-16
23:43:58 UTC (rev 7080)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-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
Copied: packages/trunk/ogre/debian/extras/update-ogre-plugins.in (from rev
7057, packages/trunk/ogre/debian/extras/update-ogre-plugins)
===================================================================
--- packages/trunk/ogre/debian/extras/update-ogre-plugins.in
(rev 0)
+++ packages/trunk/ogre/debian/extras/update-ogre-plugins.in 2008-05-16
23:43:58 UTC (rev 7080)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+sed -e '/# -\*- ogre-plugins -\*-/ q' \
+ /etc/OGRE/[EMAIL PROTECTED]@.cfg >/etc/OGRE/[EMAIL PROTECTED]@.cfg-new
+
+PARTS="`ls 2>/dev/null /etc/OGRE/[EMAIL PROTECTED]@.cfg.*`"
+for f in $PARTS ; do
+ if [ -z "`echo $f | grep dpkg`" ] ; then
+ echo Adding $f
+ cat $f >>/etc/OGRE/[EMAIL PROTECTED]@.cfg-new
+ fi
+done
+
+mv /etc/OGRE/[EMAIL PROTECTED]@.cfg-new /etc/OGRE/[EMAIL PROTECTED]@.cfg
Deleted: packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install
===================================================================
--- packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install
2008-05-16 19:27:20 UTC (rev 7079)
+++ packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install
2008-05-16 23:43:58 UTC (rev 7080)
@@ -1 +0,0 @@
-usr/lib/libCEGUIOgreRenderer-*.so
Copied: packages/trunk/ogre/debian/libceguiogrerenderer-VERSION.install (from
rev 7057, packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install)
===================================================================
--- packages/trunk/ogre/debian/libceguiogrerenderer-VERSION.install
(rev 0)
+++ packages/trunk/ogre/debian/libceguiogrerenderer-VERSION.install
2008-05-16 23:43:58 UTC (rev 7080)
@@ -0,0 +1 @@
+usr/lib/libCEGUIOgreRenderer-*.so
Modified: packages/trunk/ogre/debian/libogre-dev.install
===================================================================
--- packages/trunk/ogre/debian/libogre-dev.install 2008-05-16 19:27:20 UTC
(rev 7079)
+++ packages/trunk/ogre/debian/libogre-dev.install 2008-05-16 23:43:58 UTC
(rev 7080)
@@ -1,3 +1,4 @@
+usr/bin/ogre-plugins-config
usr/include/*
usr/lib/libOgreMain.so
usr/lib/libOgreMain.la
Deleted: packages/trunk/ogre/debian/libogremain-1.4.8.install
===================================================================
--- packages/trunk/ogre/debian/libogremain-1.4.8.install 2008-05-16
19:27:20 UTC (rev 7079)
+++ packages/trunk/ogre/debian/libogremain-1.4.8.install 2008-05-16
23:43:58 UTC (rev 7080)
@@ -1,5 +0,0 @@
-usr/lib/libOgreMain-*.so
-usr/lib/OGRE-1.4.8/*.so
-usr/lib/OGRE-1.4.8/*.la
-usr/bin/update-ogre-plugins
-etc/OGRE/*.cfg
Deleted: packages/trunk/ogre/debian/libogremain-1.4.8.manpages
===================================================================
--- packages/trunk/ogre/debian/libogremain-1.4.8.manpages 2008-05-16
19:27:20 UTC (rev 7079)
+++ packages/trunk/ogre/debian/libogremain-1.4.8.manpages 2008-05-16
23:43:58 UTC (rev 7080)
@@ -1 +0,0 @@
-debian/extras/update-ogre-plugins.8
Copied: packages/trunk/ogre/debian/libogremain-VERSION.install (from rev 7057,
packages/trunk/ogre/debian/libogremain-1.4.8.install)
===================================================================
--- packages/trunk/ogre/debian/libogremain-VERSION.install
(rev 0)
+++ packages/trunk/ogre/debian/libogremain-VERSION.install 2008-05-16
23:43:58 UTC (rev 7080)
@@ -0,0 +1,5 @@
+usr/lib/libOgreMain-*.so
+usr/lib/[EMAIL PROTECTED]@/*.so
+usr/lib/[EMAIL PROTECTED]@/*.la
+usr/bin/update-ogre-plugins
+etc/OGRE/*.cfg
Copied: packages/trunk/ogre/debian/libogremain-VERSION.manpages (from rev 7057,
packages/trunk/ogre/debian/libogremain-1.4.8.manpages)
===================================================================
--- packages/trunk/ogre/debian/libogremain-VERSION.manpages
(rev 0)
+++ packages/trunk/ogre/debian/libogremain-VERSION.manpages 2008-05-16
23:43:58 UTC (rev 7080)
@@ -0,0 +1 @@
+debian/extras/update-ogre-plugins.8
Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules 2008-05-16 19:27:20 UTC (rev 7079)
+++ packages/trunk/ogre/debian/rules 2008-05-16 23:43:58 UTC (rev 7080)
@@ -4,6 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# Use this variable to define the particular version of ogre we're building.
+OGRE_VERSION=1.4.8
+
# These are from the autotools-dev package documentation.
# /usr/share/doc/autotools-dev/README.Debian.gz
# from the section titled "Calling GNU configure properly"
@@ -41,13 +44,33 @@
--disable-ogre-demos \
CXXFLAGS="$(DEB_CXXFLAGS)"
+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/libceguiogrerender-$(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:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch patch-stamp
-configure: patch configure-stamp
+configure: build-setup patch configure-stamp
configure-stamp:
dh_testdir
# Modified bootstrapping from upstream, declares everything obsolete.
@@ -65,7 +88,7 @@
$(MAKE)
touch build-stamp
-clean: clean-stamp unpatch
+clean: clean-stamp unpatch reverse-build-setup
clean-stamp:
dh_testdir
dh_testroot
@@ -79,6 +102,15 @@
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -f patch-stamp
+reverse-build-setup:
+ dh_testdir
+ rm -f debian/extras/update-ogre-plugins \
+ debian/extras/ogre-plugins-config \
+ debian/extras/plugins-$(OGRE_VERSION).cfg \
+ debian/libceguiogrerender-$(OGRE_VERSION).install \
+ debian/libogremain-$(OGRE_VERSION).install \
+ debian/libogremain-$(OGRE_VERSION).manpages
+
install: build
dh_testdir
dh_testroot
@@ -94,6 +126,7 @@
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
@@ -111,11 +144,13 @@
binary-arch: install
dh_testdir
dh_testroot
- install -d debian/tmp/etc/OGRE && \
- install -m 644 debian/extras/*.cfg debian/tmp/etc/OGRE
+ install -d debian/tmp/etc/OGRE
+ install -m 644 debian/extras/plugins-$(OGRE_VERSION).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
+ 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
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
