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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit c99c7662956dd24e7285d9b49202e9c4b0eff777
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 6 23:16:52 2012 +0200

    Fix htmlwidget rule

diff --git a/debian/patches/use_external_libs.patch b/debian/patches/use_external_libs.patch
index ef340fa..551b206 100644
--- a/debian/patches/use_external_libs.patch
+++ b/debian/patches/use_external_libs.patch
@@ -272,7 +272,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	cd $(TKIMGDIR); $(MAKE) -j $(JOBS) all; $(MAKE) install
  
  libtiff	: FORCE
-@@ -309,18 +309,19 @@
+@@ -309,18 +309,18 @@
  
  tkmpeg	: FORCE
  	@echo "Installing TKMPEG..."
@@ -282,7 +282,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  html	: FORCE
  	@echo "Installing HTMLWIDGET..."
- 	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE)
+-	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE)
 +	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE)
  	cd $(HTMLDIR); $(MAKE) headers libtkhtml.a
  	cp $(HTMLDIR)/libtkhtml.a lib/.
@@ -294,7 +294,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	cd $(XPADIR); $(MAKE) -j $(JOBS); $(MAKE) install
  	cd bin; strip xpa*
  
-@@ -379,7 +380,7 @@
+@@ -379,7 +379,7 @@
  
  saotk	: FORCE
  	@echo "Installing SAOTK..."
@@ -303,7 +303,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  zip	: FORCE
  	@echo "Installing ZIP..."
-@@ -403,15 +404,9 @@
+@@ -403,15 +403,9 @@
  endif
  
  distclean : filesclean \
@@ -322,7 +322,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  filesclean: FORCE
  	find . -name "myconfig.cache" -exec rm {} \;
-@@ -420,62 +415,18 @@
+@@ -420,62 +414,18 @@
  dirsclean: FORCE
  	@for d in $(DIRS); do rm -rf $$d; done
  
@@ -386,7 +386,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  riceclean: FORCE
  	cd $(RICEDIR); $(MAKE) distclean
  
-@@ -491,9 +442,6 @@
+@@ -491,9 +441,6 @@
  zipclean: FORCE
  	cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
  

-- 
image display tool for astronomy