[apophenia] 03/04: Imported Debian patch 0.999b+ds2-1

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository apophenia.

commit c7d64ac886328f02f78656d460c2991855c66d2e
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Oct 9 19:36:14 2014 +0200

    Imported Debian patch 0.999b+ds2-1
---
 debian/changelog                   |  7 +++++--
 debian/control                     |  1 +
 debian/patches/debianization.patch | 24 ++++++++++++++++++++++--
 debian/rules                       | 11 +++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a6ed4c..ed16f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,14 @@ apophenia (0.999b+ds2-1) unstable; urgency=medium
     - debian/control:
       - Standards Version 3.9.6, bump;
       - Build-Depends, remove quilt dependency;
+      - Multi-Arch support, refine;
     - debian/repack, revisit;
     - debian/rules:
-      - override_dh_auto_clean, wipe out;
+      - override_dh_auto_clean, wipe out (Closes: #764642);
+      - optimize scheme wrt gsl package scheme;
+    - debian/patches/debianization.patch, refine.
 
- -- Jerome Benoit <calculus at rezozer.net>  Thu, 09 Oct 2014 17:08:20 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 09 Oct 2014 22:02:43 +0000
 
 apophenia (0.999b+ds1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d4b8af8..031a91e 100644
--- a/debian/control
+++ b/debian/control
@@ -135,6 +135,7 @@ Suggests:
 # pdf-viewer,
  www-browser,
  gsl-doc-pdf, gsl-ref-html
+Multi-Arch: foreign
 Description: Apophenia Statistical C Library -- reference manual
  The Apophenia Statistical C Library is an open source C library for
  working with data sets and statistical models. It provides functions
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index b073fb4..0e21429 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -3,7 +3,7 @@ Description: debianization
  to address Debian specific stuff in general.
 Origin: debian
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-08-11
+Last-Update: 2014-10-09
 
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
@@ -78,6 +78,15 @@ Last-Update: 2014-08-11
  # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 --- a/configure.ac
 +++ b/configure.ac
+@@ -4,7 +4,7 @@
+ 
+ AC_PREREQ(2.60)
+ AC_INIT([apophenia], [0.999b], [fluffmail at f-m.fm])
+-AM_SILENT_RULES([yes])
++AM_SILENT_RULES([no])
+ AC_CONFIG_SRCDIR([apop_arms.c])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_HEADER([config.h])
 @@ -63,6 +63,11 @@
  AC_PATH_PROGS([SQLITE3],[sqlite3],[/usr/bin/sqlite3])
  
@@ -97,7 +106,18 @@ Last-Update: 2014-08-11
  	dist-zip
  
 -AM_CFLAGS = -g -Wall -O3
-+AM_CFLAGS = -O3
++AM_CFLAGS = -Wno-unused-result
  
  ## Library versioning (C:R:A == current:revision:age)
  LIBAPOPHENIA_LT_VERSION = 0:0:0
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -46,6 +46,8 @@
+ 	-I$(top_srcdir) \
+ 	$(GSL_CFLAGS)
+ 
++AM_CFLAGS += -Wno-unused-result
++
+ AM_LDFLAGS = \
+ 	$(top_builddir)/libapophenia.la \
+ 	$(GSL_LIBS)
diff --git a/debian/rules b/debian/rules
index 131a82e..1e25219 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,16 @@
 #!/usr/bin/make -f
 
+## inspired from gsl material
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else ifeq ($(DEB_HOST_ARCH), m68k)
+	CFLAGS += -O2
+else ifeq ($(DEB_HOST_ARCH), alpha)
+	CFLAGS += -O2 -mieee
+else
+	CFLAGS += -O3
+endif
+
 default:
 	@uscan --no-conf --dehs --report || true
 

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