[med-svn] [Git][med-team/raster3d][master] 5 commits: d/patches/*: normalize dep3 headers.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Sun Dec 7 17:41:30 GMT 2025
Étienne Mollier pushed to branch master at Debian Med / raster3d
Commits:
c7c196d6 by Étienne Mollier at 2025-12-07T18:15:31+01:00
d/patches/*: normalize dep3 headers.
- - - - -
57eef3dc by Étienne Mollier at 2025-12-07T18:15:53+01:00
d/control: add myself to uploaders.
- - - - -
616c4a99 by Étienne Mollier at 2025-12-07T18:16:29+01:00
buildflags.patch: new: propagate build flags.
Closes: #1119545
- - - - -
7dca69e2 by Étienne Mollier at 2025-12-07T18:38:28+01:00
d/rules: convert html documents to UTF-8.
- - - - -
42e3aa2c by Étienne Mollier at 2025-12-07T18:40:37+01:00
d/changelog: ready for upload to unstable.
- - - - -
23 changed files:
- debian/changelog
- debian/control
- debian/patches/BUGS.diff
- debian/patches/Makefile.diff
- debian/patches/Makefile.template.diff
- + debian/patches/buildflags.patch
- debian/patches/example1.script.diff
- debian/patches/example2.script.diff
- debian/patches/example2.sgi.diff
- debian/patches/example3.script.diff
- debian/patches/example4.script.diff
- debian/patches/example5.script.diff
- debian/patches/example6.script.diff
- debian/patches/example7.script.diff
- debian/patches/example8.script.diff
- debian/patches/example9.script.diff
- debian/patches/msms_example.script.diff
- debian/patches/r3d_objects.man.diff
- debian/patches/raster3d.man.diff
- debian/patches/render.man.diff
- debian/patches/rods.man.diff
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+raster3d (3.0-8-2) unstable; urgency=medium
+
+ * buildflags.patch: new: propagate build flags. (Closes: #1119545)
+ * d/rules: convert html documents to UTF-8.
+ * d/control: add myself to uploaders.
+ * d/patches/*: normalize dep3 headers.
+
+ -- Étienne Mollier <emollier at debian.org> Sun, 07 Dec 2025 18:39:02 +0100
+
raster3d (3.0-8-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,6 +1,7 @@
Source: raster3d
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+ Étienne Mollier <emollier at debian.org>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
=====================================
debian/patches/BUGS.diff
=====================================
@@ -1,6 +1,6 @@
Author: Nelson A. de Oliveira
Andreas Tille
-Last-Update: 2011-03-25 10:19:22
+Last-Update: 2011-03-25
Description: Remove non-relevant parts from documentation
--- a/BUGS
=====================================
debian/patches/Makefile.diff
=====================================
@@ -1,6 +1,6 @@
Author: Andreas Tille,
Nelson A. de Oliveira
-Last-Update: 2014-04-13 07:31:17 +0000
+Last-Update: 2014-04-13
Description: Several fixed in Makefile
--- raster3d.orig/Makefile
=====================================
debian/patches/Makefile.template.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37
+Last-Update: 2008-02-24
Description: Adapt to Debian installation PATH
--- a/Makefile.template
=====================================
debian/patches/buildflags.patch
=====================================
@@ -0,0 +1,204 @@
+Description: propagate build flags via environment variables.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/1119545
+Forwarded: no
+Last-Update: 2025-12-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- raster3d.orig/Makefile
++++ raster3d/Makefile
+@@ -53,24 +53,24 @@
+ @cp Makefile.template Makefile.incl
+ @echo OS = linux >> Makefile.incl
+ @echo CC = gcc >> Makefile.incl
+- @echo CFLAGS = -g -O2 -Wall -Dgfortran >> Makefile.incl
++ @echo CFLAGS += -g -O2 -Wall -Dgfortran >> Makefile.incl
+ @echo FC = gfortran -std=legacy >> Makefile.incl
+- @echo FFLAGS = -g -w -O2 -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
+ @echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
+ @echo include Makefile.package >> Makefile.incl
+ @echo >> Makefile.incl
+ @echo qinp.o: qinp.f normal3d.o >> Makefile.incl
+- @echo " \$$(FC) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
++ @echo " \$$(FC) \$$(FFLAGS) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
+ @echo >> Makefile.incl
+
+ linux-ifort:
+ @cp Makefile.template Makefile.incl
+ @echo OS = linux >> Makefile.incl
+ @echo CC = gcc >> Makefile.incl
+- @echo CFLAGS = -g -Wall >> Makefile.incl
++ @echo CFLAGS += -g -Wall >> Makefile.incl
+ @echo FC = ifort >> Makefile.incl
+- @echo FFLAGS = -g -w -O3 -132 -static-intel >> Makefile.incl
++ @echo FFLAGS += -g -w -O3 -132 -static-intel >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+ @echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
+ @echo include Makefile.package >> Makefile.incl
+@@ -79,9 +79,9 @@
+ @cp Makefile.template Makefile.incl
+ @echo OS = linux-pgf77 >> Makefile.incl
+ @echo CC = gcc >> Makefile.incl
+- @echo CFLAGS = -g -m486 -w >> Makefile.incl
++ @echo CFLAGS += -g -m486 -w >> Makefile.incl
+ @echo FC = pgf77 >> Makefile.incl
+- @echo FFLAGS = -O -Munroll >> Makefile.incl
++ @echo FFLAGS += -O -Munroll >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+ @echo OSDEFS = -DLINUX -DNETWORKBYTEORDER >> Makefile.incl
+ @echo include Makefile.package >> Makefile.incl
+@@ -90,15 +90,15 @@
+ @cp Makefile.template Makefile.incl
+ @echo OS = osx >> Makefile.incl
+ @echo CC = icc >> Makefile.incl
+- @echo CFLAGS = -g -Wall >> Makefile.incl
++ @echo CFLAGS += -g -Wall >> Makefile.incl
+ @echo FC = ifort >> Makefile.incl
+- @echo FFLAGS = -g -w -O3 -132 >> Makefile.incl
++ @echo FFLAGS += -g -w -O3 -132 >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+ @echo OSDEFS = -DOSX -DNETWORKBYTEORDER >> Makefile.incl
+ @echo include Makefile.package >> Makefile.incl
+ @echo >> Makefile.incl
+ @echo qinp.o: qinp.f normal3d.o >> Makefile.incl
+- @echo " \$$(FC) -g -O0 -w -132 -c -o qinp.o qinp.f" >> Makefile.incl
++ @echo " \$$(FC) \$$(FFLAGS) -g -O0 -w -132 -c -o qinp.o qinp.f" >> Makefile.incl
+ @echo >> Makefile.incl
+
+ osx-fink:
+@@ -109,15 +109,15 @@
+ @echo CC = /sw/bin/gcc-4 >> Makefile.incl
+ @echo INCDIRS = -I/sw/include >> Makefile.incl
+ @echo LIBDIRS = -L/sw/lib >> Makefile.incl
+- @echo CFLAGS = -g -Wall -Dgfortran >> Makefile.incl
++ @echo CFLAGS += -g -Wall -Dgfortran >> Makefile.incl
+ @echo FC = /sw/bin/gfortran >> Makefile.incl
+- @echo FFLAGS = -g -w -O3 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
++ @echo FFLAGS += -g -w -O3 -Wno-tabs -ffixed-line-length-132 >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+ @echo OSDEFS = -DOSX -DNETWORKBYTEORDER >> Makefile.incl
+ @echo include Makefile.package >> Makefile.incl
+ @echo >> Makefile.incl
+ @echo qinp.o: qinp.f normal3d.o >> Makefile.incl
+- @echo " \$$(FC) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
++ @echo " \$$(FC) \$$(FFLAGS) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f" >> Makefile.incl
+ @echo >> Makefile.incl
+
+ irix5:
+@@ -125,9 +125,9 @@
+ @echo OS=irix5 >> Makefile.incl
+ @echo SHELL=/bin/sh >> Makefile.incl
+ @echo CC = cc >> Makefile.incl
+- @echo CFLAGS = -g -w >> Makefile.incl
++ @echo CFLAGS += -g -w >> Makefile.incl
+ @echo FC = f77 >> Makefile.incl
+- @echo FFLAGS = -O -Olimit 4500 >> Makefile.incl
++ @echo FFLAGS += -O -Olimit 4500 >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+
+ irix6:
+@@ -135,19 +135,19 @@
+ @echo OS=irix6 >> Makefile.incl
+ @echo SHELL=/bin/sh >> Makefile.incl
+ @echo CC = cc -n32 >> Makefile.incl
+- @echo CFLAGS = -g -w >> Makefile.incl
++ @echo CFLAGS += -g -w >> Makefile.incl
+ @echo FC = f77 >> Makefile.incl
+- @echo FFLAGS = -O -n32 -OPT:Olimit=4500 >> Makefile.incl
+- @echo LDFLAGS = -L/usr/lib32 >> Makefile.incl
++ @echo FFLAGS += -O -n32 -OPT:Olimit=4500 >> Makefile.incl
++ @echo LDFLAGS += -L/usr/lib32 >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+
+ dec:
+ @cp Makefile.template Makefile.incl
+ @echo OS=dec >> Makefile.incl
+ @echo CC = cc >> Makefile.incl
+- @echo CFLAGS = -O -w >> Makefile.incl
++ @echo CFLAGS += -O -w >> Makefile.incl
+ @echo FC = f77 >> Makefile.incl
+- @echo FFLAGS = -O -static -fast -r8 >> Makefile.incl
++ @echo FFLAGS += -O -static -fast -r8 >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+ @echo OSDEFS = -DNETWORKBYTEORDER >> Makefile.incl
+ @echo include Makefile.package >> Makefile.incl
+@@ -156,10 +156,10 @@
+ @cp Makefile.template Makefile.incl
+ @echo OS=aix >> Makefile.incl
+ @echo CC = cc >> Makefile.incl
+- @echo CFLAGS = -g >> Makefile.incl
++ @echo CFLAGS += -g >> Makefile.incl
+ @echo FC = xlf -qqcount -w >> Makefile.incl
+- @echo FFLAGS = -O -qtkq_size=2000 -qintlog -qsave >> Makefile.incl
+- @echo LDFLAGS = -lz -bloadmap:loadmap.lis >> Makefile.incl
++ @echo FFLAGS += -O -qtkq_size=2000 -qintlog -qsave >> Makefile.incl
++ @echo LDFLAGS += -lz -bloadmap:loadmap.lis >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+ @echo OSDEFS = -Dlocal_=local -Dungz_=ungz >> Makefile.incl
+ aix-patch:
+@@ -171,19 +171,19 @@
+ @cp Makefile.template Makefile.incl
+ @echo OS = sun >> Makefile.incl
+ @echo CC = gcc >> Makefile.incl
+- @echo CFLAGS = -O >> Makefile.incl
++ @echo CFLAGS += -O >> Makefile.incl
+ @echo FC = g77 >> Makefile.incl
+- @echo FFLAGS = -O >> Makefile.incl
++ @echo FFLAGS += -O >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+- @echo LDFLAGS = -L/usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.2 -lgcc >> Makefile.incl
++ @echo LDFLAGS += -L/usr/local/lib/gcc-lib/sparc-sun-sunos4.1.3_U1/2.6.2 -lgcc >> Makefile.incl
+
+ sun-forte:
+ @cp Makefile.template Makefile.incl
+ @echo OS = sun >> Makefile.incl
+ @echo CC = cc >> Makefile.incl
+- @echo CFLAGS = -fast -`fpversion -foption` >> Makefile.incl
++ @echo CFLAGS += -fast -`fpversion -foption` >> Makefile.incl
+ @echo FC = f77 >> Makefile.incl
+- @echo FFLAGS = \${CFLAGS} >> Makefile.incl
++ @echo FFLAGS += \${CFLAGS} >> Makefile.incl
+ @echo RM = /bin/rm -f >> Makefile.incl
+
+
+@@ -200,16 +200,16 @@
+ all: help $(PROGS)
+
+ avs2ps: avs2ps.c
+- $(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -o avs2ps avs2ps.c -lm
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(FLAGS) $(LDFLAGS) -o avs2ps avs2ps.c -lm
+
+ balls: balls.f
+ $(FC) $(FFLAGS) $(LDFLAGS) -o balls balls.f
+
+ local.o: Makefile.incl local.c
+- $(CC) $(CFLAGS) $(FLAGS) -c local.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(FLAGS) -c local.c $(LDFLAGS)
+
+ ungz.o: Makefile.incl ungz.c
+- $(CC) $(CFLAGS) $(GDEFS) $(OSDEFS) -c ungz.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(GDEFS) $(OSDEFS) -c ungz.c $(LDFLAGS)
+
+ ribbon: ribbon.f ribbon1.f modsubs.f
+ $(FC) $(FFLAGS) $(LDFLAGS) \
+--- raster3d.orig/Makefile.incl
++++ raster3d/Makefile.incl
+@@ -60,13 +60,13 @@
+ #
+ OS = linux
+ CC = gcc
+-CFLAGS = -g -Wall -Dgfortran
++CFLAGS += -g -Wall -Dgfortran
+ FC = gfortran -std=legacy
+-FFLAGS = -g -w -O3 -Wno-tabs -ffixed-line-length-132
++FFLAGS += -g -w -O3 -Wno-tabs -ffixed-line-length-132
+ RM = /bin/rm -f
+ OSDEFS = -DLINUX -DNETWORKBYTEORDER
+ include Makefile.package
+
+ qinp.o: qinp.f
+- $(FC) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f
++ $(FC) $(FFLAGS) -g -O0 -Wall -Wno-tabs -c -o qinp.o qinp.f $(LDFLAGS)
+
=====================================
debian/patches/example1.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example1.script
=====================================
debian/patches/example2.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example2.script
=====================================
debian/patches/example2.sgi.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example2.sgi
=====================================
debian/patches/example3.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example3.script
=====================================
debian/patches/example4.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example4.script
=====================================
debian/patches/example5.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example5.script
=====================================
debian/patches/example6.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example6.script
=====================================
debian/patches/example7.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example7.script
=====================================
debian/patches/example8.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example8.script
=====================================
debian/patches/example9.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/example9.script
=====================================
debian/patches/msms_example.script.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Convert from csh to bash
--- a/examples/msms/msms_example.script
=====================================
debian/patches/r3d_objects.man.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Fix manpage syntax
--- a/doc/r3d_objects.l
=====================================
debian/patches/raster3d.man.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Fix manpage syntax
--- a/doc/raster3d.l
=====================================
debian/patches/render.man.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Fix manpage syntax
--- a/doc/render.l
=====================================
debian/patches/rods.man.diff
=====================================
@@ -1,5 +1,5 @@
Author: Nelson A. de Oliveira
-Last-Update: 2008-02-24 03:33:37 +0000
+Last-Update: 2008-02-24
Description: Fix manpage syntax
--- a/doc/rods.l
=====================================
debian/patches/series
=====================================
@@ -19,3 +19,4 @@ rods.man.diff
prevent_Makefile.incl_removal.patch
sequence_normal3d_qinp.patch
+buildflags.patch
=====================================
debian/rules
=====================================
@@ -17,6 +17,24 @@ override_dh_auto_install:
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG
+execute_after_dh_install-arch:
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
+ iconv -f ISO-8859-1 -t UTF-8 \
+ < debian/raster3d/usr/share/raster3d/html/r3d_hints.html \
+ > debian/raster3d/usr/share/raster3d/html/r3d_hints.html.out
+ mv debian/raster3d/usr/share/raster3d/html/r3d_hints.html.out \
+ debian/raster3d/usr/share/raster3d/html/r3d_hints.html
+endif
+
+execute_after_dh_install-indep:
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
+ iconv -f ISO-8859-1 -t UTF-8 \
+ < debian/raster3d-doc/usr/share/doc/raster3d/html/r3d_hints.html \
+ > debian/raster3d-doc/usr/share/doc/raster3d/html/r3d_hints.html.out
+ mv debian/raster3d-doc/usr/share/doc/raster3d/html/r3d_hints.html.out \
+ debian/raster3d-doc/usr/share/doc/raster3d/html/r3d_hints.html
+endif
+
override_dh_compress:
dh_compress --exclude=.pdb \
--exclude=.r3d \
View it on GitLab: https://salsa.debian.org/med-team/raster3d/-/compare/ed3de5157d68557d3649138109bf4451313a2b3c...42e3aa2ca3821cf3ee5177b424d950fe9f1c368e
--
View it on GitLab: https://salsa.debian.org/med-team/raster3d/-/compare/ed3de5157d68557d3649138109bf4451313a2b3c...42e3aa2ca3821cf3ee5177b424d950fe9f1c368e
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/20251207/0b054afb/attachment-0001.htm>
More information about the debian-med-commit
mailing list