[med-svn] [Git][med-team/biosquid][master] 9 commits: Disable pvm
Andreas Tille
gitlab at salsa.debian.org
Wed Aug 12 10:35:20 BST 2020
Andreas Tille pushed to branch master at Debian Med / biosquid
Commits:
afb73a16 by Andreas Tille at 2020-08-12T11:18:28+02:00
Disable pvm
- - - - -
1f6f5e7f by Andreas Tille at 2020-08-12T11:19:56+02:00
routine-update: Standards-Version: 4.5.0
- - - - -
2edf2316 by Andreas Tille at 2020-08-12T11:19:56+02:00
routine-update: debhelper-compat 13
- - - - -
ca224f77 by Andreas Tille at 2020-08-12T11:22:54+02:00
routine-update: Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
- - - - -
b3b0cea7 by Andreas Tille at 2020-08-12T11:22:54+02:00
routine-update: autopkgtest: s/ADTTMP/AUTOPKGTEST_TMP/g
- - - - -
656c1041 by Andreas Tille at 2020-08-12T11:22:55+02:00
routine-update: Add salsa-ci file
- - - - -
1df82314 by Andreas Tille at 2020-08-12T11:22:55+02:00
routine-update: Rules-Requires-Root: no
- - - - -
078f088b by Andreas Tille at 2020-08-12T11:22:55+02:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
c9f9197a by Andreas Tille at 2020-08-12T11:23:00+02:00
Refer to specific version of license GPL-2.
Changes-By: lintian-brush
Fixes: lintian: copyright-refers-to-symlink-license
See-also: https://lintian.debian.org/tags/copyright-refers-to-symlink-license.html
Fixes: lintian: copyright-refers-to-versionless-license-file
See-also: https://lintian.debian.org/tags/copyright-refers-to-versionless-license-file.html
- - - - -
7 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/rules
- + debian/salsa-ci.yml
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,23 @@
biosquid (1.9g+cvs20050121-12) UNRELEASED; urgency=medium
+ [ Jelmer Vernooij ]
* Use secure copyright file specification URI.
* Trim trailing whitespace.
- -- Jelmer Vernooij <jelmer at debian.org> Sat, 20 Oct 2018 13:16:22 +0000
+ [ Andreas Tille ]
+ * Disable pvm (see
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957717#17 )
+ * Standards-Version: 4.5.0 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine-
+ update)
+ * autopkgtest: s/ADTTMP/AUTOPKGTEST_TMP/g (routine-update)
+ * Add salsa-ci file (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+ * Trim trailing whitespace.
+ * Refer to specific version of license GPL-2.
+
+ -- Andreas Tille <tille at debian.org> Wed, 12 Aug 2020 11:14:11 +0200
biosquid (1.9g+cvs20050121-11) unstable; urgency=medium
@@ -131,4 +145,3 @@ biosquid (1.9g+cvs20050121-1) unstable; urgency=low
* Initial release (Closes: #319945).
-- Nelson A. de Oliveira <naoliv at gmail.com> Sat, 5 Aug 2006 01:03:52 -0300
-
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,13 +3,13 @@ Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 11~),
- d-shlibs,
- pvm-dev
-Standards-Version: 4.2.0
+Build-Depends: debhelper-compat (= 13),
+ d-shlibs
+Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/biosquid
Vcs-Git: https://salsa.debian.org/med-team/biosquid.git
Homepage: http://eddylab.org/software.html
+Rules-Requires-Root: no
Package: biosquid
Architecture: any
=====================================
debian/copyright
=====================================
@@ -44,10 +44,9 @@ License: GPL-2
General Public License for more details.
.
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
Files: debian/*
Copyright: © 2005-2008 Nelson A. de Oliveira <naoliv at gmail.com>
2008-2014 Andreas Tille <tille at debian.org>
License: GPL-2
-
=====================================
debian/rules
=====================================
@@ -18,7 +18,7 @@ override_dh_auto_clean:
override_dh_auto_configure:
# autoreconf && true
autoconf
- dh_auto_configure -- --enable-lfs --enable-pvm
+ dh_auto_configure -- --enable-lfs # --enable-pvm
# avoid duplicated definition of PACKAGE_NAME (basically conflicting with hmmer2 when used together)
sed -i -e '/^#define PACKAGE_NAME /i #ifndef PACKAGE_NAME' \
-e '/^#define PACKAGE_NAME /a #endif' \
@@ -39,7 +39,6 @@ override_dh_install:
--multiarch \
--devunversioned \
--exclude-la \
- --override s/libpvm3-3-dev/pvm-dev/ \
--movedev debian/tmp/usr/include/* usr/include \
--movedev squid.h usr/include/$(DEB_SOURCE) \
--movedev squidconf.h usr/include/$(DEB_SOURCE) \
@@ -61,9 +60,11 @@ override_dh_installexamples:
sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' $(CURDIR)/debian/$(LIBNAME)-dev/usr/share/doc/$(LIBNAME)-dev/examples/Formats/*.pl
override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
chmod u+x Testsuite/x-base-* Testsuite/bug-1-sfetch*
ln -s .libs/libsquid.a
dh_auto_test
+endif
override_dh_installman:
dh_installman
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
=====================================
debian/tests/run-unit-test
=====================================
@@ -11,12 +11,12 @@ TOOLS="afetch
sreformat
"
-if [ "$ADTTMP" = "" ] ; then
- ADTTMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
- trap "rm -rf $ADTTMP" 0 INT QUIT ABRT PIPE TERM
+if [ "$AUTOPKGTEST_TMP" = "" ] ; then
+ AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+ trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
fi
-cd $ADTTMP
-cp -a /usr/share/doc/libsquid-dev/examples/* $ADTTMP
+cd $AUTOPKGTEST_TMP
+cp -a /usr/share/doc/libsquid-dev/examples/* $AUTOPKGTEST_TMP
find . -name "*.gz" -exec gunzip \{\} \;
cd Testsuite
sed -i 's#-I../#-I/usr/include/biosquid#' Makefile
View it on GitLab: https://salsa.debian.org/med-team/biosquid/-/compare/f6b147f3933aede78d97f6aaa808c37ea888d215...c9f9197a04c488b7eba201f10c6a10fc2ca06498
--
View it on GitLab: https://salsa.debian.org/med-team/biosquid/-/compare/f6b147f3933aede78d97f6aaa808c37ea888d215...c9f9197a04c488b7eba201f10c6a10fc2ca06498
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/20200812/598c3587/attachment-0001.html>
More information about the debian-med-commit
mailing list