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

[D Haley]

The following commit has been merged in the master branch:
commit 55a3e86d88815079da416ddfdd6d25410e43279f
Author: D Haley <mycae at gmx.com>
Date:   Sat Jun 15 20:45:40 2013 +0200

    * Enable Mgl2 code
    	- configure parameter "--enable-mgl2" added
    	- control updated
    * Add patch for configure, which doesn't change language for mgl test

diff --git a/debian/changelog b/debian/changelog
index 65fd308..1f7c919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+3depict (0.0.13-2) unstable; urgency=low
+
+  * Enable mathgl2.x configure option
+  * Modify build-depends, libmgl-dev >= 2.1.32
+
+ -- D Haley <mycae at gmx.com>  Sat, 15 Jun 2013 20:44:01 +0200
+
 3depict (0.0.13-1) unstable; urgency=low
 
   * Upload to unstable 
diff --git a/debian/control b/debian/control
index 008da99..9f826b7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: D Haley <mycae at gmx.com>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libgl1-mesa-dev | libgl-dev, libpng-dev | libpng15-dev, libqhull-dev, libwxgtk2.8-dev, libftgl-dev, autoconf, libxml2-dev, libmgl-dev, autotools-dev 
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf, libgl1-mesa-dev | libgl-dev, libpng-dev | libpng15-dev, libqhull-dev, libwxgtk2.8-dev, libftgl-dev, autoconf, libxml2-dev, libmgl-dev (>= 2.1.3.1), autotools-dev 
 Standards-Version: 3.9.4
 Homepage: http://threedepict.sourceforge.net/index.html
 Vcs-Git: git://git.debian.org/debian-science/packages/3depict.git
diff --git a/debian/patches/fix-configure-mgl2 b/debian/patches/fix-configure-mgl2
new file mode 100644
index 0000000..82039cb
--- /dev/null
+++ b/debian/patches/fix-configure-mgl2
@@ -0,0 +1,23 @@
+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/series b/debian/patches/series
index bfecdd4..0ba6758 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian-desktop-naming.patch
 lowercase-textdomain.patch
 FTGL-lowercase.patch
+fix-configure-mgl2
diff --git a/debian/rules b/debian/rules
index 54641da..98a41bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@
 	dh $@ --parallel
 
 override_dh_auto_configure: 
-	dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-openmp-parallel --disable-debug-checks --with-libpng-link="-lpng" --with-libpng-flags="-L/lib" --with-ftgl-prefix="/usr"
+	dh_autoreconf
+	dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-openmp-parallel --disable-debug-checks --with-libpng-link="-lpng" --with-libpng-flags="-L/lib" --with-ftgl-prefix="/usr" --enable-mgl2
 
 
 override_dh_clean:

-- 
3depict