[med-svn] [Git][med-team/volpack][master] 12 commits: gcc-14.patch: new: fix multiple issues flagged by gcc 14.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Wed Aug 7 08:31:43 BST 2024
Étienne Mollier pushed to branch master at Debian Med / volpack
Commits:
4e476b90 by Étienne Mollier at 2024-08-07T09:05:58+02:00
gcc-14.patch: new: fix multiple issues flagged by gcc 14.
Closes: #1075627
- - - - -
e70d1fa7 by Étienne Mollier at 2024-08-07T09:10:00+02:00
d/lintian-overrides → d/s/lintian-overrides: fix source override.
- - - - -
7761e272 by Étienne Mollier at 2024-08-07T09:10:32+02:00
d/libvolpack1-dev.lintian-overrides: freshen groff override.
- - - - -
ce58c8ab by Étienne Mollier at 2024-08-07T09:11:37+02:00
d/control: deduplicate Section field.
- - - - -
b38cb6c7 by Étienne Mollier at 2024-08-07T09:13:02+02:00
d/watch: bump to version 4.
- - - - -
ff2d7054 by Étienne Mollier at 2024-08-07T09:13:23+02:00
d/watch: scan https instead of unencrypted http.
- - - - -
e620da98 by Étienne Mollier at 2024-08-07T09:14:16+02:00
d/control: add myself to uploaders.
- - - - -
5688ae24 by Étienne Mollier at 2024-08-07T09:14:31+02:00
d/control: declare compliance to standards version 4.7.0.
- - - - -
dd85a23e by Étienne Mollier at 2024-08-07T09:16:36+02:00
d/libvolpack1.symbols: declare Build-Depends-Package.
- - - - -
3ef33019 by Étienne Mollier at 2024-08-07T09:25:57+02:00
Revert "d/control: deduplicate Section field."
This reverts commit ce58c8ab0b3924ab710e5ceb924a6870a1fe463c.
- - - - -
88493e85 by Étienne Mollier at 2024-08-07T09:29:51+02:00
d/s/lintian-overrides: also refresh the tag.
This is part of the general fixes to this source override.
Gbp-Dch: ignore
- - - - -
65614b76 by Étienne Mollier at 2024-08-07T09:30:47+02:00
ready to upload to unstable.
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/libvolpack1-dev.lintian-overrides
- debian/libvolpack1.symbols
- + debian/patches/gcc-14.patch
- debian/patches/series
- debian/lintian-overrides → debian/source/lintian-overrides
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+volpack (1.0b3-10) unstable; urgency=medium
+
+ * gcc-14.patch: new: fix multiple issues flagged by gcc 14.
+ Closes: #1075627
+ * d/lintian-overrides → d/s/lintian-overrides: fix source override.
+ * d/libvolpack1-dev.lintian-overrides: freshen groff override.
+ * d/watch: bump to version 4.
+ * d/watch: scan https instead of unencrypted http.
+ * d/control: add myself to uploaders.
+ * d/control: declare compliance to standards version 4.7.0.
+ * d/libvolpack1.symbols: declare Build-Depends-Package.
+
+ -- Étienne Mollier <emollier at debian.org> Wed, 07 Aug 2024 09:26:43 +0200
+
volpack (1.0b3-9.1) unstable; urgency=medium
* Non-maintainer upload.
=====================================
debian/control
=====================================
@@ -1,13 +1,14 @@
Source: volpack
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Michael Hanke <michael.hanke at gmail.com>,
- Andreas Tille <tille at debian.org>
+ Andreas Tille <tille at debian.org>,
+ Étienne Mollier <emollier at debian.org>
Section: libs
Priority: optional
Build-Depends: debhelper-compat (= 13),
m4,
d-shlibs
-Standards-Version: 4.5.0
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/volpack
Vcs-Git: https://salsa.debian.org/med-team/volpack.git
Homepage: https://graphics.stanford.edu/software/volpack/
=====================================
debian/libvolpack1-dev.lintian-overrides
=====================================
@@ -1,2 +1,2 @@
# Manpages render fine
-libvolpack1-dev: groff-message usr/share/man/man3/*
+libvolpack1-dev: groff-message troff:<standard input>:*: * [usr/share/man/man3/*]
=====================================
debian/libvolpack1.symbols
=====================================
@@ -1,4 +1,5 @@
libvolpack.so.1 libvolpack1 #MINVER#
+* Build-Depends-Package: libvolpack1-dev
VPAffineImageOverlap at Base 1.0b3
VPBilirpWeight at Base 1.0b3
VPBug at Base 1.0b3
=====================================
debian/patches/gcc-14.patch
=====================================
@@ -0,0 +1,117 @@
+Description: fix multiple issues caught by newly introduced gcc 14 compiler.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075627
+Forwarded: no
+Last-Update: 2024-08-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- volpack.orig/examples/classifyvolume.c
++++ volpack/examples/classifyvolume.c
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include "volume.h"
+
++int
+ main(argc, argv)
+ int argc;
+ char **argv;
+--- volpack.orig/examples/denfile.c
++++ volpack/examples/denfile.c
+@@ -218,6 +218,7 @@
+ * error or the full number of bytes could not be read.
+ */
+
++int
+ read_bytes(fd, buf, bytecount)
+ int fd; /* file descriptor to read from */
+ char *buf; /* memory in which to store data */
+@@ -246,6 +247,7 @@
+ * error or the full number of shorts could not be read.
+ */
+
++int
+ read_shorts(fd, sbuf, shortcount, swap)
+ int fd; /* file descriptor to read from */
+ short *sbuf; /* memory in which to store data */
+@@ -294,6 +296,7 @@
+ * error or the full number of words could not be read.
+ */
+
++int
+ read_words(fd, wbuf, wordcount, swap)
+ int fd; /* file descriptor to read from */
+ int *wbuf; /* memory in which to store data */
+@@ -342,6 +345,7 @@
+ * Return value is 1 if the write was succesful or 0 if there was an error.
+ */
+
++int
+ write_bytes(fd, buf, bytecount)
+ int fd; /* file descriptor to write to */
+ char *buf; /* memory containing data */
+--- volpack.orig/examples/makeoctree.c
++++ volpack/examples/makeoctree.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include "volume.h"
+
++int
+ main()
+ {
+ vpContext *vpc; /* rendering context */
+--- volpack.orig/examples/makevolume.c
++++ volpack/examples/makevolume.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include "volume.h"
+
++int
+ main()
+ {
+ vpContext *vpc; /* rendering context */
+--- volpack.orig/examples/rendervolume.c
++++ volpack/examples/rendervolume.c
+@@ -36,6 +36,7 @@
+
+ int StorePGM(char* image, int width, int height, char* filename);
+
++int
+ main(argc, argv)
+ int argc;
+ char **argv;
+@@ -166,7 +167,7 @@
+ vpCurrentMatrix(vpc, VP_MODEL);
+
+ /* set the image buffer */
+- vpSetImage(vpc, (unsigned char *)image, IMAGE_WIDTH, IMAGE_HEIGHT,
++ vpSetImage(vpc, image[0], IMAGE_WIDTH, IMAGE_HEIGHT,
+ IMAGE_WIDTH, VP_LUMINANCE);
+
+ /* render and store the images */
+@@ -199,7 +200,7 @@
+ strcpy(filename, "brainsmall.ppm");
+ else
+ sprintf(filename, "brainsmall_%d.ppm", n + 1000);
+- StorePGM(image, IMAGE_WIDTH, IMAGE_HEIGHT, filename);
++ StorePGM(image[0], IMAGE_WIDTH, IMAGE_HEIGHT, filename);
+
+ /* rotate by 5 degrees for next image */
+ vpRotate(vpc, VP_Y_AXIS, 5.0);
+@@ -208,6 +209,7 @@
+ return(0);
+ }
+
++int
+ StorePGM(image, width, height, filename)
+ char *image;
+ int width, height;
+--- volpack.orig/examples/scalevolume.c
++++ volpack/examples/scalevolume.c
+@@ -43,6 +43,7 @@
+
+ int write_den(char* filename, unsigned char* data, int xlen, int ylen, int zlen);
+
++int
+ main(argc, argv)
+ int argc;
+ char **argv;
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
10_vp_global_h.patch
fixmanpages.patch
fix-implicit-function-declaration.patch
+gcc-14.patch
=====================================
debian/lintian-overrides → debian/source/lintian-overrides
=====================================
@@ -1,2 +1,2 @@
# d-shlib relies on the "Section: libs" entry for libvolpack1
-volpack source: binary-control-field-duplicates-source field "section" in package libvolpack1
+installable-field-mirrors-source (in section for libvolpack1) Section [debian/control:*]
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
-http://graphics.stanford.edu/software/volpack/ volpack-(.*)\.tar\.Z
+version=4
+https://graphics.stanford.edu/software/volpack/ volpack-(.*)\.tar\.Z
View it on GitLab: https://salsa.debian.org/med-team/volpack/-/compare/d85b54d6fb0c06207759da3510e70c218b8c7fa8...65614b7684585bfcbae89dcec4b8212d25822e36
--
View it on GitLab: https://salsa.debian.org/med-team/volpack/-/compare/d85b54d6fb0c06207759da3510e70c218b8c7fa8...65614b7684585bfcbae89dcec4b8212d25822e36
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/20240807/3ad3592a/attachment-0001.htm>
More information about the debian-med-commit
mailing list