[saods9] 01/01: Cleanup patches a bit

Ole Streicher olebole-guest at alioth.debian.org
Thu Aug 1 17:26:00 UTC 2013 

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository saods9.

commit d7e7d7806988688f50af91e9bfe730cd1706e4d2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Aug 1 19:25:52 2013 +0200

    Cleanup patches a bit
---
 debian/patches/ds9_make_linux.patch        |   20 ---------------
 debian/patches/ds9_use_external_libs.patch |   38 ++--------------------------
 debian/patches/ds9_use_filesystem.patch    |   10 +++-----
 3 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 123f50e..a77e9be 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -37,26 +37,6 @@ Description: Set the compile flags according to the Debian environment. We
  CCOPT	= ${OPTS} ${AA}
  CCNOPT	= ${NOPTS} ${AA}
  
---- a/Makefile
-+++ b/Makefile
-@@ -210,7 +210,7 @@
- 
- blt	: FORCE
- 	@echo "Installing BLT..."
--	cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --disable-shared
-+	cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --enable-shared
- 	cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
- 	cp $(BLTDIR)/src/*.so* lib/.
- 	cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-@@ -242,7 +242,7 @@
- 
- tkhtml	: $(HTMLDIR)
- 	@echo "Installing TKHTML..."
--	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
-+	cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
- 	$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
- 	cp $(HTMLDIR)/libtkhtml.a lib/.
- 
 --- a/checkdns/Makefile
 +++ b/checkdns/Makefile
 @@ -1,7 +1,7 @@
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 5c2ca6e..d027dfa 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -86,40 +86,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  endif
  
-@@ -159,24 +126,23 @@
- 
- all: ds9
- 
--ds9	: ds9Base ds9.zip
-+ds9	: ds9Base $(FILES)
- 	$(RM) $@
--	strip ds9Base
--	cp ds9Base ds9
--	cp ds9 ../bin/.
--	cp ds9.zip ../bin/.
-+	cp ds9Base ../bin/ds9
- 	cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
- 
- debug	: ds9Base ds9.zip
- 	$(RM) $@
- 	cp ds9Base ds9
- 
--ds9Base	: $(OBJS) $(LIBS)
-+ds9Base	: $(MAIN).o $(OBJS) $(LIBS)
- 	$(RM) $@
--	$(CXX) ${OPTS} \
--	-o $@ $(OBJS) $(LIBS) \
--	-L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
--	-lxml2
-+	$(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o tkAppInit.o ../lib/libsaotk.a \
-+	-Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err \
-+	-lstdc++ -Wl,-Bstatic -L../lib -lsaotk -lhcomp -lrice -lplio \
-+	-lxxlib -liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/blt3.0 -lBLTX30 -lBLTCore30 \
-+	-lwcstools -lfuntools  -ltk -ltcl -lz \
-+	-L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
- 
- endif
- 
 --- a/ds9/ds9.C
 +++ b/ds9/ds9.C
 @@ -22,33 +22,13 @@
@@ -278,7 +244,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -	cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(BLTFLAGS) --disable-shared
 -	cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_static
 -	cp $(BLTDIR)/src/*.a lib/.
-+	cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --disable-shared
++	cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --enable-shared
 +	cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
 +	cp $(BLTDIR)/src/*.so* lib/.
  	cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
@@ -305,7 +271,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  tkhtml	: $(HTMLDIR)
  	@echo "Installing TKHTML..."
 -	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
-+	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
++	cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
  	$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
  	cp $(HTMLDIR)/libtkhtml.a lib/.
  
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index c72fde5..0050040 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -21,11 +21,7 @@ Description: Store all files in the usual FHS directories instead of
  	$(RM) $@
 --- a/ds9/ds9.C
 +++ b/ds9/ds9.C
-@@ -12,13 +12,11 @@
- #include <tk.h>
- 
- extern "C" {
-+
+@@ -15,10 +15,7 @@
    int SAOAppInit(Tcl_Interp *interp);
    int SAOLocalMainHook(int* argc, char*** argv);
  
@@ -37,7 +33,7 @@ Description: Store all files in the usual FHS directories instead of
  
    int Blt_core_Init(Tcl_Interp*);
    int Blt_x_Init(Tcl_Interp*);
-@@ -66,16 +64,8 @@
+@@ -66,16 +63,8 @@
    char** argv = *argvPtr;
    appname = dupstr(argv[0]);
  
@@ -55,7 +51,7 @@ Description: Store all files in the usual FHS directories instead of
    Tcl_SetStartupScript(path, NULL);
  }
  
-@@ -90,46 +80,6 @@
+@@ -90,46 +79,6 @@
    // save interp for cputs function
    global_interp = interp;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/saods9.git

More information about the debian-science-commits mailing list