This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository osgearth.
commit 8425cb30c1b2556fc7d6d204d758282dc60cbac2 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Dec 7 03:45:46 2013 +0100 Drop becuase-typo.patch, applied upstream. --- debian/changelog | 1 + debian/patches/becuase-typo.patch | 49 --------------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21c761a..6e551ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ osgearth (2.5.0+dfsg-1) UNRELEASED; urgency=medium * Refresh soversion.patch. * Enable KMZ support with libminizip from libkml. * Drop MPGeometry-OpenSceneGraph-3.1.8.patch, included in upstream. + * Drop becuase-typo.patch, applied upstream. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 16 Jan 2014 22:35:07 +0100 diff --git a/debian/patches/becuase-typo.patch b/debian/patches/becuase-typo.patch deleted file mode 100644 index ffeefff..0000000 --- a/debian/patches/becuase-typo.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Fix 'becuase' typo. -Author: Bas Couwenberg <sebas...@xs4all.nl> -Bug: https://github.com/gwaldron/osgearth/pull/366 -Applied-Upstream: https://github.com/gwaldron/osgearth/commit/6e50453c225d95e9adccae1a60f5e4d941de3243 -Last-Update: 2013-09-13 ---- a/src/osgEarth/ImageLayer.cpp -+++ b/src/osgEarth/ImageLayer.cpp -@@ -190,7 +190,7 @@ ImageLayerTileProcessor::process( osg::r - } - - // If this is a compressed image, uncompress it IF the image is not already in the -- // target profile...becuase if it's not in the target profile, we will have to do -+ // target profile...because if it's not in the target profile, we will have to do - // some mosaicing...and we can't mosaic a compressed image. - if (!_layerInTargetProfile && - ImageUtils::isCompressed(image.get()) && ---- a/src/osgEarth/TextureCompositor.cpp -+++ b/src/osgEarth/TextureCompositor.cpp -@@ -381,7 +381,7 @@ TextureCompositor::applyMapModelChange( - if ( disableLODBlending && layer->getImageLayerOptions().lodBlending() == true ) - { - OE_WARN << LC << "LOD blending disabled for layer \"" << layer->getName() -- << "\" becuase it uses Mercator fast-path rendering" << std::endl; -+ << "\" because it uses Mercator fast-path rendering" << std::endl; - } - - _layout.applyMapModelChange( ---- a/src/osgEarthDrivers/engine_osgterrain/OSGTerrainEngineNode.cpp -+++ b/src/osgEarthDrivers/engine_osgterrain/OSGTerrainEngineNode.cpp -@@ -833,7 +833,7 @@ OSGTerrainEngineNode::traverse( osg::Nod - if ( nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR ) - { - // update the cull-thread map frame if necessary. (We don't need to sync the -- // update_mapf becuase that happens in response to a map callback.) -+ // update_mapf because that happens in response to a map callback.) - - // TODO: address the fact that this can happen from multiple threads. - // Really we need a _cull_mapf PER view. -gw ---- a/src/osgEarthUtil/Controls.cpp -+++ b/src/osgEarthUtil/Controls.cpp -@@ -782,7 +782,7 @@ LabelControl::calcSize(const ControlCont - #endif - - t->setText( _text, _encoding ); -- // yes, object coords. screen coords won't work becuase the bounding box will be wrong. -+ // yes, object coords. screen coords won't work because the bounding box will be wrong. - t->setCharacterSizeMode( osgText::Text::OBJECT_COORDS ); - t->setCharacterSize( _fontSize ); - // always align to top. layout alignment gets calculated layer in Control::calcPos(). diff --git a/debian/patches/series b/debian/patches/series index af06caf..4247e83 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ soversion.patch -becuase-typo.patch fallback-getCurrentThreadId.patch kfreebsd-getCurrentThreadId.patch cmake-FindMiniZip.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel