[med-svn] [Git][med-team/libsbml][master] 6 commits: d/rules: Fix the "any" build.

Michael R. Crusoe (@crusoe) gitlab at salsa.debian.org
Tue Apr 30 11:38:58 BST 2024



Michael R. Crusoe pushed to branch master at Debian Med / libsbml


Commits:
9db8530e by Michael R. Crusoe at 2024-04-30T11:45:25+02:00
d/rules: Fix the "any" build.

- - - - -
5ccbdc6f by Michael R. Crusoe at 2024-04-30T11:45:25+02:00
Expand list of non-mono archs, simplify test for C# support.

- - - - -
81acae2f by Michael R. Crusoe at 2024-04-30T11:45:25+02:00
d/rules: only run dh_octave_substvar for the libsbml5-octave package.

- - - - -
3e1cb9ba by Michael R. Crusoe at 2024-04-30T11:45:26+02:00
d/control: drop unused latex build-deps

- - - - -
1ab5a10d by Michael R. Crusoe at 2024-04-30T11:45:26+02:00
d/rules: disable parallel building for now.

- - - - -
4dcb1057 by Michael R. Crusoe at 2024-04-30T12:28:21+02:00
Upload 5.20.2+dfsg-5 to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libsbml (5.20.2+dfsg-5) unstable; urgency=medium
+
+  * Team upload.
+  * d/rules: Fix the "any" build.
+  * Expand list of non-mono archs, simplify test for C# support.
+  * d/rules: only run dh_octave_substvar for the libsbml5-octave
+    package.
+  * d/control: drop unused latex build-deps
+  * d/rules: disable parallel building for now.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Tue, 30 Apr 2024 12:28:07 +0200
+
 libsbml (5.20.2+dfsg-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Section: science
 Priority: optional
 Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                dh-sequence-python3,
-               dh-sequence-cli [!mips64el !riscv64],
+               dh-sequence-cli [!mips64el !riscv64 !loong64 !sh4 !sparc64 !x32 !hurd-any !ia64],
                cmake,
                dh-exec,
                doxygen <!nodoc>,
@@ -17,18 +17,16 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
                perl,
                libperl-dev,
                default-jdk-headless,
-               default-jdk-doc <!nodoc>,
+               default-jdk-doc,
                dh-octave,
                r-base-dev,
                r-base-core,
-               graphviz,
+               graphviz <!nodoc>,
                zlib1g-dev,
                libbz2-dev,
                libnewlib-dev,
                check,
-               texlive-latex-base <!nodoc>,
                rdfind,
-               texlive-latex-extra <!nodoc>
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/libsbml
 Vcs-Git: https://salsa.debian.org/med-team/libsbml.git
@@ -36,7 +34,7 @@ Homepage: http://www.sbml.org/
 Rules-Requires-Root: no
 
 Package: libsbml5-dev
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 mips64el ppc64el s390x ia64 ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Section: libdevel
 Depends: libsbml5t64 (= ${binary:Version}),
          ${misc:Depends}
@@ -52,7 +50,7 @@ Description: System Biology Markup Language library - development files
 Package: libsbml5t64
 Replaces: libsbml5
 Breaks: libsbml5 (<< ${source:Version})
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 mips64el ppc64el s390x ia64 ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -66,7 +64,7 @@ Description: System Biology Markup Language library
  but rather a library you can embed in your own applications.
 
 Package: python3-sbml5
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 mips64el ppc64el s390x ia64 ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Section: python
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -81,7 +79,7 @@ Description: System Biology Markup Language library - Python3 bindings
  This package contains the Python3 bindings of LibSBML.
 
 Package: libsbml5-java
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 mips64el ppc64el s390x ia64 ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Section: java
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -98,7 +96,7 @@ Description: System Biology Markup Language library - Java bindings
  This Package contains the Java bindings of LibSBML.
 
 Package: libsbml5-perl
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 mips64el ppc64el s390x ia64 ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Section: perl
 Depends: ${shlibs:Depends},
          ${perl:Depends},
@@ -113,7 +111,7 @@ Description: System Biology Markup Language library - Perl bindings
  This package contains the Perl bindings of LibSBML.
 
 Package: libsbml5-octave
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 mips64el ppc64el s390x ia64 ppc64 riscv64 sh4 sparc64 x32
+Architecture: any
 Section: math
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -128,7 +126,7 @@ Description: System Biology Markup Language library - Octave bindings
  This package contains the Octave bindings of LibSBML.
 
 Package: libsbml5-cil
-Architecture: any-amd64 arm64 armel armhf any-i386 loong64 ppc64el s390x ia64 ppc64 sh4 sparc64 x32
+Architecture: any-amd64 arm64 armel armhf any-i386 ppc64el s390x powerpc ppc64
 Section: cli-mono
 Depends: ${shlibs:Depends},
          ${misc:Depends},


=====================================
debian/rules
=====================================
@@ -18,10 +18,18 @@ ifdef BIND_MATLAB
 CMAKE_OPTS := $(shell cat debian/cmake_opts)
 endif
 
-ifneq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+BIND_DOXYGEN := $(shell command -v doxygen | grep -q doxygen && echo 'yes')
+BIND_MCS := $(shell command -v mcs | grep -q mcs && echo 'yes')
+
+ifdef BIND_DOXYGEN
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+CMAKE_OPTS += -DWITH_DOXYGEN:BOOL=ON
+else
 CMAKE_OPTS += -DWITH_DOXYGEN:BOOL=OFF
+undefine BIND_DOXYGEN
+endif
 else
-CMAKE_OPTS += -DWITH_DOXYGEN:BOOL=ON
+CMAKE_OPTS += -DWITH_DOXYGEN:BOOL=OFF
 endif
 
 ifneq ($(filter nocheck,$(DEB_BUILD_PROFILES)),)
@@ -36,10 +44,10 @@ endif
 
 CMAKE_OPTS += -DPYTHON_EXECUTABLE=/usr/bin/${PY3}
 
-ifneq (,$(filter $(DEB_HOST_ARCH), mips64el riscv64))
-CMAKE_OPTS += -DWITH_CSHARP:BOOL=OFF
-else
+ifdef BIND_MCS
 CMAKE_OPTS += -DWITH_CSHARP:BOOL=ON
+else
+CMAKE_OPTS += -DWITH_CSHARP:BOOL=OFF
 endif
 
 export PYBUILD_NAME=libsbml
@@ -49,7 +57,7 @@ export PYBUILD_NAME=libsbml
 DEB_COMPRESS_EXCLUDE = .pdf
 
 %:
-	dh $@ --builddir=build --buildsystem=cmake
+	dh $@ --builddir=build --buildsystem=cmake --without autoreconf --no-parallel
 
 execute_after_dh_auto_clean:
 	### the clean target of the libsbml makefile is highly b0rken ###
@@ -64,9 +72,6 @@ execute_after_dh_auto_clean:
 	docs/src/doxygen_sqlite3.db docs/src/libsbml.py docs/src/common-text/libsbml-version.html
 	find src/bindings -name "*.pyc" -delete
 
-override_dh_autoreconf:
-	echo "autoreconf -f -i   returns exit code 1 - skip this"
-
 ifdef BIND_MATLAB
 execute_before_dh_auto_configure:
 	cat debian/control.matlab >> debian/control || true
@@ -75,7 +80,6 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_OPTS)
 
