[med-svn] [Git][med-team/libsbml][master] 5 commits: fix build for multiarch cross building

[Michael R. Crusoe]

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


Commits:
d25bbcef by Michael R. Crusoe at 2019-01-20T07:18:41Z
fix build for multiarch cross building

- - - - -
c1ac9d97 by Michael R. Crusoe at 2019-01-20T07:18:46Z
Multi-Arch hints

- - - - -
9dd1c240 by Michael R. Crusoe at 2019-01-20T07:21:26Z
link to jquery, don't package it

- - - - -
dd30a63e by Michael R. Crusoe at 2019-01-20T07:21:57Z
slim build-deps (637 → 595) use jdk-headless

- - - - -
04f654b1 by Michael R. Crusoe at 2019-01-20T07:41:35Z
upload to unstable

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,17 @@
-libsbml (5.17.2+dfsg-2) UNRELEASED; urgency=medium
+libsbml (5.17.2+dfsg-2) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Andreas Tille ]
   * Add missing Breaks+Replaces: libsbml5-python-doc
     Closes: #919794
 
- -- Andreas Tille <tille at debian.org>  Sat, 19 Jan 2019 18:19:30 +0100
+  [ Michael R. Crusoe ]
+  * Fix build for multiarch cross building (specifically i386 on amd64)
+  * Link to jquery and other assets from the default-jdk-doc
+  * Slim build-deps (637 → 595) use jdk-headless
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sat, 19 Jan 2019 23:39:33 -0800
 
 libsbml (5.17.2+dfsg-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 12~),
                python3-dev,
                perl,
                libperl-dev,
-               default-jdk,
+               default-jdk-headless,
+	       default-jdk-doc,
                dh-octave,
                r-base-dev,
                r-base-core,
@@ -26,7 +27,8 @@ Build-Depends: debhelper (>= 12~),
                mono-mcs,
                cli-common-dev,
                mono-runtime-common,
-               texlive-latex-base
+               texlive-latex-base,
+	       rdfind
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/libsbml
 Vcs-Git: https://salsa.debian.org/med-team/libsbml.git
@@ -61,6 +63,7 @@ Description: System Biology Markup Language library
 
 Package: python3-sbml5
 Architecture: any
+Multi-Arch: same
 Section: python
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -80,7 +83,8 @@ Architecture: any
 Section: java
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         jarwrapper
+         jarwrapper,
+	 default-jdk-doc
 Pre-Depends: ${misc:Pre-Depends}
 Provides: libsbml-java
 Description: System Biology Markup Language library - Java bindings
@@ -139,6 +143,7 @@ Description: System Biology Markup Language library - CLI bindings
 
 Package: libsbml5-examples
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libsbml5-dev (= ${binary:Version})
@@ -152,6 +157,7 @@ Description: System Biology Markup Language library -- example files
 
 Package: libsbml5-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libsbml5-dev (= ${binary:Version})
@@ -165,6 +171,7 @@ Description: System Biology Markup Language library -- documentation
 
 Package: libsbml5-cil-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libsbml5-dev (= ${binary:Version})
@@ -191,6 +198,7 @@ Description: System Biology Markup Language library -- Perl documentation
 
 Package: python3-sbml5-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Breaks: libsbml5-python-doc


=====================================
debian/rules
=====================================
@@ -88,11 +88,11 @@ override_dh_auto_install:
 	#  debian/tmp/usr/lib/$(DEB_HOST_ARCH)/$(DEB_HOST_ARCH)/perl5
 	# try to fix this
 	set -x ; \
-	for madir in `find debian -name $(DEB_BUILD_GNU_TYPE) -type d | sort | uniq` ; do \
-	    if [ -d $${madir}/$(DEB_BUILD_GNU_TYPE) ] ; then \
-	        echo "Moving contents of wrong directory $${madir}/$(DEB_BUILD_GNU_TYPE) into place" ; \
-		mv $${madir}/$(DEB_BUILD_GNU_TYPE)/* $${madir} ; \
-		rmdir $${madir}/$(DEB_BUILD_GNU_TYPE) ; \
+	for madir in `find debian -name $(DEB_BUILD_MULTIARCH) -type d | sort | uniq` ; do \
+	    if [ -d $${madir}/$(DEB_BUILD_MULTIARCH) ] ; then \
+	        echo "Moving contents of wrong directory $${madir}/$(DEB_BUILD_MULTIARCH) into place" ; \
+		mv $${madir}/$(DEB_BUILD_MULTIARCH)/* $${madir} ; \
+		rmdir $${madir}/$(DEB_BUILD_MULTIARCH) ; \
 	    fi ; \
 	done
 ifdef BIND_MATLAB
@@ -110,3 +110,15 @@ override_dh_installchangelogs:
 
 override_dh_dwz:
 	echo "Skip dwz: Too few files for multifile optimization"
+
+override_jh_installjavadoc:
+	jh_installjavadoc
+	rdfind -makesymlinks true -followsymlinks true \
+		$$(dpkg -L $$(apt-cache show default-jdk-doc | grep Depends \
+		              | awk '{print $$2}') | grep /usr/share/doc/ \
+		   | head -n1) \
+		debian/libsbml5-java/usr/share/doc/libsbml5-java/
+ifeq ($(DH_VERBOSE),1)
+	cat results.txt || /bin/true
+endif
+	rm -f results.txt



View it on GitLab: https://salsa.debian.org/med-team/libsbml/compare/79c19566915cf10feb62429d52b0029008a4bcf9...04f654b1ee2de985a62a32da53f91da64460c43f

-- 
View it on GitLab: https://salsa.debian.org/med-team/libsbml/compare/79c19566915cf10feb62429d52b0029008a4bcf9...04f654b1ee2de985a62a32da53f91da64460c43f
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/20190130/8c2c2275/attachment-0001.html>