[med-svn] [Git][med-team/ghmm][master] 3 commits: Drop `--enable-gsl` from d/rules

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ghmm


Commits:
ac67eecc by Andreas Tille at 2020-12-17T11:19:12+01:00
Drop `--enable-gsl` from d/rules

- - - - -
673e2fde by Andreas Tille at 2020-12-17T11:28:07+01:00
Fix patch

- - - - -
a62b2321 by Andreas Tille at 2020-12-17T11:28:45+01:00
Add missing newline

- - - - -


3 changed files:

- debian/changelog
- debian/patches/2to3.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -3,8 +3,6 @@ ghmm (0.9~rc3-3) UNRELEASED; urgency=medium
   * Team upload.
   * Use 2to3 to port to Python3
     Closes: #936609
-  * debhelper-compat 12
-  * Standards-Version: 4.4.1
   * Use secure URI in debian/watch.
   * Set upstream metadata fields: Archive.
   * Add files missing in installation
@@ -13,24 +11,14 @@ ghmm (0.9~rc3-3) UNRELEASED; urgency=medium
   * Add Upstream-Contact
   * debian/copyright: use spaces rather than tabs to start continuation
     lines.
-  TODO:
-  gcc -DHAVE_CONFIG_H -I. -I.. -I.. -Wdate-time -D_FORTIFY_SOURCE=2 -DDTD_LOC=\"/usr/share/ghmm/ghmm.dtd.1.0\" -g -O2 "-fdebug-prefix-map=/build/ghmm-0.9~rc3=." -fstack-protector-strong -Wformat -Werror=format-security -I/usr/include -I/usr/include/x86_64-linux-gnu -I/usr/include/libxml2 -c randvar.c  -fPIC -DPIC -o .libs/randvar.o
-  In file included from /usr/include/x86_64-linux-gnu/clapack.h:4,
-                   from matrixop.c:48:
-  /usr/include/x86_64-linux-gnu/cblas.h:5:9: error: nested redefinition of 'enum CBLAS_ORDER'
-      5 |    enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102 };
-        |         ^~~~~~~~~~~
-  /usr/include/x86_64-linux-gnu/cblas.h:5:9: error: redeclaration of 'enum CBLAS_ORDER'
-  In file included from /usr/include/gsl/gsl_blas_types.h:28,
-                   from /usr/include/gsl/gsl_blas.h:29,
-                   from /usr/include/gsl/gsl_linalg.h:30,
-                   from matrixop.c:44:
   * Standards-Version: 4.5.1 (routine-update)
   * debhelper-compat 13 (routine-update)
   * Add salsa-ci file (routine-update)
   * Rules-Requires-Root: no (routine-update)
   * No tab in license text (routine-update)
   * Set upstream metadata fields: Repository.
+  * Drop `--enable-gsl` from d/rules (thanks for the hint to Frederic-Emmanuel
+    PICCA)
 
  -- Andreas Tille <tille at debian.org>  Wed, 11 Sep 2019 14:25:34 +0200
 


=====================================
debian/patches/2to3.patch
=====================================
@@ -831,7 +831,7 @@ Last-Update: Wed, 11 Sep 2019 14:25:34 +0200
 +++ b/ghmmwrapper/ghmm.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.3
-+#!/usr/bin/python32.3
++#!/usr/bin/python3
  ################################################################################
  #
  #       This file is part of the General Hidden Markov Model Library,


=====================================
debian/rules
=====================================
@@ -9,7 +9,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-gsl --enable-atlas
+	dh_auto_configure -- --enable-atlas
 
 override_dh_install:
 	dh_install
@@ -41,4 +41,4 @@ override_dh_auto_clean:
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) --directory=tests
-endif
\ No newline at end of file
+endif



View it on GitLab: https://salsa.debian.org/med-team/ghmm/-/compare/b77e45cace65ca45dcc1059d1a8e47b14caff713...a62b232125de9ed0e44c8323f5ecacbe0315746c

-- 
View it on GitLab: https://salsa.debian.org/med-team/ghmm/-/compare/b77e45cace65ca45dcc1059d1a8e47b14caff713...a62b232125de9ed0e44c8323f5ecacbe0315746c
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/20201217/d926bd67/attachment-0001.html>