[SCM] Implementation of the FITS WCS standard branch, debian, updated. upstream/4.8.2-7-g68cd899

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 68cd8992319982f439a751e3bfcabe2486029f4f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 30 10:28:12 2011 +0100

    Remove backup files

diff --git a/debian/patches/manpages.patch~ b/debian/patches/manpages.patch~
deleted file mode 100644
index 4937d08..0000000
--- a/debian/patches/manpages.patch~
+++ /dev/null
@@ -1,90 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Added manpages for fitshdr, wcsware, HPXcvt
---- a/makedefs.in
-+++ b/makedefs.in
-@@ -134,6 +134,7 @@
-   INCLINK  := $(DESTDIR)@includedir@/wcslib
-   DOCDIR   := $(DESTDIR)@docdir@
-   HTMLDIR  := $(DESTDIR)@htmldir@
-+  MANDIR  := $(DESTDIR)@mandir@
-   PDFDIR   := $(DESTDIR)@pdfdir@
- 
- # For putting timestamps in the build log.
-@@ -210,6 +211,7 @@
- 	-@ echo '  INCDIR      := $(INCDIR)'
- 	-@ echo '  INCLINK     := $(INCLINK)'
- 	-@ echo '  DOCDIR      := $(DOCDIR)'
-+	-@ echo '  DOCDIR      := $(MANDIR)'
- 	-@ echo '  HTMLDIR     := $(HTMLDIR)'
- 	-@ echo '  PDFDIR      := $(PDFDIR)'
- 	-@ echo '  TIMER       := $(TIMER)'
---- a/utils/GNUmakefile
-+++ b/utils/GNUmakefile
-@@ -23,14 +23,17 @@
- include ../makedefs
- 
- UTILS := fitshdr
-+MAN := fitshdr.1
- 
- ifneq "$(CFITSIOINC)" ""
- ifneq "$(CFITSIOLIB)" ""
-   UTILS += HPXcvt wcsware
-+  MAN += HPXcvt.1 wcsware.1
- 
-   ifneq "$(PGPLOTINC)" ""
-   ifneq "$(PGPLOTLIB)" ""
-     UTILS += wcsgrid
-+    MAN += wcsgrid.1
-   endif
-   endif
- endif
-@@ -54,7 +57,7 @@
- 
- .PHONY : build clean cleaner cleanest distclean install realclean
- 
--build : $(UTILS)
-+build : $(UTILS) $(MAN)
- 
- fitshdr : fitshdr.c
- 	-@ echo ''
-@@ -91,7 +94,7 @@
- 	-  $(RM) -r *.o *.i a.out core *.dSYM $(EXTRA_CLEAN)
- 
- cleanest distclean realclean : cleaner
--	-  $(RM) $(UTILS)
-+	-  $(RM) $(UTILS) $(MAN)
- 
- $(PGSBOXLIB) :
- 	-@ echo ''
-@@ -106,6 +109,10 @@
- 	     $(INSTALL) -d -m 2775 $(BINDIR) ; \
- 	   fi
- 	   $(INSTALL) -m 755 $(UTILS) $(BINDIR)
-+	-  if [ ! -d "$(MANDIR)" ] ; then \
-+	     $(INSTALL) -d -m 2775 $(MANDIR)/man1 ; \
-+	   fi
-+	   $(INSTALL) -m 755 $(MAN) $(MANDIR)/man1
- 
- GNUmakefile : ../makedefs ;
- 
-@@ -117,3 +124,20 @@
- fitshdr : wcsconfig.h wcsconfig_utils.h
- wcsware : getwcstab.h wcs.h wcsfix.h wcshdr.h
- wcsgrid : cpgsbox.h getwcstab.h wcs.h wcsfix.h wcshdr.h
-+
-+fitshdr.1 : fitshdr
-+	help2man --no-discard-stderr --version-string=$(LIBVER) \
-+	         -n "List  headers  from  a FITS file" -N ./$< > $@
-+
-+wcsware.1 : wcsware
-+	help2man --no-discard-stderr --version-string=$(LIBVER) \
-+	         -n "Extract WCS keywords for an image" -N ./$< > $@
-+
-+wcsgrid.1 : wcsgrid
-+	help2man --no-discard-stderr --version-string=$(LIBVER) \
-+	         -n "Extract WCS keywords for an image" -N ./$< > $@
-+
-+HPXcvt.1 : HPXcvt
-+	help2man --no-discard-stderr --version-string=$(LIBVER) \
-+	         -n "Reorganise HEALPix data into a 2-D FITS image" -N ./$< > $@
-+
diff --git a/debian/patches/series~ b/debian/patches/series~
deleted file mode 100644
index 236682e..0000000
--- a/debian/patches/series~
+++ /dev/null
@@ -1,4 +0,0 @@
-manpages.patch
-remove-x11-tests.patch
-fix-ac.patch
-add-lm-flag.patch

-- 
Implementation of the FITS WCS standard