[saods9] 03/03: Adjust patches for new version.

[Ole Streicher]

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

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

commit 0890a1f83cae80ae8466bf67b365d17d36e1d280
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 18:06:33 2013 +0200

    Adjust patches for new version.
---
 debian/changelog                           |    6 ++++++
 debian/patches/ds9_make_linux.patch        |    2 +-
 debian/patches/ds9_use_external_libs.patch |    6 +++---
 debian/patches/saotk_spellfix.patch        |   18 +++++++++---------
 debian/patches/tlt_fix_crash.patch         |    4 ++--
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc7dc0f..c8e16a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.3~b4-1~exp1) experimental; urgency=low
+
+  * New (beta) upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sat, 26 Oct 2013 18:05:10 +0200
+
 saods9 (7.3~b3+dfsg-1~exp3) experimental; urgency=low
 
   * Changelog update :-) Remove mixing of 7.2 and 7.3~b3
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 50e7f5a..90e2306 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -86,7 +86,7 @@ Description: Set the compile flags according to the Debian environment. We
  	$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
 --- a/Makefile
 +++ b/Makefile
-@@ -191,7 +191,7 @@
+@@ -195,7 +195,7 @@
  
  saotk	: FORCE
  	@echo "Installing SAOTK..."
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index b845d78..ee6c87a 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -253,7 +253,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	$(MAKE) -C unix distclean
 --- a/Makefile
 +++ b/Makefile
-@@ -221,31 +221,8 @@
+@@ -225,31 +225,8 @@
  dirsclean: FORCE
  	@for d in $(DIRS); do rm -rf $$d; done
  
@@ -286,7 +286,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  tkmpegclean: FORCE
  	$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -254,27 +231,12 @@
+@@ -258,27 +235,12 @@
  #	cd $(HTMLDIR); $(MAKE) distclean
  	rm -rf $(HTMLDIR)
  
@@ -314,7 +314,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  riceclean: FORCE
  	$(MAKE) -C $(RICEDIR) distclean
  
-@@ -287,9 +249,6 @@
+@@ -291,9 +253,6 @@
  saotkclean : FORCE
  	$(MAKE) -C $(SAOTKDIR) distclean
  
diff --git a/debian/patches/saotk_spellfix.patch b/debian/patches/saotk_spellfix.patch
index 416d8f0..e69a1b8 100644
--- a/debian/patches/saotk_spellfix.patch
+++ b/debian/patches/saotk_spellfix.patch
@@ -2,12 +2,12 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Spellfix; however this is unused at the end.
 --- a/saotk/frame/ds9parser.C
 +++ b/saotk/frame/ds9parser.C
-@@ -1020,7 +1020,7 @@
-   "'='", "'+'", "'-'", "'&'", "'!'", "$accept", "start", "commands",
-   "command", "@1", "@2", "@3", "hash", "@4", "comment", "@5",
-   "shapeComment", "@6", "@7", "nonshapeComment", "@8", "@9", "terminator",
--  "numeric", "debug", "yesno", "sp", "bp", "ep", "conjuction", "optangle",
-+  "numeric", "debug", "yesno", "sp", "bp", "ep", "conjunction", "optangle",
-   "angle", "value", "vvalue", "numberof", "sexagesimal", "hms", "dms",
-   "coord", "coordSystem", "wcsSystem", "skyFrame", "skyDist", "property",
-   "callBack", "global", "globalProperty", "globalRuler", "globalCompass",
+@@ -1022,7 +1022,7 @@
+   "start", "commands", "command", "@1", "@2", "@3", "hash", "@4",
+   "comment", "@5", "shapeComment", "@6", "@7", "nonshapeComment", "@8",
+   "@9", "terminator", "numeric", "debug", "yesno", "sp", "bp", "ep",
+-  "conjuction", "optangle", "angle", "value", "vvalue", "numberof",
++  "conjunction", "optangle", "angle", "value", "vvalue", "numberof",
+   "sexagesimal", "hms", "dms", "coord", "coordSystem", "wcsSystem",
+   "skyFrame", "skyDist", "property", "callBack", "global",
+   "globalProperty", "globalRuler", "globalCompass", "initGlobal", "local",
diff --git a/debian/patches/tlt_fix_crash.patch b/debian/patches/tlt_fix_crash.patch
index 71c98b1..7ae2dfa 100644
--- a/debian/patches/tlt_fix_crash.patch
+++ b/debian/patches/tlt_fix_crash.patch
@@ -26,7 +26,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
  
 --- a/tlt3.0/bltFont.h
 +++ b/tlt3.0/bltFont.h
-@@ -30,6 +30,8 @@
+@@ -35,6 +35,8 @@
  #ifndef _BLT_FONT_H
  #define _BLT_FONT_H
  
@@ -107,7 +107,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
  extern void Blt_Panic TCL_VARARGS(const char *, args);
 --- a/tlt3.0/bltUtil.c
 +++ b/tlt3.0/bltUtil.c
-@@ -56,7 +56,7 @@
+@@ -61,7 +61,7 @@
      }
  }
  

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