Package: freefem3d
Version: 1.0pre10-3.3
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for freefem3d (versioned as 1.0pre10-3.4) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
WBR, wRAR
diff -Nru freefem3d-1.0pre10/debian/changelog freefem3d-1.0pre10/debian/changelog
--- freefem3d-1.0pre10/debian/changelog	2015-07-08 17:34:44.000000000 +0500
+++ freefem3d-1.0pre10/debian/changelog	2016-11-26 00:55:28.000000000 +0500
@@ -1,3 +1,13 @@
+freefem3d (1.0pre10-3.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Switch to debhelper compat level 10 (Closes: #817460).
+  * Add B-D: dh-autoreconf (Closes: #796431).
+  * Drop Christophe Prud'homme from Uploaders (Closes: #835013).
+  * Honor CFLAGS and CXXFLAGS envvars.
+
+ -- Andrey Rahmatullin <w...@debian.org>  Sat, 26 Nov 2016 00:55:28 +0500
+
 freefem3d (1.0pre10-3.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru freefem3d-1.0pre10/debian/compat freefem3d-1.0pre10/debian/compat
--- freefem3d-1.0pre10/debian/compat	2011-09-19 18:30:29.000000000 +0600
+++ freefem3d-1.0pre10/debian/compat	2016-11-26 00:55:28.000000000 +0500
@@ -1 +1 @@
-4
+10
diff -Nru freefem3d-1.0pre10/debian/control freefem3d-1.0pre10/debian/control
--- freefem3d-1.0pre10/debian/control	2014-02-16 14:02:09.000000000 +0600
+++ freefem3d-1.0pre10/debian/control	2016-11-26 00:55:28.000000000 +0500
@@ -1,12 +1,13 @@
 Source: freefem3d
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintain...@lists.alioth.debian.org>
-Uploaders: Christophe Prud'homme <prudh...@debian.org>
 Section: math
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/freefem3d/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/freefem3d/trunk/
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.1.0), automake1.11, libtool (>= 1.5), doc-base, bison, texlive, texlive-latex-extra
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 10),
+ automake1.11, libtool (>= 1.5), doc-base, bison, texlive, texlive-latex-extra,
+ dh-autoreconf
 
 Package: freefem3d
 Architecture: any
diff -Nru freefem3d-1.0pre10/debian/patches/compile-flags.patch freefem3d-1.0pre10/debian/patches/compile-flags.patch
--- freefem3d-1.0pre10/debian/patches/compile-flags.patch	1970-01-01 05:00:00.000000000 +0500
+++ freefem3d-1.0pre10/debian/patches/compile-flags.patch	2016-11-26 00:55:28.000000000 +0500
@@ -0,0 +1,26 @@
+Description: Honor CFLAGS and CXXFLAGS environmen vars.
+Author: Andrey Rahmatullin <w...@debian.org>
+Last-Update: 2016-11-26
+
+Index: freefem3d-1.0pre10/m4/compile.m4
+===================================================================
+--- freefem3d-1.0pre10.orig/m4/compile.m4
++++ freefem3d-1.0pre10/m4/compile.m4
+@@ -70,13 +70,13 @@ dnl Check debugging mode for compilation
+ 
+   if test $ac_use_debug_code = "yes"
+   then
+-    CXXFLAGS="-g -Wall"
+-    CFLAGS="-g -Wall"
++    CXXFLAGS="$CXXFLAGS -g -Wall"
++    CFLAGS="$CFLAGS -g -Wall"
+   else
+     if test $ac_use_opt_code = "yes"
+     then
+-      CXXFLAGS="-Wall -DNDEBUG -O2 -funroll-all-loops -fargument-noalias-global -fno-gcse"
+-      CFLAGS="-Wall -DNDEBUG -O2 -funroll-all-loops -fargument-noalias-global -fno-gcse"
++      CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG -O2 -funroll-all-loops -fargument-noalias-global -fno-gcse"
++      CFLAGS="$CFLAGS -Wall -DNDEBUG -O2 -funroll-all-loops -fargument-noalias-global -fno-gcse"
+     else
+       CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
+       CFLAGS="$CFLAGS -Wall -DNDEBUG"
diff -Nru freefem3d-1.0pre10/debian/patches/series freefem3d-1.0pre10/debian/patches/series
--- freefem3d-1.0pre10/debian/patches/series	2015-07-08 17:36:35.000000000 +0500
+++ freefem3d-1.0pre10/debian/patches/series	2016-11-26 00:55:28.000000000 +0500
@@ -1 +1,6 @@
+10_gcc44_enum.patch
+20_gcc44_include.patch
+30_gcc47.patch
+40_gcc5.patch
 debian-changes-1.0pre10-3
+compile-flags.patch
diff -Nru freefem3d-1.0pre10/debian/rules freefem3d-1.0pre10/debian/rules
--- freefem3d-1.0pre10/debian/rules	2015-07-08 17:34:51.000000000 +0500
+++ freefem3d-1.0pre10/debian/rules	2016-11-26 00:55:28.000000000 +0500
@@ -1,9 +1,15 @@
 #!/usr/bin/make -f
 
+HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ifeq ($(HOST_ARCH_CPU), ppc64el)
+	export DEB_CPPFLAGS_MAINT_APPEND = -U__vector
+endif
+
+export DEB_CXXFLAGS_MAINT_APPEND = -std=gnu++98
+
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/m4
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-optimize --disable-gui
@@ -14,13 +20,6 @@
 DEB_AUTO_UPDATE_AUTOCONF = yes
 DEB_AUTO_UPDATE_AUTOHEADER = yes
 
-HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifeq ($(HOST_ARCH_CPU), ppc64el)
-	CPPFLAGS+=-U__vector
-endif
-
-CXXFLAGS := -std=gnu++98 $(CXXFLAGS)
-
 clean::
 	rm -f aclocal.m4 config.guess config.h.in config.sub install-sh
 	rm -f libtool ltconfig ltmain.sh missing mkinstalldirs stamp-h.in

Attachment: signature.asc
Description: PGP signature

Reply via email to