[Emc-commit] master: Merge remote-tracking branch 'origin/v2.5_branch'

[Sebastian K. <gi...@gi...>]

Merge remote-tracking branch 'origin/v2.5_branch'

Conflicts:
	debian/configure


http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=9dafe69


 debian/configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --cc debian/configure
index 7f16e4e,3fbd466..2d0581c
--- a/debian/configure
+++ b/debian/configure
@@@ -104,10 -104,14 +104,14 @@@ Ubuntu-9.10
  	TCLTK_VERSION=8.5
  	;;
  Ubuntu-8.04)
 -	EXTRA_BUILD=dvipng,texlive-extra-utils,texlive-latex-recommended,texlive-fonts-recommended,ghostscript,imagemagick,texlive-lang-french,texlive-lang-german,texlive-lang-spanish,texlive-lang-polish
 +	EXTRA_BUILD=dvipng,texlive-extra-utils,texlive-latex-recommended,texlive-fonts-recommended,ghostscript,imagemagick,texlive-lang-french,texlive-lang-spanish
  	TCLTK_VERSION=8.4
  	;;
- Debian-testing|Debian-[67].[0-9]*)
+ Debian-7.*)
+ 	EXTRA_BUILD=dvipng,texlive-extra-utils,texlive-latex-recommended,texlive-fonts-recommended,ghostscript,imagemagick,texlive-lang-french,texlive-lang-german,texlive-lang-spanish,texlive-lang-polish,texlive-font-utils
+ 	TCLTK_VERSION=8.5
+ 	;;
+ Debian-testing|Debian-6.0*)
  	EXTRA_BUILD=dvipng
  	TCLTK_VERSION=8.5
  	;;