The following commit has been merged in the master branch: commit 6345a347cf7e9811e4c97407935bcd3bda3a9732 Author: Andres Mejia <[EMAIL PROTECTED]> Date: Sun May 18 00:47:59 2008 -0400
Preparing for release of ogre-contrib-1.4.8 diff --git a/debian/changelog b/debian/changelog index 308d852..4db99d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,16 @@ -ogre-contrib (1.4.7-1) unstable; urgency=low +ogre-contrib (1.4.8-1) unstable; urgency=low * New upstream release. * Setup a OGRE_CONFIG_OPTIONS for default configure options used in building ogre. * Changing use of CFLAGS TO CXXFLAGS. * Updated patch. + * Moved to git repository for packaging. + * Added DM-Upload-Allowed: yes field. + * Installing plugin in directory based on ogre version. + * Using /usr/bin/update-ogre-plugins for updating plugins file. - -- Andres Mejia <[EMAIL PROTECTED]> Thu, 03 Apr 2008 23:27:41 -0400 + -- Andres Mejia <[EMAIL PROTECTED]> Sun, 18 May 2008 00:03:56 -0400 ogre-contrib (1.4.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c20bef0..d8114f3 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,14 @@ Priority: optional Section: contrib/libs Maintainer: Debian Games Team <[EMAIL PROTECTED]> Uploaders: Andres Mejia <[EMAIL PROTECTED]>, Federico Di Gregorio <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.7), libogre-dev (<< 1.4.8) +Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.8), libogre-dev (<< 1.4.9) Standards-Version: 3.7.3 Homepage: http://ogre3d.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ogre-contrib -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ogre-contrib/?op=log +Vcs-Git: git://git.debian.org/git/pkg-games/ogre-contrib.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre-contrib.git +DM-Upload-Allowed: yes -Package: ogre-plugins-cgprogrammanager +Package: ogre-plugins-cgprogrammanager-1.4.8 Section: contrib/libs Architecture: amd64 i386 Depends: nvidia-cg-toolkit (>= 2.0), ${shlibs:Depends} @@ -22,7 +23,7 @@ Description: Ogre plugin: CgProgramManager . This package contains the CgProgramManager Ogre plugin. -Package: ogre-plugins-cgprogrammanager-dbg +Package: ogre-plugins-cgprogrammanager-1.4.8-dbg Section: contrib/libdevel Architecture: amd64 i386 Priority: extra diff --git a/debian/ogre-contrib-get-orig-source b/debian/ogre-contrib-get-orig-source index 27a1a62..8e7f290 100755 --- a/debian/ogre-contrib-get-orig-source +++ b/debian/ogre-contrib-get-orig-source @@ -4,9 +4,9 @@ # distributed through Debian. # Some variables to make maintaining this script easier -OGRE_VERSION=1.4.7 -OGRE_TARBALL=ogre-linux_osx-v1-4-7.tar.bz2 -OGRE_TARBALL_CHECKSUM=f44cba3f7362f6d8ca4187dee0d588ef +OGRE_VERSION=1.4.8 +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 @@ Usage: ogre-contrib-get-orig-source [OPTION]\n\ 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 @@ do KEEP_ORIG_DIR=1 shift ;; + -h|--help|*) + echo "${USAGE}" + exit 1 + ;; esac done @@ -52,29 +52,25 @@ else fi # Prepare the ogre-contrib 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-contrib-$OGRE_VERSION directories and also ogre-contrib_$OGRE_VERSION.orig.tar.gz." + echo "Already found extracted ogre directory. Please remove +or move ogre and ogre-contrib-$OGRE_VERSION directories and also +ogre-contrib_$OGRE_VERSION.orig.tar.gz." exit 1 fi if [ ! -d ogre-contrib-$OGRE_VERSION ]; then - echo "Renaming extracted ogrenew directory to ogre-contrib-$OGRE_VERSION" - mv ogrenew ogre-contrib-$OGRE_VERSION + echo "Renaming extracted ogre directory to ogre-contrib-$OGRE_VERSION" + mv ogre ogre-contrib-$OGRE_VERSION else - echo "Already found ogre-contrib-$OGRE_VERSION directory. Please remove or move -ogrenew and ogre-contrib-$OGRE_VERSION directories and also ogre-contrib_$OGRE_VERSION.orig.tar.gz." + echo "Already found ogre-contrib-$OGRE_VERSION directory. Please remove or +move ogre and ogre-contrib-$OGRE_VERSION directories and also +ogre-contrib_$OGRE_VERSION.orig.tar.gz." exit 1 fi -# Remove all CVS directories -echo "Removing all CVS directories" -for REMOVE_CVS in `find ogre-contrib-$OGRE_VERSION -name CVS`; do - rm -rf "$REMOVE_CVS" -done - # Remove directories and files not needed to build the # ogre-plugins-cgprogrammanager package. echo "Removing components not needed for ogre-contrib packages." @@ -106,7 +102,8 @@ if [ ! -f ogre-contrib_$OGRE_VERSION.orig.tar.gz ]; then rm $OGRE_TARBALL fi else - echo "Already found orig tarball. Please remove or move ogrenew -and ogre-contrib-$OGRE_VERSION directories and also ogre-contrib_$OGRE_VERSION.orig.tar.gz." + echo "Already found orig tarball. Please remove or move ogre and +ogre-contrib-$OGRE_VERSION directories and also +ogre-contrib_$OGRE_VERSION.orig.tar.gz." exit 1 fi diff --git a/debian/ogre-plugins-cgprogrammanager.postinst b/debian/ogre-plugins-cgprogrammanager.postinst index cbc966f..e2f3c5c 100644 --- a/debian/ogre-plugins-cgprogrammanager.postinst +++ b/debian/ogre-plugins-cgprogrammanager.postinst @@ -1,7 +1,7 @@ #!/bin/sh -e -if [ -x /usr/sbin/update-ogre-plugins ] ; then - /usr/sbin/update-ogre-plugins +if [ -x /usr/bin/update-ogre-plugins ] ; then + /usr/bin/update-ogre-plugins fi #DEBHELPER# diff --git a/debian/ogre-plugins-cgprogrammanager.postrm b/debian/ogre-plugins-cgprogrammanager.postrm index cbc966f..e2f3c5c 100644 --- a/debian/ogre-plugins-cgprogrammanager.postrm +++ b/debian/ogre-plugins-cgprogrammanager.postrm @@ -1,7 +1,7 @@ #!/bin/sh -e -if [ -x /usr/sbin/update-ogre-plugins ] ; then - /usr/sbin/update-ogre-plugins +if [ -x /usr/bin/update-ogre-plugins ] ; then + /usr/bin/update-ogre-plugins fi #DEBHELPER# diff --git a/debian/watch b/debian/watch index 53afe94..1ee589c 100644 --- a/debian/watch +++ b/debian/watch @@ -4,10 +4,10 @@ version=3 # 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 -- Packaging for ogre-contrib _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits