[SCM] Create, display and manipulate the world coordinate system branch, debian, updated. e1fe4f289ac8089d9a27cea0a7c47e0eb9ec0be9

Ole Streicher debian at liska.ath.cx
Thu Aug 16 13:40:26 UTC 2012


The following commit has been merged in the debian branch:
commit e1fe4f289ac8089d9a27cea0a7c47e0eb9ec0be9
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Aug 16 15:33:22 2012 +0200

    Fortify compilation

diff --git a/debian/changelog b/debian/changelog
index 3ee1b16..e5cf250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ wcstools (3.8.6-1) unstable; urgency=low
 
   * New upstream version
   * Multiarch support
+  * Fortify compilation
 
  -- Ole Streicher <debian at liska.ath.cx>  Thu, 16 Aug 2012 15:07:34 +0200
 
diff --git a/debian/clean b/debian/clean
index 492205f..083cfc0 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 Man/man_generated/*
+libwcs/libwcstools.so*
diff --git a/debian/patches/rename_libwcs.patch b/debian/patches/rename_libwcs.patch
index c727c25..9f53459 100644
--- a/debian/patches/rename_libwcs.patch
+++ b/debian/patches/rename_libwcs.patch
@@ -6,7 +6,7 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 @@ -1,5 +1,5 @@
 -CFLAGS= -g -D_FILE_OFFSET_BITS=64
 -CC= cc
-+CFLAGS= -fPIC -D_FILE_OFFSET_BITS=64
++CFLAGS+= -fPIC
 +CC= gcc
  
  OBJS =	imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \
@@ -39,9 +39,10 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 --- a/Makefile
 +++ b/Makefile
 @@ -1,8 +1,8 @@
- CFLAGS= -g -D_FILE_OFFSET_BITS=64
+-CFLAGS= -g -D_FILE_OFFSET_BITS=64
 -CC= cc
 -LIBWCS = libwcs/libwcs.a
++#CFLAGS= -g -D_FILE_OFFSET_BITS=64
 +CC= gcc
 +LIBWCS = libwcs/libwcstools.so
  LIBNED = libned/libned.a

-- 
Create, display and manipulate the world coordinate system



More information about the debian-science-commits mailing list