-
 execute_after_dh_auto_install:
 ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 	sed 's#formatted/##g' docs/index.html.in > $(debtmp)/usr/share/libsbml/docs/index.html
@@ -94,7 +98,7 @@ endif
 	find $(debtmp)/usr/lib -name "*.mex*" -exec strip --strip-unneeded {} + || true
 	find $(debtmp)/usr/lib -name "*.mex*" -exec strip --remove-section=.comment {} + || true
 	dpkg-shlibdeps $(debtmp)/usr/lib/*/octave/site/oct/*/*.mex -Tdebian/libsbml5-octave.substvars
-	dh_octave_substvar
+	dh_octave_substvar --package=libsbml5-octave
 	# for some reason the perl library ends up in
 	#  debian/tmp/usr/lib/$(DEB_HOST_ARCH)/$(DEB_HOST_ARCH)/perl5
 	# try to fix this



View it on GitLab: https://salsa.debian.org/med-team/libsbml/-/compare/1e66a95ab454eece8bc68bc67f94dd21bbe774aa...4dcb1057e82f72d569987b4a0d6de6ebc3cab505

-- 
View it on GitLab: https://salsa.debian.org/med-team/libsbml/-/compare/1e66a95ab454eece8bc68bc67f94dd21bbe774aa...4dcb1057e82f72d569987b4a0d6de6ebc3cab505
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/20240430/5828c16a/attachment-0001.htm>


More information about the debian-med-commit mailing list