[wcstools] 02/02: Adjust patches

Sat May 16 12:42:20 UTC 2015

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

olebole pushed a commit to branch debian
in repository wcstools.

commit 8692f630d487386d0c6e5d1d341d159e57a0db4f
Author: Ole Streicher <olebole at debian.org>
Date:   Sat May 16 14:09:27 2015 +0200

    Adjust patches
---
 debian/changelog                           |  6 ++++++
 debian/copyright                           |  2 +-
 debian/patches/fix_compiler_warnings.patch |  2 +-
 debian/patches/fix_manpages.patch          |  8 ++++++++
 debian/patches/makefiles.patch             | 29 ++++-------------------------
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a5a547..19b5d20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wcstools (3.9.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Sat, 16 May 2015 14:09:37 +0200
+
 wcstools (3.9.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/copyright b/debian/copyright
index d8b7537..43ac4a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: wcstools
 Source: http://tdc-www.harvard.edu/software/wcstools/
 Upstream-Author: Jessica Mink <jmink at cfa.harvard.edu>
-Files-Excluded: *.o libwcs/sty2 libwcs/cd libwcs/head libwcs/ll libwcs/lwcs libwcs/tail libwcs/vi temp
+Files-Excluded: libwcs/lwcs
 
 Files: *
 Copyright: Copyright (C) 1996-2011, Smithsonian Astrophysical Observatory, Cambridge, MA USA
diff --git a/debian/patches/fix_compiler_warnings.patch b/debian/patches/fix_compiler_warnings.patch
index cffc3a4..57bb8cb 100644
--- a/debian/patches/fix_compiler_warnings.patch
+++ b/debian/patches/fix_compiler_warnings.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Fix some compiler warnings.
 --- a/imcat.c
 +++ b/imcat.c
-@@ -1772,7 +1772,7 @@
+@@ -1778,7 +1778,7 @@
  		if (refcat == UCAC2 || refcat == UCAC3 || refcat == UCAC4) {
  		    nim = gc[i] / 1000;
  		    nct = gc[i] % 1000;
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index e0c0ce0..bd9d568 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -648,3 +648,11 @@ Description: Fix the names and spelling of manpages to make lintian happy
  .B \-n <num>
  Number of brightest stars to print 
  .B \-o <name>
+--- a/man/man1/simpos.1
++++ b/man/man1/simpos.1
+@@ -1,4 +1,4 @@
+-.TH simpos(1) WCSTools "14 May 2015"
++.TH simpos 1 WCSTools "14 May 2015"
+ .SH Name
+ simpos \- Find position of a named object in the sky
+ .SH Synopsis
diff --git a/debian/patches/makefiles.patch b/debian/patches/makefiles.patch
index 21fbc13..9cae574 100644
--- a/debian/patches/makefiles.patch
+++ b/debian/patches/makefiles.patch
@@ -39,13 +39,12 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 +	rm -f *.a *.o *.so *.so.*
 --- a/Makefile
 +++ b/Makefile
-@@ -1,13 +1,11 @@
+@@ -1,12 +1,10 @@
 -CFLAGS= -g -D_FILE_OFFSET_BITS=64
 -CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = libwcs/libwcstools.so
- LIBNED = libned/libned.a
 -LIBS = $(LIBWCS) -lm
++LIBWCS = libwcs/libwcstools.so
 +LIBS = -L libwcs -lwcstools -lm
  #LIBS = $(LIBWCS) -lm -lnsl -lsocket
  BIN = bin
@@ -56,8 +55,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,181 +15,181 @@
- 	isfile simpos nedpos bincat
+@@ -16,175 +14,175 @@
+ 	isfile simpos bincat
  
  addpix: addpix.c $(LIBWCS) libwcs/fitsfile.h
 -	$(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS)
@@ -223,14 +222,6 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 -	$(CC) $(CFLAGS) -o $(BIN)/matchcat matchcat.c $(LIBS)
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/matchcat matchcat.c $(LIBS)
  
- nedname: nedname.c $(LIBWCS) $(LIBNED) libwcs/wcs.h libned/ned_client.h
--	$(CC) $(CFLAGS) -o $(BIN)/nedname nedname.c $(LIBS) $(LIBNED)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/nedname nedname.c $(LIBS) $(LIBNED)
- 
- nedpos: nedpos.c $(LIBWCS) $(LIBNED) libwcs/wcs.h libned/ned_client.h
--	$(CC) $(CFLAGS) -o $(BIN)/nedpos nedpos.c $(LIBS) $(LIBNED)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/nedpos nedpos.c $(LIBS) $(LIBNED)
- 
  newfits: newfits.c $(LIBWCS) libwcs/fitshead.h libwcs/wcs.h
 -	$(CC) $(CFLAGS) -o $(BIN)/newfits newfits.c $(LIBS)
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/newfits newfits.c $(LIBS)
@@ -298,15 +289,3 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  
  $(LIBWCS): libwcs/*.c libwcs/*.h
  	cd libwcs; make
---- a/libned/Makefile
-+++ b/libned/Makefile
-@@ -5,9 +5,6 @@
- # you need to link your object files with -lsocket and -lnsl to make executable.
- 
- 
--CFLAGS = -g -D_NO_PROTO
--CC = cc
--
- SRC = ned_cli.c ned_cif.c ned_err.c ned_sk.c
- OBJ = ned_cli.o ned_cif.o ned_err.o ned_sk.o
- 

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

