[SCM] Algorithms for models in fundamental astronomy branch, debian, updated. 56b5081d7898169dfd0569b1aac0824bc506f011

Ole Streicher debian at liska.ath.cx
Tue Jul 17 09:00:44 UTC 2012


The following commit has been merged in the debian branch:
commit 56b5081d7898169dfd0569b1aac0824bc506f011
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 17 10:59:21 2012 +0200

    Propagate CFLAGS, CPPFLAGS, LDFLAGS to allow Debian hardening
    This requires to push compat to 9 so that the flags are propagated to the
    makefile

diff --git a/debian/changelog b/debian/changelog
index 7a412ac..965a172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ iausofa-c (2012.03.01.a-1) unstable; urgency=low
   * New upstream version
   * Multiarch support
   * Add "DM-Upload-Allowed: yes"
+  * Propagate CFLAGS and CPPFLAGS to build system
+  * Update compat flag to 9
 
- -- Ole Streicher <debian at liska.ath.cx>  Mon, 16 Jul 2012 09:26:20 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 17 Jul 2012 11:00:00 +0200
 
 iausofa-c (2012.03.01-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 0e186f3..a07a42e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.3
 Homepage: http://www.iausofa.org/index.html
 Vcs-Git: git://git.debian.org/git/debian-science/packages/iausofa.git
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
new file mode 100644
index 0000000..b45612a
--- /dev/null
+++ b/debian/patches/propagate_buildflags.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Propagate CFLAGS and CPPFLAGS to the build system
+--- a/20120301_a/c/src/makefile
++++ b/20120301_a/c/src/makefile
+@@ -64,8 +64,8 @@
+ # for functions, CFLAGX for executables) here.
+ 
+ CCOMPC = gcc
+-CFLAGF = -c -pedantic -Wall -W -O -fPIC
+-CFLAGX = -pedantic -Wall -W -O
++CFLAGF = -c $(CPPFLAGS) $(CFLAGS) -fPIC
++CFLAGX = $(CPPFLAGS) $(CFLAGS)
+ 
+ #----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
+ 
+@@ -338,7 +338,7 @@
+ 	ar ru $(SOFA_LIB_NAME) $?
+ 
+ $(SOFA_SHLIB_NAME): $(SOFA_OBS)
+-	gcc -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 -o $(SOFA_SHLIB_NAME).0.0 $? -lm
++	gcc -shared $(LDFLAGS) -Wl,-soname,$(SOFA_SHLIB_NAME).0 -o $(SOFA_SHLIB_NAME).0.0 $? -lm
+ 
+ # Install the header files.
+ $(SOFA_INC) : $(INSTALL_DIRS) $(SOFA_INC_NAMES)
diff --git a/debian/patches/series b/debian/patches/series
index 2526990..b0114e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 set_installation_path.patch
 create_shared_lib.patch
+propagate_buildflags.patch

-- 
Algorithms for models in fundamental astronomy



More information about the debian-science-commits mailing list