[wcstools] 04/09: 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 wcstools.

commit da2539265178b8f38a871978358cc749b40bca61
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Sep 2 11:26:00 2014 +0200

    Adjust for new version
---
 debian/changelog                  |  6 ++++++
 debian/patches/fix_mayhem.patch   | 20 ++------------------
 debian/patches/fix_spelling.patch | 10 +++++-----
 debian/patches/makefiles.patch    | 10 +++++++---
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6a96c8..dab3062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wcstools (3.9.0-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 02 Sep 2014 11:15:07 +0200
+
 wcstools (3.8.7-2) unstable; urgency=low
 
   * Install wcscat.h. Closes: #717942
diff --git a/debian/patches/fix_mayhem.patch b/debian/patches/fix_mayhem.patch
index eab8518..694c072 100644
--- a/debian/patches/fix_mayhem.patch
+++ b/debian/patches/fix_mayhem.patch
@@ -7,7 +7,7 @@ Bug: http://bugs.debian.org/715956
 Bug: http://bugs.debian.org/715957
 --- a/getfits.c
 +++ b/getfits.c
-@@ -109,6 +109,7 @@
+@@ -108,6 +108,7 @@
  		usage ("Right ascension given but no declination");
  	    else {
  		strcpy (rastr, *av);
@@ -17,7 +17,7 @@ Bug: http://bugs.debian.org/715957
  		dec0 = str2dec (decstr);
 --- a/getpix.c
 +++ b/getpix.c
-@@ -73,6 +73,7 @@
+@@ -83,6 +83,7 @@
      char *crange;       /* Column range string */
      char *rstr;
      char *dstr = NULL;
@@ -25,22 +25,6 @@ Bug: http://bugs.debian.org/715957
      char *cstr;
      int systemp;
      int i;
-@@ -208,11 +209,11 @@
- 	    if (ac < 2)
- 		usage ();
- 	    else {
--		strcpy (rstr, *av);
-+		strcpy (rastr, *av);
- 		ac--;
--		strcpy (dstr, *++av);
--		ra0 = str2ra (rstr);
--		dec0 = str2dec (dstr);
-+		strcpy (decstr, *++av);
-+		ra0 = str2ra (rastr);
-+		dec0 = str2dec (decstr);
- 		ac--;
- 		if (ac < 1) {
- 		    syscoor = WCS_J2000;
 --- a/bincat.c
 +++ b/bincat.c
 @@ -156,7 +156,7 @@
diff --git a/debian/patches/fix_spelling.patch b/debian/patches/fix_spelling.patch
index 62c368b..7c666c1 100644
--- a/debian/patches/fix_spelling.patch
+++ b/debian/patches/fix_spelling.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Spellfixes to make lintian happy
 --- a/libwcs/fitsfile.c
 +++ b/libwcs/fitsfile.c
-@@ -1568,7 +1568,7 @@
+@@ -1583,7 +1583,7 @@
  	if (!access (filename, 0)) {
  	    fd = open (filename, O_WRONLY);
  	    if (fd < 3) {
@@ -11,7 +11,7 @@ Description: Spellfixes to make lintian happy
  		return (0);
  		}
  	    }
-@@ -1607,7 +1607,7 @@
+@@ -1622,7 +1622,7 @@
  	if (!access (filename, 0)) {
  	    fd = open (filename, O_WRONLY);
  	    if (fd < 3) {
@@ -20,7 +20,7 @@ Description: Spellfixes to make lintian happy
  			 filename);
  		return (0);
  		}
-@@ -1869,7 +1869,7 @@
+@@ -1884,7 +1884,7 @@
      if (!access (filename, 0)) {
  	fdout = open (filename, O_WRONLY);
  	if (fdout < 3) {
@@ -29,7 +29,7 @@ Description: Spellfixes to make lintian happy
  	    return (0);
  	    }
  	}
-@@ -1955,7 +1955,7 @@
+@@ -1970,7 +1970,7 @@
      if (!access (filename, 0)) {
  	fd = open (filename, O_WRONLY);
  	if (fd < 3) {
@@ -38,7 +38,7 @@ Description: Spellfixes to make lintian happy
  	    return (0);
  	    }
  	}
-@@ -2057,7 +2057,7 @@
+@@ -2072,7 +2072,7 @@
      if (ext != NULL)
  	*ext = cext;
      if (fd < 3) {
diff --git a/debian/patches/makefiles.patch b/debian/patches/makefiles.patch
index a22a826..21fbc13 100644
--- a/debian/patches/makefiles.patch
+++ b/debian/patches/makefiles.patch
@@ -56,8 +56,8 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  
  all:	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
  	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
-@@ -17,178 +15,178 @@
- 	simpos nedpos bincat
+@@ -17,181 +15,181 @@
+ 	isfile simpos nedpos bincat
  
  addpix: addpix.c $(LIBWCS) libwcs/fitsfile.h
 -	$(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS)
@@ -187,6 +187,10 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 -	$(CC) $(CFLAGS) -o $(BIN)/imstar imstar.c $(LIBS)
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imstar imstar.c $(LIBS)
  
+ isfile: isfile.c $(LIBWCS) libwcs/fitshead.h
+-	$(CC) $(CFLAGS) -o $(BIN)/isfile isfile.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isfile isfile.c $(LIBS)
+ 
  isfits: isfits.c $(LIBWCS) libwcs/fitshead.h
 -	$(CC) $(CFLAGS) -o $(BIN)/isfits isfits.c $(LIBS)
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isfits isfits.c $(LIBS)
@@ -277,7 +281,7 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  
 -simpos: simpos.c libwcs/libwcs.a
 -	$(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(LIBS)
-+simpos: simpos.c $(LIBWCS)
++simpos: simpos.c
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/simpos simpos.c $(LIBS)
  
  gsc2cat: gsc2cat.c $(LIBWCS)

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