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

Ole Streicher github at liska.ath.cx
Mon Dec 5 12:24:50 UTC 2011


The following commit has been merged in the debian branch:
commit 26663a081fa0158019dbb1fe5e7e53c993cec832
Author: Ole Streicher <github at liska.ath.cx>
Date:   Mon Dec 5 13:23:10 2011 +0100

    Remove all patches since they are not needed anymore
    Upstream integrated all into the tarball.

diff --git a/debian/changelog b/debian/changelog
index 23eca98..bb30602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-wcslib (...) unstable; urgency=low
+wcslib (4.8.4-1) unstable; urgency=low
 
+  * New upstream version
   * Add wcslib.pc to dev package. Closes: #650602
 
--- Ole Streicher <debian at liska.ath.cx>  Thu, 01 Dec 2011 09:20:00 +0100
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 05 Dec 2011 12:20:00 +0100
 
 wcslib (4.8.3-1) unstable; urgency=low
 
diff --git a/debian/patches/add-lm-flag.patch b/debian/patches/add-lm-flag.patch
deleted file mode 100644
index 6d5245e..0000000
--- a/debian/patches/add-lm-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add the necessary -lm flag for the shared lib.
---- a/configure.ac
-+++ b/configure.ac
-@@ -261,7 +261,7 @@
-     # Covers Linux and Solaris at least.
-     SHRLIB="libwcs.so.$LIBVER"
-     SONAME="libwcs.so.$SHVER"
--    SHRLD="$SHRLD -shared -Wl,-h\$(SONAME)"
-+    SHRLD="$SHRLD -shared -Wl,-h\$(SONAME) -lm"
-     SHRLN="libwcs.so"
-     ;;
-   esac
diff --git a/debian/patches/fix-ac.patch b/debian/patches/fix-ac.patch
deleted file mode 100644
index 4f4dc20..0000000
--- a/debian/patches/fix-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Remove the newline within the AC_CONFIG_HEADERS() call. This
- causes the creation of a file with a wrong filename (newline included in the filename).
---- a/configure.ac
-+++ b/configure.ac
-@@ -518,6 +518,5 @@
- # Do it.
- AC_MSG_NOTICE([Configuring files...])
- AC_CONFIG_FILES([makedefs wcslib.pc])
--AC_CONFIG_HEADERS([wcsconfig.h wcsconfig_f77.h wcsconfig_tests.h
--                   wcsconfig_utils.h])
-+AC_CONFIG_HEADERS([wcsconfig.h wcsconfig_f77.h wcsconfig_tests.h wcsconfig_utils.h])
- AC_OUTPUT
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
deleted file mode 100644
index 368477e..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 '  MANDIR      := $(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/remove-AC_CANONICAL_HOST-reference.patch b/debian/patches/remove-AC_CANONICAL_HOST-reference.patch
deleted file mode 100644
index 0244ea4..0000000
--- a/debian/patches/remove-AC_CANONICAL_HOST-reference.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Remove AC_CANONICAL_HOST call so that we do not need to call
- config.guess or config.sub. These two files are outdated in the distribution
- and will be deleted in the "clean" step.
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,12 +24,6 @@
- AC_CONFIG_SRCDIR([C/wcs.h])
- AC_CONFIG_AUX_DIR([config])
- 
--# Get the system type.
--AC_CANONICAL_BUILD
--ARCH="${build_cpu}-$build_os"
--AC_SUBST([ARCH])
--
--
- # Look for Flex.
- AC_CHECK_PROG([FLEX], [flex], [flex], [], [], [])
- if test "x$FLEX" = xflex ; then
---- a/makedefs.in
-+++ b/makedefs.in
-@@ -80,9 +80,6 @@
-   LIBVER    := @LIBVER@
-   WCSLIBPKG := wcslib- at PACKAGE_VERSION@
- 
--# System architecture.
--  ARCH     := @ARCH@
--
- # Flex and options.
-   FLEX     := @FLEX@
-   FLFLAGS  :=
-@@ -189,7 +186,6 @@
- 	-@ echo '  MAKEFLAGS   := $(MAKEFLAGS)'
- 	-@ echo ''
- 	-@ echo 'For building and installing $(WCSLIBPKG)...'
--	-@ echo '  ARCH        := $(ARCH)'
- 	-@ echo '  FLEX        := $(FLEX)'
- 	-@ echo '  FLFLAGS     := $(FLFLAGS)'
- 	-@ echo '  CPP         := $(CPP)'
diff --git a/debian/patches/remove-x11-tests.patch b/debian/patches/remove-x11-tests.patch
deleted file mode 100644
index 438df87..0000000
--- a/debian/patches/remove-x11-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Remove tests that just output to the X11 screen to be independent
- of an X server.
---- a/C/GNUmakefile
-+++ b/C/GNUmakefile
-@@ -92,7 +92,7 @@
- # Add test programs that require PGPLOT if we have it.
- ifneq "$(PGPLOTINC)" ""
- ifneq "$(PGPLOTLIB)" ""
--  TESTS += $(TEST_P) $(TEST_B)
-+#  TESTS += $(TEST_P) $(TEST_B)
- endif
- endif
- 
---- a/Fortran/GNUmakefile
-+++ b/Fortran/GNUmakefile
-@@ -87,7 +87,7 @@
- # Add test programs that require PGPLOT if we have it.
- ifneq "$(PGPLOTINC)" ""
- ifneq "$(PGPLOTLIB)" ""
--  TESTS   += $(TEST_P) $(TEST_B)
-+#  TESTS   += $(TEST_P) $(TEST_B)
- endif
- endif
- 
---- a/pgsbox/GNUmakefile
-+++ b/pgsbox/GNUmakefile
-@@ -153,25 +153,9 @@
- 	-  $(RM) $(PICLIB) libpgsbox-*.a libpgsbox.so.* libpgsbox.*.dylib
- 
- check test : tests
--	-@ echo ''
--	-@ $(TIMER)
--	-@ echo 'Running the PGSBOX test program, PGTEST:'
--	-@ if [ '$(MODE)' = interactive ] ; then \
--	     ./pgtest ; \
--	   else \
--	     ./pgtest < /dev/null ; \
--	   fi
--	-@ echo ''
--	-@ echo ''
--	-@ $(TIMER)
--	-@ echo 'Running the cpgsbox() test program, cpgtest:'
--	-@ if [ '$(MODE)' = interactive ] ; then \
--	     ./cpgtest ; \
--	   else \
--	     ./cpgtest < /dev/null ; \
--	   fi
-+	-@ echo 'Skipping tests for pgsbox'
- 
--tests : wcslib pgtest cpgtest
-+tests : wcslib 
- 
- wcslib : $(WCSLIB)
- 
diff --git a/debian/patches/rename-CHANGES.patch b/debian/patches/rename-CHANGES.patch
deleted file mode 100644
index e8d22b6..0000000
--- a/debian/patches/rename-CHANGES.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Rename CHANGES to changelog, accoring to Debian Policy Manual 
- section 12.7
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -69,7 +69,8 @@
- 	-  if [ ! -d "$(DOCDIR)" ] ; then \
- 	     $(INSTALL) -d -m 2775 $(DOCDIR) ; \
- 	   fi
--	   $(INSTALL) -m 444 CHANGES COPYING* README $(DOCDIR)
-+	   $(INSTALL) -m 444 README $(DOCDIR)
-+	   $(INSTALL) -m 444 CHANGES $(DOCDIR)/changelog
- 	-  if [ ! -d "$(PDFDIR)" ] ; then \
- 	     $(INSTALL) -d -m 2775 $(PDFDIR) ; \
- 	   fi
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c4cc458..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-remove-x11-tests.patch

-- 
Implementation of the FITS WCS standard



More information about the debian-science-commits mailing list