[med-svn] [Git][med-team/mira][master] 9 commits: fix due to race condition during doc build

Wed Sep 16 19:16:36 BST 2020


Andreas Tille pushed to branch master at Debian Med / mira


Commits:
06a2c4f8 by Andreas Tille at 2020-09-16T19:36:44+02:00
fix due to race condition during doc build

- - - - -
953797d4 by Andreas Tille at 2020-09-16T19:36:55+02:00
routine-update: Standards-Version: 4.5.0

- - - - -
b9d35e28 by Andreas Tille at 2020-09-16T19:36:55+02:00
routine-update: debhelper-compat 13

- - - - -
f2a24e03 by Andreas Tille at 2020-09-16T19:48:26+02:00
routine-update: Do not parse d/changelog

- - - - -
ada4f9c0 by Andreas Tille at 2020-09-16T19:48:26+02:00
routine-update: autopkgtest: s/ADTTMP/AUTOPKGTEST_TMP/g

- - - - -
eb8f8d66 by Andreas Tille at 2020-09-16T19:48:26+02:00
routine-update: Add salsa-ci file

- - - - -
93af1dda by Andreas Tille at 2020-09-16T19:48:26+02:00
routine-update: Rules-Requires-Root: no

- - - - -
85c3fdb6 by Andreas Tille at 2020-09-16T19:48:29+02:00
Set field Upstream-Name in debian/copyright.

Changes-By: lintian-brush

- - - - -
95047f6f by Andreas Tille at 2020-09-16T20:16:14+02:00
No redundant changelog entries

- - - - -


9 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/fix_buildorder.patch
- debian/patches/series
- debian/rules
- + debian/salsa-ci.yml
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,18 +1,26 @@
 mira (4.9.6-5) UNRELEASED; urgency=medium
 
-  [ Andreas Tille ]
-  * Remove unneeded get-orig-source target
-
   [ Michael R. Crusoe ]
   * Update homepage URL
   * Mark mira-doc as Multi-Arch: foreign
   * Secure URI in copyright format
-  * Standards-Version: 4.3.0; no changes needed
   * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
   * Remove trailing whitespace in debian/changelog
   * Remove trailing whitespace in debian/control
   * Remove trailing whitespace in debian/copyright
 
+  [ Andreas Tille ]
+  * Remove unneeded get-orig-source target
+  * fix race condition during doc build
+    Closes: #970443
+  * Standards-Version: 4.5.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Do not parse d/changelog (routine-update)
+  * autopkgtest: s/ADTTMP/AUTOPKGTEST_TMP/g (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+  * Set field Upstream-Name in debian/copyright.
+
  -- Andreas Tille <tille at debian.org>  Wed, 19 Sep 2018 22:41:27 +0200
 
 mira (4.9.6-4) unstable; urgency=medium


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders: Charles Plessy <plessy at debian.org>,
            Michael R. Crusoe <michael.crusoe at gmail.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
                autoconf-archive,
                libbz2-dev,
                libexpat1-dev,
@@ -25,10 +25,11 @@ Build-Depends: debhelper (>= 11~),
                libboost-iostreams-dev
 Build-Depends-Indep: docbook-xsl,
                      dblatex
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/mira
 Vcs-Git: https://salsa.debian.org/med-team/mira.git
 Homepage: https://sourceforge.net/p/mira-assembler/wiki/Home/
+Rules-Requires-Root: no
 
 Package: mira-assembler
 Architecture: any


=====================================
debian/copyright
=====================================
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Bastien Chevreux <bach at chevreux.org>
 Source: http://jaist.dl.sourceforge.net/project/mira-assembler/MIRA/V3rc2/mira-3rc2.tar.bz2
+Upstream-Name: mira
 
 Files: *
 Copyright: © 1997-2000 for MIRA V1.x and EdIt: Bastien Chevreux, Thomas Pfisterer, Deutsches Krebsforschungszentrum Heidelberg -- Dept. of Molecula Biophysics.
@@ -50,4 +51,3 @@ License: GPL-2+
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 Comment: On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-


=====================================
debian/patches/fix_buildorder.patch
=====================================
@@ -0,0 +1,16 @@
+Date: Wed, 16 Sep 2020 15:48:00 +0200
+From: Sven Mueller <sven.mueller72 at gmail.com>
+Bug-Debian: https://bugs.debian.org/970443
+Description: fix race condition during doc build
+
+--- a/doc/docbook/Makefile.am
++++ b/doc/docbook/Makefile.am
+@@ -19,7 +19,7 @@ EXTRA_DIST = ${CHAP_XML} book_definitive
+ clean-local:
+ 	rm -rf *html *pdf versionfile
+ 
+-%_part.html: %_part.xml
++%_part.html: %_part.xml versionfile
+ 	@echo "Making .html out of _part.xml" $@
+ 	@$(SHELL) -ec 'xsltproc --nonet --xinclude --output $@  $(top_srcdir)/doc/docbook/mira.xsl $<'
+ 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 spelling.patch
 sls-rrna-fix
 man-directory
+fix_buildorder.patch


=====================================
debian/rules
=====================================
@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
+include /usr/share/dpkg/default.mk
 export DEBIAN_MAINTAINER=$(dpkg-parsechangelog -SMaintainer)
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
@@ -14,12 +15,12 @@ include /usr/share/dpkg/default.mk
 	dh $@
 
 override_dh_auto_install-arch:
-	make install DESTDIR=$(CURDIR)/debian/$(pkg)
+	make install DESTDIR=$(CURDIR)/debian/$(DEB_SOURCE)
 
 override_dh_auto_install-indep:
 	#There is no installation target for the docs
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/$(pkg)
-	cp -r -t $(CURDIR)/debian/tmp/usr/share/doc/$(pkg) doc/docbook/bookfigures doc/docbook/images \
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/$(DEB_SOURCE)
+	cp -r -t $(CURDIR)/debian/tmp/usr/share/doc/$(DEB_SOURCE) doc/docbook/bookfigures doc/docbook/images \
 	    doc/docbook/doccss doc/docbook/DefinitiveGuideToMIRA.html || true
 
 override_dh_auto_test-arch:


=====================================
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
=====================================
@@ -2,12 +2,12 @@
 
 pkg=mira
 
-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
+cd $AUTOPKGTEST_TMP
 
 cp -a /usr/share/doc/${pkg}-assembler/test_data .
 cp -a /usr/share/doc/${pkg}-assembler/*.conf .



View it on GitLab: https://salsa.debian.org/med-team/mira/-/compare/b1fb2927b8c84cd9ce600d5d5e6622f6e39973f9...95047f6f51c0e28e8cc172da80ebacd7d441953b

-- 
View it on GitLab: https://salsa.debian.org/med-team/mira/-/compare/b1fb2927b8c84cd9ce600d5d5e6622f6e39973f9...95047f6f51c0e28e8cc172da80ebacd7d441953b
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/20200916/9b979c8e/attachment-0001.html>
