[3depict] 03/03: * Add patch to fix text display under mgl2 - Text() function works differently

D Haley mycae-guest at moszumanska.debian.org
Sun Dec 8 13:04:03 UTC 2013


This is an automated email from the git hooks/post-receive script.

mycae-guest pushed a commit to branch master
in repository 3depict.

commit 68e2beb9c25e1ef332a38bd795e105a568710eb6
Author: D Haley <mycae at gmx.com>
Date:   Sun Dec 1 19:01:28 2013 +0100

    * Add patch to fix text display under mgl2
    	- Text() function works differently
---
 debian/patches/FTGL-lowercase.patch       |  6 +++---
 debian/patches/lowercase-textdomain.patch | 10 +++++-----
 debian/patches/series                     |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/FTGL-lowercase.patch b/debian/patches/FTGL-lowercase.patch
index e87b92f..2db3025 100644
--- a/debian/patches/FTGL-lowercase.patch
+++ b/debian/patches/FTGL-lowercase.patch
@@ -3,9 +3,9 @@ Forwarded: not-needed
 Author: D Haley <mycae - gmx - com>
 Index: 3depict-0.0.15/configure
 ===================================================================
---- 3depict-0.0.15.orig/configure	2013-12-01 17:18:40.000000000 +0100
-+++ 3depict-0.0.15/configure	2013-12-01 17:18:45.000000000 +0100
-@@ -5964,7 +5964,7 @@
+--- 3depict-0.0.15.orig/configure	2013-12-01 19:12:05.000000000 +0100
++++ 3depict-0.0.15/configure	2013-12-01 19:12:14.000000000 +0100
+@@ -6129,7 +6129,7 @@
  if test "x$ftgl_prefix" != "x" ; then
  	#use the supplied CFLAGS. assume LIBS
  	FTGL_CFLAGS="-I$ftgl_prefix/include/ -L$ftgl_prefix/lib/"
diff --git a/debian/patches/lowercase-textdomain.patch b/debian/patches/lowercase-textdomain.patch
index 7b59388..7d80490 100644
--- a/debian/patches/lowercase-textdomain.patch
+++ b/debian/patches/lowercase-textdomain.patch
@@ -1,11 +1,11 @@
 Description: Debian uses different text domain for the lang files
 Forwarded: not-needed
 Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.14/src/3Depict.cpp
+Index: 3depict-0.0.15/src/3Depict.cpp
 ===================================================================
---- 3depict-0.0.14.orig/src/3Depict.cpp	2013-07-20 14:41:45.000000000 +0200
-+++ 3depict-0.0.14/src/3Depict.cpp	2013-07-20 18:36:33.000000000 +0200
-@@ -165,7 +165,7 @@
+--- 3depict-0.0.15.orig/src/3Depict.cpp	2013-12-01 19:12:07.000000000 +0100
++++ 3depict-0.0.15/src/3Depict.cpp	2013-12-01 19:12:11.000000000 +0100
+@@ -166,7 +166,7 @@
  		else
  		{
  			//Set the gettext language
@@ -14,7 +14,7 @@ Index: 3depict-0.0.14/src/3Depict.cpp
  			setlocale (LC_ALL, "");
  #ifdef __WXMAC__
  			bindtextdomain( PROGRAM_NAME, paths->GetResourcesDir().mb_str(wxConvUTF8) );
-@@ -197,8 +197,8 @@
+@@ -198,8 +198,8 @@
  					break;
  			}			
  #else
diff --git a/debian/patches/series b/debian/patches/series
index bfecdd4..66ca1f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-mgl-overlay-title
 debian-desktop-naming.patch
 lowercase-textdomain.patch
 FTGL-lowercase.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git



More information about the debian-science-commits mailing list