[SCM] OCE packaging branch, debian, updated. debian/0.11-1

[Denis Barbier]

The following commit has been merged in the debian branch:
commit eb7e16f329adb3142a30a4a23ece36cf13be8caa
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun Aug 12 13:48:09 2012 +0200

    Drop getGL2PSFontName method from OpenGl_Display.hxx
    
    Having member functions depending upon cpp macros is a bad idea,
    it may cause crash if OCE and 3rd party code do not define
    HAVE_GL2PS in a consistent manner.
    
    Bump OCE_ABI_SOVERSION.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9889b5c..edd82a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(OCE_VERSION_DEVEL -dev)
 # bugfix release: add ${OCE_VERSION_PATCH} to OCE_VERSION
 SET(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL})
 
-SET(OCE_ABI_SOVERSION 3)
+SET(OCE_ABI_SOVERSION 4)
 SET(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)
 
 # Set the minimum version of cmake required to 2.6
diff --git a/inc/OpenGl_Display.hxx b/inc/OpenGl_Display.hxx
index 5feee80..8689881 100644
--- a/inc/OpenGl_Display.hxx
+++ b/inc/OpenGl_Display.hxx
@@ -133,10 +133,6 @@ class OpenGl_Display : public MMgt_TShared
 
   void ExportText (const wchar_t *text, const int is2d, const float x, const float y, const float z, const OpenGl_AspectText *aspect, const OpenGl_TextParam *param, const short height);
 
-#ifdef HAVE_GL2PS
-  static void getGL2PSFontName(const char *src_font, char *ps_font);
-#endif
-
   Aspect_Display   myDisplay;
   OpenGl_Facilities myFacilities;
 
diff --git a/src/OpenGl/OpenGl_Display_1.cxx b/src/OpenGl/OpenGl_Display_1.cxx
index 0ddaa54..00bb4f2 100644
--- a/src/OpenGl/OpenGl_Display_1.cxx
+++ b/src/OpenGl/OpenGl_Display_1.cxx
@@ -90,7 +90,7 @@ static const FontMapNode myFontMap[] =
 */
 
 #ifdef HAVE_GL2PS
-void OpenGl_Display::getGL2PSFontName (const char *src_font, char *ps_font)
+static void getGL2PSFontName (const char *src_font, char *ps_font)
 {
   /* 
   Convert font name used for rendering to some "good" font names

-- 
OCE packaging