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

[Ole Streicher]

The following commit has been merged in the master branch:
commit f10201cd6a51ed4176a648c52cc31bfbd7e99434
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jan 10 17:41:39 2012 +0100

    Bring tkmpeg, xpa, sla to work. Still missing: saotk, ds9

diff --git a/debian/patches/main-ds9.patch b/debian/patches/main-ds9.patch
index 72f68e1..227508f 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,29 +1,28 @@
+@@ -1,29 +1,26 @@
  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/tcl
++XX	=  $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl -I/usr/include/tk
  YY	= -gstabs+ -fno-inline 
  ZZ	=
  
@@ -200,13 +200,12 @@
  # AA	= -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
 -AA	= -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 +AA	= 
-+DEPENDS = no
  
 -#OPTS	= ${XX} ${ZZ}
 -OPTS	= ${YY} ${ZZ}
+-NOPTS	= ${YY} ${ZZ}
 +OPTS	= ${XX} ${ZZ}
-+#OPTS	= ${YY} ${ZZ}
- NOPTS	= ${YY} ${ZZ}
++NOPTS	= ${XX} ${ZZ}
  
 -#CXX	= g++
 -CXX	= g++44

-- 
image display tool for astronomy