[saods9] 02/02: Adjust 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 21f94d17cbd4a2480ed0e3c5b3e4418627a88216
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 7 14:49:01 2014 +0200

    Adjust for new version
---
 debian/changelog                        |  6 ++++++
 debian/patches/ds9_make_linux.patch     | 12 ++----------
 debian/patches/ds9_use_filesystem.patch |  2 +-
 debian/patches/saotk_add_psscale.patch  |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 773e02c..ee1743b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.3.1+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 07 Oct 2014 14:47:07 +0200
+
 saods9 (7.3+dfsg-1) unstable; urgency=low
 
   * New upstream version. Move back to unstable.
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 6e73f61..9f07de1 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -3,7 +3,7 @@ Description: Set the compile flags according to the Debian environment. We
  also need to propagate the standard CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS here.
 --- a/make.linux
 +++ b/make.linux
-@@ -4,22 +4,21 @@
+@@ -4,16 +4,15 @@
  X11INCLUDE=/usr/include/X11
  X11LIB	= /usr/lib
  
@@ -22,16 +22,8 @@ Description: Set the compile flags according to the Debian environment. We
 -NOPTS	= ${YY} ${ZZ}
 +NOPTS	= ${XX} ${ZZ}
  
--CXX	= g++44
-+CXX	= g++
+ CXX	= g++
  CXXOPT	= ${OPTS} ${AA}
- CXXNOPT	= ${NOPTS} ${AA}
- 
--CC	= gcc44
-+CC	= gcc
- CCOPT	= ${OPTS} ${AA}
- CCNOPT	= ${NOPTS} ${AA}
- 
 --- a/Makefile.unix
 +++ b/Makefile.unix
 @@ -34,12 +34,17 @@
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index bb4a1ad..ef1ced2 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -3,7 +3,7 @@ Description: Store all files in the usual FHS directories instead of
  building a zipfile and using a special tcl filesystem driver to access it.
 --- a/ds9/Makefile.unix
 +++ b/ds9/Makefile.unix
-@@ -36,13 +36,8 @@
+@@ -35,13 +35,8 @@
  
  CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
  
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 2eed26a..33c8638 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -14,7 +14,7 @@ Description: The original code from ds9 uses a patched postscript code to allow
  // Tk Canvas Widget Functions Declaration
  
  int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item, 
-@@ -558,7 +560,7 @@
+@@ -580,7 +582,7 @@
    XColor* cc= NULL;
    // starting with tk8.6, colors are W3C based, not X11
    if (!strncmp(str,"green",5) || !strncmp(str,"GREEN",5))

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