[med-svn] [Git][med-team/aevol][master] 2 commits: Do not call AM_INIT_AUTOMAKE twice

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / aevol


Commits:
d81bdb64 by Andreas Tille at 2021-11-05T08:01:59+01:00
Do not call AM_INIT_AUTOMAKE twice

- - - - -
2aaf2303 by Andreas Tille at 2021-11-05T08:02:14+01:00
routine-update: Standards-Version: 4.6.0

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/automake.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+aevol (5.0+ds-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Do not call AM_INIT_AUTOMAKE twice
+    Closes: #998479
+  * Standards-Version: 4.6.0 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Fri, 05 Nov 2021 08:00:27 +0100
+
 aevol (5.0+ds-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
                libboost-filesystem-dev,
                libopenmpi-dev,
                autoconf-archive
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/aevol
 Vcs-Git: https://salsa.debian.org/med-team/aevol.git
 Homepage: http://www.aevol.fr/


=====================================
debian/patches/automake.patch
=====================================
@@ -0,0 +1,25 @@
+Description: Do not call AM_INIT_AUTOMAKE twice
+Bug-Debian: https://bugs.debian.org/998479
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 05 Nov 2021 08:00:27 +0100
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ fi
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ # We want to use automake
+-AM_INIT_AUTOMAKE
++# AM_INIT_AUTOMAKE
+ 
+ # Select compiler
+ AC_PROG_CXX([clang-omp++ clang++ g++ icc])
+@@ -299,6 +299,8 @@ AM_CONDITIONAL(WITH_RAEVOL, test x"$raev
+ if test "x$raevol" = "xyes" ; then
+    AC_DEFINE(__REGUL)
+    AM_INIT_AUTOMAKE([subdir-objects])
++else
++   AM_INIT_AUTOMAKE
+ fi
+ 
+ #  ************************* --with-blas option *******************************


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+automake.patch



View it on GitLab: https://salsa.debian.org/med-team/aevol/-/compare/6ae6cad8304e501794e92d01c81b43a6c7ff4c32...2aaf2303cdfeee1941ba8e13fd95feba8183ee6f

-- 
View it on GitLab: https://salsa.debian.org/med-team/aevol/-/compare/6ae6cad8304e501794e92d01c81b43a6c7ff4c32...2aaf2303cdfeee1941ba8e13fd95feba8183ee6f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211105/1eadcf01/attachment-0001.htm>