[med-svn] [Git][med-team/raster3d][master] 7 commits: New upstream version 3.0-7
Andreas Tille
gitlab at salsa.debian.org
Wed Sep 30 10:04:49 BST 2020
Andreas Tille pushed to branch master at Debian Med / raster3d
Commits:
b9349df7 by Andreas Tille at 2020-09-30T09:13:27+02:00
New upstream version 3.0-7
- - - - -
20e6a348 by Andreas Tille at 2020-09-30T09:13:27+02:00
routine-update: New upstream version
- - - - -
d25c22b3 by Andreas Tille at 2020-09-30T09:13:34+02:00
Update upstream source from tag 'upstream/3.0-7'
Update to upstream version '3.0-7'
with Debian dir 3ffc6a78e5219155d35590b65ab124206faa3b9f
- - - - -
4b8ac2b1 by Andreas Tille at 2020-09-30T09:20:27+02:00
Adapt quilt patch to new upstream version that is supposed to work with gfortran-10
- - - - -
ef1f8257 by Andreas Tille at 2020-09-30T10:16:03+02:00
Do not install patches as docs, Install share/raster3d from debian/tmp, Remove redundant overrides from d/rules
- - - - -
d2d5636c by Andreas Tille at 2020-09-30T10:33:55+02:00
Port worms script to POSIX shell and install it to /usr/bin
- - - - -
c90dead9 by Andreas Tille at 2020-09-30T10:36:20+02:00
Upload to unstable
- - - - -
12 changed files:
- CHANGELOG
- Makefile
- README
- VERSION
- debian/changelog
- − debian/install
- debian/patches/Makefile.diff
- debian/patches/series
- + debian/patches/worms_sh.patch
- + debian/raster3d.install
- debian/rules
- parse.f
Changes:
=====================================
CHANGELOG
=====================================
@@ -1,3 +1,10 @@
+29-Sep-2020 Package 3.0-7
+13-May-2020 -std=legacy seems to reduce pedantry from gfortran 10.1
+10-May-2020 gfortran 10.1 is insanely picky - must wrap hex constants in INT(...)
+08-May-2020 Package 3.0-6
+08-May-2020 Change flag for hexadecimal constant from X'000 to Z'000
+08-May-2020 recent gfortran has inverted the meaning of compiler flag -Wtabs (?!)
+12-Nov-2019 Package 3.0-5
12-Nov-2019 rods.f: gfortran 8.3 requires decimal point after floating 0
12-Nov-2019 import into git
21-Jan-2019 Package 3.0-4
=====================================
Makefile
=====================================
@@ -52,7 +52,7 @@ linux:
@echo OS = linux >> Makefile.incl
@echo CC = gcc >> Makefile.incl
@echo CFLAGS = -g -Wall -Dgfortran >> Makefile.incl
- @echo FC = gfortran >> Makefile.incl
+ @echo FC = gfortran -std=legacy >> Makefile.incl
@echo FFLAGS = -g -w -O3 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
@echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
=====================================
README
=====================================
@@ -1,6 +1,6 @@
-Most recent change: 06-May-2020
+Most recent change: 29-Sep-2020
-The file Raster3D_3.0-6.tar.gz contains the full source distribution for
+The file Raster3D_3.0-7.tar.gz contains the full source distribution for
version 3.0 of Raster3D.
See CHANGELOG for a history of changes to the package.
=====================================
VERSION
=====================================
@@ -1 +1 @@
-VERSION = "3.0-6"
+VERSION = "3.0-7"
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-raster3d (3.0-6-1) UNRELEASED; urgency=medium
+raster3d (3.0-7-1) unstable; urgency=medium
* New upstream version
* Standards-Version: 4.5.0 (routine-update)
@@ -8,9 +8,12 @@ raster3d (3.0-6-1) UNRELEASED; urgency=medium
* Trim trailing whitespace.
* Remove obsolete field Name from debian/upstream/metadata (already present in
machine-readable debian/copyright).
- TODO: fails to build with gfortran-10
+ * Do not install patches as docs
+ * Install share/raster3d from debian/tmp
+ * Remove redundant overrides from d/rules
+ * Port worms script to POSIX shell and install it to /usr/bin
- -- Andreas Tille <tille at debian.org> Tue, 29 Sep 2020 12:44:22 +0200
+ -- Andreas Tille <tille at debian.org> Wed, 30 Sep 2020 10:34:41 +0200
raster3d (3.0-4-1) unstable; urgency=medium
=====================================
debian/install deleted
=====================================
@@ -1,13 +0,0 @@
-debian/diffs.tar usr/share/doc/raster3d/
-debian/tmp/bin/*.real usr/lib/raster3d/
-debian/tmp/bin/avs2ps usr/bin/
-debian/tmp/bin/balls usr/bin/
-debian/tmp/bin/label3d usr/bin/
-debian/tmp/bin/rastep usr/bin/
-debian/tmp/bin/ribbon usr/bin/
-debian/tmp/bin/rings3d usr/bin/
-debian/tmp/bin/rods usr/bin/
-debian/tmp/bin/stereo3d usr/bin/
-debian/tmp/share/man/ usr/share/
-debian/wrappers/* usr/bin/
-materials/ usr/share/raster3d/
=====================================
debian/patches/Makefile.diff
=====================================
@@ -11,7 +11,7 @@ Description: Several fixed in Makefile
@echo CC = gcc >> Makefile.incl
- @echo CFLAGS = -g -Wall -Dgfortran >> Makefile.incl
+ @echo CFLAGS = -g -O2 -Wall -Dgfortran >> Makefile.incl
- @echo FC = gfortran >> Makefile.incl
+ @echo FC = gfortran -std=legacy >> Makefile.incl
- @echo FFLAGS = -g -w -O3 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
+ @echo FFLAGS = -g -w -O2 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
@echo RM = /bin/rm -f >> Makefile.incl
=====================================
debian/patches/series
=====================================
@@ -19,3 +19,4 @@ rods.man.diff
fix_bashism.patch
spelling.patch
+worms_sh.patch
=====================================
debian/patches/worms_sh.patch
=====================================
@@ -0,0 +1,27 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 30 Sep 2020 09:13:27 +0200
+Description: Port worms script to POSIX shell
+
+--- a/worms
++++ b/worms
+@@ -1,4 +1,4 @@
+-#!/bin/csh
++#!/bin/sh
+ #
+ # Wrapper for rods program that splits main/sidechain atoms for
+ # separate treatment. The backbone is drawn as a radius 0.3 worm.
+@@ -10,12 +10,12 @@ cat > worms.tmp.0
+ # Backbone first, with or without header as determined by $1 (-h)
+ #
+ rm -rf worms.tmp.1
+-if ($1 == "-h") then
++if [ "$1" = "-h" ] ; then
+ echo "# Worms version 1.0" > worms.tmp.1
+ echo "# Backbone atoms" >> worms.tmp.1
+ else
+ touch worms.tmp.1
+-endif
++fi
+ grep -E -w '(^COLOUR.*)|(N)|(C)|(CA)' worms.tmp.0 | rods $1 -r 0.3 >> worms.tmp.1
+ #
+ # Now the sidechains (actually everything but the backbone carbonyl bond)
=====================================
debian/raster3d.install
=====================================
@@ -0,0 +1,13 @@
+debian/tmp/bin/*.real usr/lib/raster3d/
+debian/tmp/bin/avs2ps usr/bin/
+debian/tmp/bin/balls usr/bin/
+debian/tmp/bin/label3d usr/bin/
+debian/tmp/bin/rastep usr/bin/
+debian/tmp/bin/ribbon usr/bin/
+debian/tmp/bin/rings3d usr/bin/
+debian/tmp/bin/rods usr/bin/
+debian/tmp/bin/stereo3d usr/bin/
+debian/tmp/bin/worms usr/bin/
+debian/tmp/share/man/ usr/share/
+debian/wrappers/* usr/bin/
+debian/tmp/share/raster3d usr/share
=====================================
debian/rules
=====================================
@@ -8,23 +8,11 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@
-override_dh_clean:
- # $(MAKE) clean
- dh_clean
- rm -f debian/diffs.tar
-
-override_dh_auto_configure:
- mkdir debian/tmp
- cd debian/patches/ && tar --owner=root --group=root --numeric-owner \
- -cf ../diffs.tar *.diff || true
- # dh_auto_configure
-
override_dh_auto_build:
$(MAKE) linux
override_dh_auto_install:
- $(MAKE) install prefix=$(CURDIR)/debian/tmp
- find $(CURDIR)/debian/tmp -name CVS -type d -exec rm -rf \{\} \; || true
+ dh_auto_install -- prefix=$(CURDIR)/debian/tmp
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG
=====================================
parse.f
=====================================
@@ -115,8 +115,8 @@ c
else if (option(1:3).eq.'-bg') then
iarg = iarg + 1
call getarg( iarg, option )
- if (option(1:5).eq.'white') xbg = Z'FFFFFF'
- if (option(1:5).eq.'black') xbg = Z'000000'
+ if (option(1:5).eq.'white') xbg = INT(Z'FFFFFF')
+ if (option(1:5).eq.'black') xbg = INT(Z'000000')
if (option(1:1).eq.'#') then
read (option(2:7),'(1Z6)') xbg
if (verbose) then
View it on GitLab: https://salsa.debian.org/med-team/raster3d/-/compare/1b131a83b2a4a1f123174e526e435bf19b7d304e...c90dead90602998b1913455855c7804ae27d28d1
--
View it on GitLab: https://salsa.debian.org/med-team/raster3d/-/compare/1b131a83b2a4a1f123174e526e435bf19b7d304e...c90dead90602998b1913455855c7804ae27d28d1
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/20200930/4b9edd0d/attachment-0001.html>
More information about the debian-med-commit
mailing list