[med-svn] [Git][med-team/emboss][master] 6 commits: Enable building on hppa by disabling java support which is missing there
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Oct 10 15:46:17 BST 2022
Andreas Tille pushed to branch master at Debian Med / emboss
Commits:
9908b29d by Andreas Tille at 2022-10-10T15:36:42+02:00
Enable building on hppa by disabling java support which is missing there
- - - - -
0e357a40 by Andreas Tille at 2022-10-10T15:37:34+02:00
routine-update: Standards-Version: 4.6.1
- - - - -
f6e023bb by Andreas Tille at 2022-10-10T15:37:59+02:00
Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html
- - - - -
ca97aad2 by Andreas Tille at 2022-10-10T15:38:13+02:00
Apply multi-arch hints.
+ emboss-data, emboss-doc, emboss-test: Add Multi-Arch: foreign.
Changes-By: apply-multiarch-hints
- - - - -
12f0d2d4 by Andreas Tille at 2022-10-10T16:30:34+02:00
Lintian-overrides (See lintian bug #1017966)
- - - - -
d05f6aec by Andreas Tille at 2022-10-10T16:44:19+02:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/rules
- + debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+emboss (6.6.0+dfsg-12) unstable; urgency=medium
+
+ * Enable building on hppa by disabling java support which is missing there
+ Closes: #1021440
+ * Standards-Version: 4.6.1 (routine-update)
+ * Use secure URI in Homepage field.
+ * Lintian-overrides (See lintian bug #1017966)
+
+ -- Andreas Tille <tille at debian.org> Mon, 10 Oct 2022 16:30:48 +0200
+
emboss (6.6.0+dfsg-11) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Charles Plessy <plessy at debian.org>,
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
-# javahelper,
+# javahelper [!hppa] <!nojava>,
libx11-dev,
x11proto-core-dev,
libgdchart-gd2-xpm-dev,
@@ -19,13 +19,13 @@ Build-Depends: debhelper-compat (= 13),
sharutils,
tcsh | csh | c-shell,
# Needed until the following is solved: https://sourceforge.net/tracker/?func=detail&aid=3033326&group_id=93650&atid=605031
- default-jdk,
- ant
+ default-jdk [!hppa] <!nojava>,
+ ant [!hppa] <!nojava>
# #Build-Depends-Indep: default-jdk
-Standards-Version: 4.5.0
+Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/emboss
Vcs-Git: https://salsa.debian.org/med-team/emboss.git
-Homepage: http://emboss.sourceforge.net
+Homepage: https://emboss.sourceforge.net
Rules-Requires-Root: no
Package: emboss
@@ -54,6 +54,7 @@ Description: European molecular biology open software suite
Package: emboss-data
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: data files for the EMBOSS package
EMBOSS is a free Open Source software analysis package specially developed for
the needs of the molecular biology (e.g. EMBnet) user community. The software
@@ -73,6 +74,7 @@ Architecture: all
Section: doc
Depends: ${misc:Depends}
Suggests: evince | pdf-viewer | postscript-viewer
+Multi-Arch: foreign
Description: documentation for EMBOSS
EMBOSS is a free Open Source software analysis package specially developed for
the needs of the molecular biology (e.g. EMBnet) user community. The software
@@ -93,6 +95,7 @@ Section: misc
Depends: ${misc:Depends}
Recommends: tcsh | csh | c-shell
Suggests: valgrind
+Multi-Arch: foreign
Description: test files for the EMBOSS package
EMBOSS is a free Open Source software analysis package specially developed for
the needs of the molecular biology (e.g. EMBnet) user community. The software
@@ -142,6 +145,7 @@ Description: EMBOSS Libraries
Package: jemboss
Architecture: all
+Build-Profiles: <!nojava>
Depends: ${shlibs:Depends},
${misc:Depends},
emboss,
=====================================
debian/rules
=====================================
@@ -16,6 +16,13 @@ include /usr/share/dpkg/default.mk
VERSION=$(DEB_VERSION_UPSTREAM)
RENAMED := cons pscan
+# Disable java packages on architecture that don't have
+# an openjdk port.
+nojava_archs = hppa
+ifneq (,$(filter $(DEB_HOST_ARCH), $(nojava_archs)))
+export DEB_BUILD_PROFILES += nojava
+endif
+
EMBOSS-TMP = $(CURDIR)/debian/emboss_tmp
EMBOSS = $(CURDIR)/debian/emboss
EMBOSS-TEST = $(CURDIR)/debian/emboss-test
@@ -25,8 +32,11 @@ CONFFLAGS = --bindir=/usr/lib/emboss
CONFFLAGS += --libdir=/usr/lib/emboss/lib
CONFFLAGS += --includedir=/usr/lib/emboss/include
CONFFLAGS += --enable-systemlibs
+
+ifeq ($(filter nojava,$(DEB_BUILD_PROFILES)),)
CONFFLAGS += --with-java=/usr/lib/jvm/default-java/include
CONFFLAGS += --with-javaos=/usr/lib/jvm/default-java/include/linux
+endif
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
@@ -42,9 +52,11 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build -- AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(DEB_LDFLAGS)"
+ifeq ($(filter nojava,$(DEB_BUILD_PROFILES)),)
# Add 2 extra files wanted in jemboss.jar
cd jemboss/lib && make jemboss.jar
cd jemboss && jar uf lib/jemboss.jar resources/version resources/*.properties
+endif
override_dh_clean:
rm -rf debian/emboss_tmp
@@ -88,6 +100,7 @@ override_dh_auto_install-indep:
### While the next call repeats a statement from install-arch it is needed to get the
### data dir right into place. Make should be clever enough to not duplicate the process
$(MAKE) -C emboss install DESTDIR=$(EMBOSS-TMP)
+ifeq ($(filter nojava,$(DEB_BUILD_PROFILES)),)
$(MAKE) -C jemboss install DESTDIR=$(CURDIR)/debian/jemboss bindir=/usr/bin
# install target seems to remove executable flag which is claimed by lintian
find debian/jemboss/usr/share/EMBOSS/jemboss/utils -type f -not -executable -name "*sh" -exec chmod a+x \{\} \;
@@ -95,6 +108,7 @@ override_dh_auto_install-indep:
rm debian/jemboss/usr/share/EMBOSS/jemboss/LICENSE
# resources.jar not needed as we use the data files in /usr/share/EMBOSS/data/
rm -f debian/jemboss/usr/share/EMBOSS/jemboss/resources/resources.jar
+endif
### Installation of the test suite
cp -a test debian/emboss-test/usr/share/EMBOSS/
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# See lintian bug #1017966
+emboss source: source-is-missing
View it on GitLab: https://salsa.debian.org/med-team/emboss/-/compare/948d57e84dec81f28a20da2e7fbbae835766c323...d05f6aec8fa9661c3347708894d25cbdfc1f9709
--
View it on GitLab: https://salsa.debian.org/med-team/emboss/-/compare/948d57e84dec81f28a20da2e7fbbae835766c323...d05f6aec8fa9661c3347708894d25cbdfc1f9709
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/20221010/45213609/attachment-0001.htm>
More information about the debian-med-commit
mailing list