[SCM] 3depict branch, master, updated. debian/0.0.13-1_exp1-6-g87852b3

[D Haley]

The following commit has been merged in the master branch:
commit 63c9e6cc38774a39de0d1106f15fc93654148dd3
Author: D Haley <mycae at gmx.com>
Date:   Sat Jul 20 18:30:09 2013 +0200

    * Update patches
    	- Remove mgl2 configure patch, already in upstream

diff --git a/debian/patches/FTGL-lowercase.patch b/debian/patches/FTGL-lowercase.patch
index 130d5e7..0f1782d 100644
--- a/debian/patches/FTGL-lowercase.patch
+++ b/debian/patches/FTGL-lowercase.patch
@@ -1,10 +1,10 @@
 Description: Debian uses lowercase lib names.
 Forwarded: not-needed
 Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.13/configure
+Index: 3depict-0.0.14/configure
 ===================================================================
---- 3depict-0.0.13.orig/configure	2013-04-12 22:16:55.000000000 +0200
-+++ 3depict-0.0.13/configure	2013-04-12 22:20:49.000000000 +0200
+--- 3depict-0.0.14.orig/configure	2013-07-20 18:26:53.000000000 +0200
++++ 3depict-0.0.14/configure	2013-07-20 18:29:34.000000000 +0200
 @@ -5827,7 +5827,7 @@
  if test "x$ftgl_prefix" != "x" ; then
  	#use the supplied CFLAGS. assume LIBS
diff --git a/debian/patches/debian-desktop-naming.patch b/debian/patches/debian-desktop-naming.patch
index da1906d..aaacf1d 100644
--- a/debian/patches/debian-desktop-naming.patch
+++ b/debian/patches/debian-desktop-naming.patch
@@ -2,10 +2,10 @@ Description: Debian packages are lowercase, but upstream uses uppercase
  "D"
 Forwarded: not-needed
 Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.8/packaging/3Depict.desktop
+Index: 3depict-0.0.14/packaging/3Depict.desktop
 ===================================================================
---- 3depict-0.0.8.orig/packaging/3Depict.desktop	2011-10-23 16:32:14.000000000 +0100
-+++ 3depict-0.0.8/packaging/3Depict.desktop	2011-10-23 16:32:18.000000000 +0100
+--- 3depict-0.0.14.orig/packaging/3Depict.desktop	2013-07-20 18:09:35.000000000 +0200
++++ 3depict-0.0.14/packaging/3Depict.desktop	2013-07-20 18:29:34.000000000 +0200
 @@ -2,8 +2,8 @@
  Version=1.0
  Type=Application
diff --git a/debian/patches/fix-configure-mgl2 b/debian/patches/fix-configure-mgl2
deleted file mode 100644
index 82039cb..0000000
--- a/debian/patches/fix-configure-mgl2
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix missing C++ push/pop for mgl test
-Forwarded: not-needed
-Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.13/configure
-Index: 3depict-0.0.13/configure.ac
-===================================================================
---- 3depict-0.0.13.orig/configure.ac	2013-06-15 22:39:05.000000000 +0200
-+++ 3depict-0.0.13/configure.ac	2013-06-15 22:39:19.000000000 +0200
-@@ -327,10 +327,14 @@
- 		;;
- esac
- 
-+
- #mgl2 is installed into different path (at least under debian)
-+AC_LANG_PUSH([C++])
- AC_CHECK_HEADER([${MGL_HEADER_TESTFILE}],[AC_DEFINE(HAVE_MGL_H,[],[Have got mathgl headers])],
- 	[AC_MSG_ERROR([Required MathGL headers not found (looking for ${MGL_HEADER_TESTFILE}) - is mathgl development code installed?])])
- AC_CHECK_LIB(mgl, mgl_set_def_param, [AC_DEFINE(HAVE_MGL,[],[MathGL compilation OK])] , AC_MSG_ERROR([Required MathGL libraries not found]), -lmgl)
-+AC_LANG_POP([C++])
-+
- 
- CFLAGS="$CFLAGS_ORIG"
- LDFLAGS="$LDFLAGS_ORIG"
diff --git a/debian/patches/lowercase-textdomain.patch b/debian/patches/lowercase-textdomain.patch
index fd02b40..b735d73 100644
--- a/debian/patches/lowercase-textdomain.patch
+++ b/debian/patches/lowercase-textdomain.patch
@@ -1,10 +1,10 @@
 Description: Debian uses different text domain for the lang files
 Forwarded: not-needed
 Author: D Haley <mycae - gmx - com>
-Index: 3depict-0.0.13/src/3Depict.cpp
+Index: 3depict-0.0.14/src/3Depict.cpp
 ===================================================================
---- 3depict-0.0.13.orig/src/3Depict.cpp	2013-03-23 16:07:50.000000000 +0100
-+++ 3depict-0.0.13/src/3Depict.cpp	2013-03-23 16:08:54.000000000 +0100
+--- 3depict-0.0.14.orig/src/3Depict.cpp	2013-07-20 18:26:53.000000000 +0200
++++ 3depict-0.0.14/src/3Depict.cpp	2013-07-20 18:29:34.000000000 +0200
 @@ -164,7 +164,7 @@
  		else
  		{
diff --git a/debian/patches/series b/debian/patches/series
index 0ba6758..bfecdd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 debian-desktop-naming.patch
 lowercase-textdomain.patch
 FTGL-lowercase.patch
-fix-configure-mgl2

-- 
3depict