[SCM] image display tool for astronomy branch, debian, updated. cf612aa82c120472364d40f039d108868e4469aa

[Ole Streicher]

The following commit has been merged in the debian branch:
commit d7b20af6951408e4f74b8cec178a94e610ac6b81
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 5 09:03:55 2012 +0200

    Remove obsolete patch

diff --git a/debian/patches/makefiles.patch b/debian/patches/makefiles.patch
deleted file mode 100644
index 93df03e..0000000
--- a/debian/patches/makefiles.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-This patch is still not applyable!
-
-
---- saods9-4.0b7.orig/Makefile
-+++ saods9-4.0b7/Makefile
-@@ -26,7 +26,7 @@
-   TCLXDIR = $(TCLXDIR)/win
- 
-   TCLLIBFLAGS = --prefix ..
--  PREHTMLFLAGS = config_BUILD_TCLSH=tclsh84s config_TARGET_TCL_SCRIPT_DIR=$(root)/lib/tcl8.4
-+  PREHTMLFLAGS = config_BUILD_TCLSH=tclsh84s config_TARGET_TCL_SCRIPT_DIR=$(root)/share/tcltk/tcl8.4
- else
-   EXE	=
-   WISH	= wish8.4
-@@ -37,6 +37,7 @@
- 
-   XFLAGS = --x-includes=$(X11INCLUDE) --x-libraries="$(X11LIB) $(HTMLEXTLIB)"
-   TCLLIBFLAGS = --prefix $(root)
-+  PREHTMLFLAGS= config_TARGET_TCL_SCRIPT_DIR=/usr/share/tcltk/tcl8.4 config_TARGET_TK_SCRIPT_DIR=/usr/share/tcltk/tk8.4
- endif
- 
- TCLFLAGS = --enable-gcc --prefix $(root) $(XFLAGS)
-@@ -46,12 +47,12 @@
- 	--with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS)
- TKIMGFLAGS = --enable-gcc --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
- 	 --with-tk=$(root)/$(TKDIRDIR) $(XFLAGS)
--XPAFLAGS = --enable-gcc --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \
-+XPAFLAGS = --enable-gcc --prefix $(root) --with-tcl=/usr/share/tcltk/tcl8.4 \
- 	$(XFLAGS)
--HTMLFLAGS = --enable-gcc --prefix $(root) --with-tcl=$(root)/$(TCLDIR) \
--	--with-tk=$(root)/$(TKDIR) $(XFLAGS)
-+HTMLFLAGS = --enable-gcc --prefix $(root) --with-tcl=/usr/share/tcltk/tcl8.4/ --with-tk=/usr/share/tcltk/tk8.4/
-+
-+FUNTOOLSFLAGS = --prefix $(root) --enable-gcc --with-zlib=-lz --with-wcslib=../lib/libwcs.a --enable-mainlib
- 
--FUNTOOLSFLAGS = --prefix $(root) --enable-gcc --with-zlib=../lib/libz.a --with-wcslib=../lib/libwcs.a --enable-mainlib
- ZLIBFLAGS = --prefix $(root)
- 
- SAOINDEX= lib/pkgIndex.tcl
-@@ -185,7 +186,7 @@
- 
- tkindex : FORCE
- 	@echo "Installing Tk mkIndex..."
--	cd lib/tk8.4; echo "pkg_mkIndex . *.tcl" | ../../bin/tclsh8.4	
-+	cd share/tcltk/tk8.4; echo "pkg_mkIndex . *.tcl" | ../../../bin/tclsh8.4	
- 
- blt	: FORCE
- 	@echo "Installing BLT..."
-@@ -194,7 +195,7 @@
- 
- mktclapp: FORCE
- 	@echo "Installing MKTCLAPP..."
--	cd $(MKTCLAPPDIR); CC=$(CCc) $(MAKE) mktclapp -e
-+	cd $(MKTCLAPPDIR); CC=$(CCc) CFLAGS="$(CCOPT)" $(MAKE) mktclapp -e
- 	cp $(MKTCLAPPDIR)/mktclapp$(EXE) bin/.
- 
- zlib  : FORCE
-@@ -219,13 +220,13 @@
- 
- tkmpeg	: FORCE
- 	@echo "Installing TKMPEG..."
--	cd $(TKMPEGDIR); $(MAKE)
-+	cd $(TKMPEGDIR); $(MAKE) CXXOPT="$(CXXOPT)"
- 	cd $(TKMPEGDIR); $(MAKE) install
- 
- html	: FORCE
- 	@echo "Installing HTMLWIDGET noshared..."
--	cd $(HTMLDIR); CC=$(CCc) $(PREHTMLFLAGS) $(root)/htmlwidget/configure $(HTMLFLAGS) --enable-shared=no
--	cd $(HTMLDIR); $(MAKE)
-+	cd $(HTMLDIR); CFLAGS="$(CXXOPT)" CC=$(CCc) $(PREHTMLFLAGS) $(root)/htmlwidget/configure $(HTMLFLAGS) --enable-shared=no
-+	cd $(HTMLDIR); $(MAKE) headers libtkhtml.a
- 	cp $(HTMLDIR)/libtkhtml.a lib/.
- 
- htmlsh	: FORCE
-@@ -242,7 +243,7 @@
- 
- xpa	: FORCE
- 	@echo "Installing XPA..."
--	cd $(XPADIR); CC=$(CCc) ./configure $(XPAFLAGS)  --disable-shared
-+	cd $(XPADIR); CC=$(CCc) CFLAGS="$(CCOPT)" ./configure $(XPAFLAGS)  --disable-shared
- 	cd $(XPADIR); $(MAKE); $(MAKE) install
- 
- iis	: FORCE
-@@ -272,7 +273,7 @@
- 
- saotk	: FORCE
- 	@echo "Installing SAOTK..."
--	cd $(SAOTKDIR); $(MAKE) install
-+	cd $(SAOTKDIR); $(MAKE) CXX="$(CXX)" install
- 
- win	: FORCE
- 	@echo "Installing WIN..."

-- 
image display tool for astronomy