r7046 - in packages/trunk/ogre/debian: . extras
Andres Mejia
ceros-guest at alioth.debian.org
Thu May 15 17:31:37 UTC 2008
Author: ceros-guest
Date: 2008-05-15 17:31:36 +0000 (Thu, 15 May 2008)
New Revision: 7046
Added:
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
Removed:
packages/trunk/ogre/debian/libceguiogrerenderer-1.4.7.install
packages/trunk/ogre/debian/libogremain-1.4.7.install
packages/trunk/ogre/debian/libogremain-1.4.7.manpages
Modified:
packages/trunk/ogre/debian/changelog
packages/trunk/ogre/debian/control
packages/trunk/ogre/debian/extras/compiledemos.sh
packages/trunk/ogre/debian/ogre-get-orig-source
packages/trunk/ogre/debian/rules
packages/trunk/ogre/debian/watch
Log:
Starting packaging for ogre-1.4.8
Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/changelog 2008-05-15 17:31:36 UTC (rev 7046)
@@ -1,4 +1,4 @@
-ogre (1.4.7.dfsg1-1) unstable; urgency=low
+ogre (1.4.8.dfsg1-1) unstable; urgency=low
* New upstream release.
+ Updated watch file, rules file, and control file appropriately.
@@ -11,6 +11,8 @@
* Changing use of CFLAGS TO CXXFLAGS.
* Updated update-ogre-plugins manual page.
* Adding CommandLineTools_Readme.txt for ogre-tools documentation.
+ * No longer providing ogre-tools-dbg. 'nostrip' option will be used instead.
+ * Place update-ogre-plugins in /usr/bin instead of /usr/sbin.
-- Andres Mejia <mcitadel at gmail.com> Thu, 27 Mar 2008 13:42:44 -0400
Modified: packages/trunk/ogre/debian/control
===================================================================
--- packages/trunk/ogre/debian/control 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/control 2008-05-15 17:31:36 UTC (rev 7046)
@@ -8,14 +8,28 @@
Homepage: http://ogre3d.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ogre
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ogre/?op=log
+DM-Upload-Allowed: yes
-Package: libogremain-1.4.7
+Package: libogre-dev
+Section: libdevel
+Architecture: all
+Depends: libogremain-1.4.8 (>= ${source:Version}), libfreeimage-dev, libfreetype6-dev, libzzip-dev, libxaw7-dev, libopenexr-dev
+Suggests: ogre-doc
+Description: Object-oriented Graphics Rendering Engine (development files)
+ Ogre is a complete object-oriented 3D rendering engine. It supports
+ different rendering subsystems but only the OpenGL system is useful
+ for Linux.
+ .
+ This package contains the headers and static libraries needed to develop
+ with Ogre.
+
+Package: libogremain-1.4.8
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Provides: libogre14
Conflicts: libogre3, libogre4, libogre5, libogre5c2a, libogre6
-Replaces: libogre5c2a, libogre6, libogre14, libogremain-1.4.6
+Replaces: libogre5c2a, libogre6, libogre14, libogremain-1.4.6, libogremain-1.4.7
Description: Object-oriented Graphics Rendering Engine (libraries)
Ogre is a complete object-oriented 3D rendering engine. It supports
different rendering subsystems but only the OpenGL system is useful
@@ -23,14 +37,14 @@
.
This package contains the Ogre library and plugins.
-Package: libogremain-1.4.7-dbg
+Package: libogremain-1.4.8-dbg
Section: libdevel
Architecture: any
Priority: extra
Provides: libogre14-dbg
Conflicts: libogre5c2a-dbg, libogre6-dbg
-Replaces: libogre5c2a-dbg, libogre6-dbg, libogre14-dbg, libogremain-1.4.6-dbg
-Depends: libogremain-1.4.7 (= ${binary:Version})
+Replaces: libogre5c2a-dbg, libogre6-dbg, libogre14-dbg, libogremain-1.4.6-dbg, libogremain-1.4.7-dbg
+Depends: libogremain-1.4.8 (= ${binary:Version})
Description: Object-oriented Graphics Rendering Engine (debugging libs)
Ogre is a complete object-oriented 3D rendering engine. It supports
different rendering subsystems but only the OpenGL system is useful
@@ -39,19 +53,6 @@
This package contains the debugging version of the Ogre library and
plugins.
-Package: libogre-dev
-Section: libdevel
-Architecture: all
-Depends: libogremain-1.4.7 (>= ${source:Version}), libfreeimage-dev | libdevil-dev, libfreetype6-dev, libzzip-dev, libxaw7-dev, libopenexr-dev
-Suggests: ogre-doc
-Description: Object-oriented Graphics Rendering Engine (development files)
- Ogre is a complete object-oriented 3D rendering engine. It supports
- different rendering subsystems but only the OpenGL system is useful
- for Linux.
- .
- This package contains the headers and static libraries needed to develop
- with Ogre.
-
Package: ogre-doc
Section: doc
Architecture: all
@@ -75,18 +76,6 @@
This package contains tools used to convert from and to Ogre's
native mesh format.
-Package: ogre-tools-dbg
-Section: devel
-Architecture: any
-Priority: extra
-Depends: ogre-tools (= ${binary:Version})
-Description: Object-oriented Graphics Rendering Engine (tools)
- Ogre is a complete object-oriented 3D rendering engine. It supports
- different rendering subsystems but only the OpenGL system is useful
- for Linux.
- .
- This package contains the debugging symbols for ogre-tools.
-
Package: blender-ogrexml
Section: graphics
Architecture: all
@@ -98,11 +87,11 @@
.
This package contains the Blender exporter for Ogre.
-Package: libceguiogrerenderer-1.4.7
+Package: libceguiogrerenderer-1.4.8
Section: libs
Architecture: any
Provides: libceguiogre14
-Replaces: libceguiogre14, libceguiogrerenderer-1.4.6
+Replaces: libceguiogre14, libceguiogrerenderer-1.4.6, libceguiogrerenderer-1.4.7
Depends: ${shlibs:Depends}
Description: CEGUI Ogre Renderer (libraries)
Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
@@ -111,13 +100,13 @@
.
This package contains the CEGUI Ogre Renderer library and plugins.
-Package: libceguiogrerenderer-1.4.7-dbg
+Package: libceguiogrerenderer-1.4.8-dbg
Section: libdevel
Architecture: any
Priority: extra
Provides: libceguiogre14-dbg
-Replaces: libceguiogre14-dbg, libceguiogrerenderer-1.4.6-dbg
-Depends: libceguiogrerenderer-1.4.7 (= ${binary:Version})
+Replaces: libceguiogre14-dbg, libceguiogrerenderer-1.4.6-dbg, libceguiogrerenderer-1.4.7-dbg
+Depends: libceguiogrerenderer-1.4.8 (= ${binary:Version})
Description: CEGUI Ogre Renderer (debugging libs)
Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
providing windowing and widgets. Or simply said: You can create GUI's with it.
@@ -129,7 +118,7 @@
Package: libceguiogre-dev
Section: libdevel
Architecture: all
-Depends: libceguiogrerenderer-1.4.7 (>= ${source:Version}), libogre-dev (= ${binary:Version})
+Depends: libceguiogrerenderer-1.4.8 (>= ${source:Version}), libogre-dev (= ${binary:Version})
Description: CEGUI Ogre Renderer (development files)
Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
providing windowing and widgets. Or simply said: You can create GUI's with it.
Modified: packages/trunk/ogre/debian/extras/compiledemos.sh
===================================================================
--- packages/trunk/ogre/debian/extras/compiledemos.sh 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/extras/compiledemos.sh 2008-05-15 17:31:36 UTC (rev 7046)
@@ -8,8 +8,8 @@
# This script will attempt to download the source tarball in case it's not
# found in the current directory, unpack it, and compile the Samples.
-OGRESRC=ogre-linux_osx-v1-4-7.tar.bz2
-OGRESUM=f44cba3f7362f6d8ca4187dee0d588ef
+OGRESRC=ogre-v1-4-8.tar.bz2
+OGRESUM=c9034bdbd4c7cd79a4dd38811765262a
compile () {
pushd >/dev/null $1/src
@@ -48,19 +48,19 @@
fi
# Unpack the tarball
-if [ ! -d ogrenew ]; then
+if [ ! -d ogre ]; then
echo "Extracting $OGRESRC to ogrenew"
tar -xjf $OGRESRC
else
- echo "Using existing ogrenew directory (remove it and re-run this script if you want to start from scratch)"
+ echo "Using existing ogre directory (remove it and re-run this script if you want to start from scratch)"
fi
# Link to the correct plugins.cfg for this system.
-rm -f ogrenew/Samples/Common/bin/plugins.cfg
-ln -s /etc/OGRE/plugins.cfg ogrenew/Samples/Common/bin/plugins.cfg
+rm -f ogre/Samples/Common/bin/plugins.cfg
+ln -s /etc/OGRE/plugins.cfg ogre/Samples/Common/bin/plugins.cfg
# Go into ogre samples directory and compile everything
-cd ogrenew
+cd ogre
if [ -z "$1" ] ; then
SAMPLES="$(find Samples -maxdepth 1 -type d)"
Deleted: packages/trunk/ogre/debian/libceguiogrerenderer-1.4.7.install
===================================================================
--- packages/trunk/ogre/debian/libceguiogrerenderer-1.4.7.install 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/libceguiogrerenderer-1.4.7.install 2008-05-15 17:31:36 UTC (rev 7046)
@@ -1 +0,0 @@
-usr/lib/libCEGUIOgreRenderer-*.so
Copied: packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install (from rev 6823, packages/trunk/ogre/debian/libceguiogrerenderer-1.4.7.install)
===================================================================
--- packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install (rev 0)
+++ packages/trunk/ogre/debian/libceguiogrerenderer-1.4.8.install 2008-05-15 17:31:36 UTC (rev 7046)
@@ -0,0 +1 @@
+usr/lib/libCEGUIOgreRenderer-*.so
Deleted: packages/trunk/ogre/debian/libogremain-1.4.7.install
===================================================================
--- packages/trunk/ogre/debian/libogremain-1.4.7.install 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/libogremain-1.4.7.install 2008-05-15 17:31:36 UTC (rev 7046)
@@ -1,5 +0,0 @@
-usr/lib/libOgreMain-*.so
-usr/lib/OGRE/*.so
-usr/lib/OGRE/*.la
-usr/sbin/update-ogre-plugins
-etc/OGRE/*.cfg
Deleted: packages/trunk/ogre/debian/libogremain-1.4.7.manpages
===================================================================
--- packages/trunk/ogre/debian/libogremain-1.4.7.manpages 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/libogremain-1.4.7.manpages 2008-05-15 17:31:36 UTC (rev 7046)
@@ -1 +0,0 @@
-debian/extras/update-ogre-plugins.8
Copied: packages/trunk/ogre/debian/libogremain-1.4.8.install (from rev 6823, packages/trunk/ogre/debian/libogremain-1.4.7.install)
===================================================================
--- packages/trunk/ogre/debian/libogremain-1.4.8.install (rev 0)
+++ packages/trunk/ogre/debian/libogremain-1.4.8.install 2008-05-15 17:31:36 UTC (rev 7046)
@@ -0,0 +1,5 @@
+usr/lib/libOgreMain-*.so
+usr/lib/OGRE/*.so
+usr/lib/OGRE/*.la
+usr/bin/update-ogre-plugins
+etc/OGRE/*.cfg
Copied: packages/trunk/ogre/debian/libogremain-1.4.8.manpages (from rev 6823, packages/trunk/ogre/debian/libogremain-1.4.7.manpages)
===================================================================
--- packages/trunk/ogre/debian/libogremain-1.4.8.manpages (rev 0)
+++ packages/trunk/ogre/debian/libogremain-1.4.8.manpages 2008-05-15 17:31:36 UTC (rev 7046)
@@ -0,0 +1 @@
+debian/extras/update-ogre-plugins.8
Modified: packages/trunk/ogre/debian/ogre-get-orig-source
===================================================================
--- packages/trunk/ogre/debian/ogre-get-orig-source 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/ogre-get-orig-source 2008-05-15 17:31:36 UTC (rev 7046)
@@ -4,9 +4,9 @@
# distributed through Debian.
# Some variables to make maintaining this script easier
-OGRE_VERSION=1.4.7.dfsg1
-OGRE_TARBALL=ogre-linux_osx-v1-4-7.tar.bz2
-OGRE_TARBALL_CHECKSUM=f44cba3f7362f6d8ca4187dee0d588ef
+OGRE_VERSION=1.4.8.dfsg1
+OGRE_TARBALL=ogre-v1-4-8.tar.bz2
+OGRE_TARBALL_CHECKSUM=c9034bdbd4c7cd79a4dd38811765262a
USAGE="\n\
This script is used to generate the orig tarball used in building\n\
@@ -20,10 +20,6 @@
while [ "$#" -gt "0" ]
do
case "$1" in
- -h|--help)
- echo "${USAGE}"
- exit 1
- ;;
--keep-upstream-tarball)
KEEP_UPSTREAM_TARBALL=1
shift
@@ -32,6 +28,10 @@
KEEP_ORIG_DIR=1
shift
;;
+ -h|--help|*)
+ echo "${USAGE}"
+ exit 1
+ ;;
esac
done
@@ -52,29 +52,23 @@
fi
# Prepare the ogre orig tarball
-if [ ! -d ogrenew ]; then
+if [ ! -d ogre ]; then
echo "Extracting $OGRE_TARBALL"
tar -xjf $OGRE_TARBALL
else
- echo "Already found extracted ogrenew directory. Please remove
-or move ogrenew and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
+ echo "Already found extracted ogre directory. Please remove
+or move ogre and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
exit 1
fi
if [ ! -d ogre-$OGRE_VERSION ]; then
- echo "Renaming extracted ogrenew directory to ogre-$OGRE_VERSION"
- mv ogrenew ogre-$OGRE_VERSION
+ echo "Renaming extracted ogre directory to ogre-$OGRE_VERSION"
+ mv ogre ogre-$OGRE_VERSION
else
echo "Already found ogre-$OGRE_VERSION directory. Please remove or move
-ogrenew and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
+ogre and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
exit 1
fi
-# Remove all CVS directories
-echo "Removing all CVS directories"
-for REMOVE_CVS in `find ogre-$OGRE_VERSION -name CVS`; do
- rm -rf "$REMOVE_CVS"
-done
-
# Remove non-distributable samples
echo "Removing all non-distributable demos."
rm -r ogre-$OGRE_VERSION/Samples/BezierPatch
Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/rules 2008-05-15 17:31:36 UTC (rev 7046)
@@ -88,7 +88,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
dh_testdir
dh_testroot
dh_installdocs -i -Nogre-doc
@@ -109,23 +109,25 @@
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install
+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/usr/sbin && \
+ install -d debian/tmp/usr/bin && \
install -m 755 debian/extras/update-ogre-plugins \
- debian/tmp/usr/sbin/update-ogre-plugins
+ debian/tmp/usr/bin/update-ogre-plugins
dh_install -a --sourcedir=debian/tmp
dh_installchangelogs -a Docs/ChangeLog.html
dh_installdocs -a
dh_installexamples -a
dh_installman -a
- dh_strip -plibogremain-1.4.7 --dbg-package=libogremain-1.4.7-dbg
- dh_strip -pogre-tools --dbg-package=ogre-tools-dbg
- dh_strip -plibceguiogrerenderer-1.4.7 \
- --dbg-package=libceguiogrerenderer-1.4.7-dbg
+ dh_strip -plibogremain-1.4.8 --dbg-package=libogremain-1.4.8-dbg
+ dh_strip -plibceguiogrerenderer-1.4.8 \
+ --dbg-package=libceguiogrerenderer-1.4.8-dbg
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ dh_strip -pogre-tools
+endif
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
@@ -135,5 +137,5 @@
dh_md5sums -a
dh_builddeb -a
-binary: binary-indep binary-arch
+binary: binary-arch binary-indep
.PHONY: configure build clean binary-indep binary-arch binary install
Modified: packages/trunk/ogre/debian/watch
===================================================================
--- packages/trunk/ogre/debian/watch 2008-05-15 17:25:55 UTC (rev 7045)
+++ packages/trunk/ogre/debian/watch 2008-05-15 17:31:36 UTC (rev 7046)
@@ -4,10 +4,10 @@
# Ogre source download link from sourceforge.net
opts=uversionmangle=s/\.\?.*// \
http://downloads.sourceforge.net/ogre \
- http://downloads.sourceforge.net/ogre/ogre-linux_osx-v(.*)\.tar\.bz2(.*) \
- 1-4-7
+ http://downloads.sourceforge.net/ogre/ogre-v(.*)\.tar\.bz2(.*) \
+ 1-4-8
# Different check for ogre source, provided by uscan man page
http://sf.net/ogre/ \
- ogre-linux_osx-v(.*)\.tar\.bz2(.*) \
- 1-4-7.
+ ogre-v(.*)\.tar\.bz2 \
+ 1-4-8
More information about the Pkg-games-commits
mailing list