[SCM] image display tool for astronomy branch, master, updated. 8be7b24d70815ead7c4f44bf8e5bf9df2ec18829

[Ole Streicher]

The following commit has been merged in the master branch:
commit 8be7b24d70815ead7c4f44bf8e5bf9df2ec18829
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jan 10 14:33:32 2012 +0100

    Use gcc instead of gcc44

diff --git a/debian/patches/main-ds9.patch b/debian/patches/main-ds9.patch
index ee3bd46..72f68e1 100644
--- a/debian/patches/main-ds9.patch
+++ b/debian/patches/main-ds9.patch
@@ -182,7 +182,7 @@
  #ifndef _WIN32
 --- a/make.linux
 +++ b/make.linux
-@@ -1,17 +1,18 @@
+@@ -1,29 +1,28 @@
  OS	= unix
  ARCH	= linux
  
@@ -191,7 +191,7 @@
  X11LIB	= /usr/X11R6/lib
  
 -XX	= -O2 
-+XX	=  $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl8.4
++XX	=  $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl
  YY	= -gstabs+ -fno-inline 
  ZZ	=
  
@@ -202,8 +202,24 @@
 +AA	= 
 +DEPENDS = no
  
- #OPTS	= ${XX} ${ZZ}
- OPTS	= ${YY} ${ZZ}
+-#OPTS	= ${XX} ${ZZ}
+-OPTS	= ${YY} ${ZZ}
++OPTS	= ${XX} ${ZZ}
++#OPTS	= ${YY} ${ZZ}
+ NOPTS	= ${YY} ${ZZ}
+ 
+-#CXX	= g++
+-CXX	= g++44
++CXX	= g++
+ CXXOPT	= ${OPTS} ${AA}
+ CXXNOPT	= ${NOPTS} ${AA}
+ 
+-#CC	= gcc
+-CC	= gcc44
++CC	= gcc
+ CCOPT	= ${OPTS} ${AA}
+ CCNOPT	= ${NOPTS} ${AA}
+ 
 --- a/Makefile
 +++ b/Makefile
 @@ -301,23 +301,23 @@ tclxml	: FORCE

-- 
image display tool for astronomy