[med-svn] [Git][med-team/papyrus][master] 10 commits: Add citation
Andreas Tille
gitlab at salsa.debian.org
Thu Sep 20 08:25:40 BST 2018
Andreas Tille pushed to branch master at Debian Med / papyrus
Commits:
490336dc by Andreas Tille at 2018-09-20T06:56:26Z
Add citation
- - - - -
b996acf4 by Andreas Tille at 2018-09-20T06:57:53Z
Homepage vanished - link to web archive
- - - - -
462472bb by Andreas Tille at 2018-09-20T07:00:34Z
Use fake watch file since SOurceForge repository vanished as well
- - - - -
b4aa39e2 by Andreas Tille at 2018-09-20T07:01:57Z
debhelper 11
- - - - -
a201c560 by Andreas Tille at 2018-09-20T07:01:59Z
Point Vcs fields to salsa.debian.org
- - - - -
d6c91738 by Andreas Tille at 2018-09-20T07:01:59Z
Standards-Version: 4.2.1
- - - - -
2ab9fb30 by Andreas Tille at 2018-09-20T07:07:15Z
Remove unneeded patches
- - - - -
90c87630 by Andreas Tille at 2018-09-20T07:08:35Z
Silence lintian by providing dversionmangle for +dfsg
- - - - -
7ed20238 by Andreas Tille at 2018-09-20T07:16:36Z
Delete unneeded get-orig-source target
- - - - -
8db5a805 by Andreas Tille at 2018-09-20T07:18:14Z
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- debian/compat
- debian/control
- − debian/patches/fixcmake.patch
- − debian/patches/fixcxx.patch
- debian/patches/series
- debian/rules
- + debian/upstream/metadata
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+papyrus (3.7.1+dfsg-3) unstable; urgency=medium
+
+ * Add citation
+ * Homepage vanished - link to web archive
+ * Use fake watch file since SOurceForge repository vanished as well
+ * debhelper 11
+ * Point Vcs fields to salsa.debian.org
+ * Standards-Version: 4.2.1
+ * Delete unneeded get-orig-source target
+
+ -- Andreas Tille <tille at debian.org> Thu, 20 Sep 2018 09:16:46 +0200
+
papyrus (3.7.1+dfsg-2) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
@@ -3,12 +3,12 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: libdevel
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11~),
cmake
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/papyrus.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/papyrus.git
-Homepage: http://www.expasy.ch/www/UIN/UIN.html
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/papyrus
+Vcs-Git: https://salsa.debian.org/med-team/papyrus.git
+Homepage: https://web.archive.org/web/20021003015549/http://www.expasy.ch/UIN/html1/projects/papyrus/papyrus.html
Package: libpapyrus3-dev
Architecture: any
=====================================
debian/patches/fixcmake.patch deleted
=====================================
@@ -1,26 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- papyrus (3.7.1-1) unstable; urgency=low
- .
- * Initial release. (Closes: #)
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-
=====================================
debian/patches/fixcxx.patch deleted
=====================================
@@ -1,798 +0,0 @@
-Description: Track down an issue with CMake trying to compile in C++
- when specified C
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/728108
-
---- papyrus-3.7.1.orig/PapyFileSystemUnix3.c
-+++ papyrus-3.7.1/PapyFileSystemUnix3.c
-@@ -78,13 +78,9 @@
-
-
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
--#ifndef __PapyError3__
- #include "PapyError3.h"
--#endif
-
-
- /********************************************************************************/
---- papyrus-3.7.1.orig/PapyWild3.c
-+++ papyrus-3.7.1/PapyWild3.c
-@@ -100,7 +100,7 @@ wildname (register char *inNameP)
-
- } /* if */
-
-- return (theSaved [0] == '\0') ? "?" : theSaved;
-+ return (theSaved [0] == '\0') ? (char*)"?" : theSaved;
-
- } /* endof wildname */
-
---- papyrus-3.7.1.orig/PapyConvertFile3.c
-+++ papyrus-3.7.1/PapyConvertFile3.c
-@@ -64,9 +64,7 @@
- #include "JPEGLESS.H" /* interface for JPEG lossless */
- #include "JPEGLIB.H" /* interface for JPEG lossy */
-
--#ifndef Papyrus3H
- #include "Papyrus3.h"
--#endif
-
-
- struct color /* a color is defined by its red, green and blue intensity */
-@@ -1482,9 +1480,11 @@ int Papyrus2Jpeg (char *inPapyrusFilenam
-
- /* Attention voir pour resize 16 bits et 3 * 8 bits*/
- /* resize image */
-+#if 0
- if (imageHeight != inJpegHeight || imageWidth != inJpegWidth)
- image=TI_taille(image, imageWidth, imageHeight, inJpegWidth, inJpegHeight,
- imageDepth, numPlans, &bytesInImage);
-+#endif
-
- sprintf(jpegFilename,"%s.%d_%d.jpg",outJpegBaseFilename, dimImageJpeg, noImage);
-
---- papyrus-3.7.1.orig/PapyInitGroups3.c
-+++ papyrus-3.7.1/PapyInitGroups3.c
-@@ -63,9 +63,7 @@
-
- #include <stdio.h>
-
--#ifndef Papyrus3H
- #include "Papyrus3.h"
--#endif
-
-
-
-@@ -404,7 +402,7 @@ init_group8 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -1548,7 +1546,7 @@ init_group10 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -1892,7 +1890,7 @@ init_group18 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -5156,7 +5154,7 @@ init_group20 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -5731,7 +5729,7 @@ init_group28 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6585,7 +6583,7 @@ init_group32 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6859,7 +6857,7 @@ init_group38 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -7093,7 +7091,7 @@ init_group3A (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -7367,7 +7365,7 @@ init_group40 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -8907,7 +8905,7 @@ init_group50 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -9011,7 +9009,7 @@ init_group54 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -9889,7 +9887,7 @@ init_group70 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -10273,7 +10271,7 @@ init_group88 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -10366,7 +10364,7 @@ init_group100 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -10430,7 +10428,7 @@ init_group2000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -10664,7 +10662,7 @@ init_group2010 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -10928,7 +10926,7 @@ init_group2020 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11062,7 +11060,7 @@ init_group2030 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11106,7 +11104,7 @@ init_group2040 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11304,7 +11302,7 @@ init_group2100 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11418,7 +11416,7 @@ init_group2110 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11482,7 +11480,7 @@ init_group2120 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11536,7 +11534,7 @@ init_group2130 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11650,7 +11648,7 @@ init_group3002 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -11864,7 +11862,7 @@ init_group3004 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -12583,7 +12581,7 @@ init_group3008 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -13367,7 +13365,7 @@ init_group300A (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -15982,7 +15980,7 @@ init_group4000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = RET;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16026,7 +16024,7 @@ init_group4008 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16320,7 +16318,7 @@ init_group5000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16604,7 +16602,7 @@ init_group5400 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16698,7 +16696,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16868,7 +16866,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16878,7 +16876,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16888,7 +16886,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16898,7 +16896,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16908,7 +16906,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16918,7 +16916,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16928,7 +16926,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -16938,7 +16936,7 @@ init_group6000 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -17299,7 +17297,7 @@ init_group7FE0 (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = UL;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
---- papyrus-3.7.1.orig/PapyInitModules3.c
-+++ papyrus-3.7.1/PapyInitModules3.c
-@@ -6835,7 +6835,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6845,7 +6845,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6855,7 +6855,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6865,7 +6865,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6875,7 +6875,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6885,7 +6885,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6895,7 +6895,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
-@@ -6905,7 +6905,7 @@ init_OverlayPlane (SElement ioElem [])
- theWrkP->length = 0L;
- theWrkP->vr = USS;
- theWrkP->vm = "1-n";
-- theWrkP->type_t = RET;
-+ theWrkP->type_t = (enum EType_T)RET;
- theWrkP->nb_val = 0;
- theWrkP->value = NULL;
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/huffcoptimisebug.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/huffcoptimisebug.c
-@@ -53,17 +53,11 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
-
--#ifndef PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/JPEGLESS.H
-+++ papyrus-3.7.1/JpegDir/JpgLless/JPEGLESS.H
-@@ -57,9 +57,7 @@
-
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/maindecompression.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/maindecompression.c
-@@ -13,17 +13,11 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
-
--#ifndef PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
-@@ -332,4 +326,4 @@ efree3(&image);
-
- printf("Sortie a fin de programme... \n");
-
--}
-\ No newline at end of file
-+}
---- papyrus-3.7.1.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/pnmtoljpoptimisebug.c
-@@ -50,17 +50,11 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
-
--#ifndef PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/IO.H
-+++ papyrus-3.7.1/JpegDir/JpgLless/IO.H
-@@ -36,9 +36,7 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/maincompression.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/maincompression.c
-@@ -18,17 +18,11 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
-
--#ifndef PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
-@@ -215,4 +209,4 @@ Papy3FClose (&OutFile);
- efree3 (&ImageBuffer);
- efree3 (&JPEGData);
-
--}
-\ No newline at end of file
-+}
---- papyrus-3.7.1.orig/JpegDir/JpgLless/decompoptimise.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/decompoptimise.c
-@@ -59,17 +59,11 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
-
--#ifndef PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/huffdoptimise.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/huffdoptimise.c
-@@ -51,9 +51,7 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/pmreadoptimise.c
-+++ papyrus-3.7.1/JpegDir/JpgLless/pmreadoptimise.c
-@@ -40,13 +40,9 @@
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
-
--#ifndef PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/JpegDir/JpgLless/PROTO.H
-+++ papyrus-3.7.1/JpegDir/JpgLless/PROTO.H
-@@ -46,9 +46,7 @@
-
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef PapyTypeDef3H
- #include "PapyTypeDef3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
-@@ -75,7 +73,7 @@ PapyULong WriteJpegData P((PapyUChar *bu
- void StdPickSelValue P((CompressInfo *cPtr, long *bestTotalBits));
-
- /* read.c */
--int ReadFileHeader P((DecompressInfo *dcPtr ));
-+int ReadFileHeader (DecompressInfo *dcPtr );
- int ReadScanHeader P((DecompressInfo *dcPtr ));
-
- /* write.c */
---- papyrus-3.7.1.orig/DicomDir/DicomDirDataSetRead.c
-+++ papyrus-3.7.1/DicomDir/DicomDirDataSetRead.c
-@@ -55,9 +55,7 @@
- #include <stdio.h>
- #include <string.h>
-
--#ifndef DicomdirH
- #include "DicomDir.h"
--#endif
-
-
- /********************************************************************************/
---- papyrus-3.7.1.orig/DicomDir/DicomDirInit.c
-+++ papyrus-3.7.1/DicomDir/DicomDirInit.c
-@@ -53,15 +53,11 @@
-
- #include <stdio.h>
-
--#ifndef DicomdirH
- #include "DicomDir.h"
--#endif
-
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef DicomdirInitRecordsH
- #include "DicomDirInitRecords.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/DicomDir/DicomDir.h
-+++ papyrus-3.7.1/DicomDir/DicomDir.h
-@@ -56,29 +56,17 @@
- #ifndef DicomdirH
- #define DicomdirH
-
--#ifndef Papyrus3H
- #include "Papyrus3.h"
--#endif
-
- /* --- includes --- */
-
- #ifndef FILENAME83 /* this is for the normal machines ... */
-
--#ifndef DicomdirEnumRecordsH
- #include "DicomDirEnumRecords.h"
--#endif
--#ifndef DicomdirTypeDef3H /* DICOMDIR type definition */
- #include "DicomdirTypeDef3.h"
--#endif
--#ifndef DicomdirPrivFunctionDef3H /* DICOMDIR private functions */
- #include "DicomdirPrivFunctionDef3.h"
--#endif
--#ifndef DicomdirPubFunctionDef3H /* DICOMDIR public functions */
- #include "DicomdirPubFunctionDef3.h"
--#endif
--#ifndef DicomdirGlobalVar3H /* DICOMDIR global variables */
- #include "DicomdirGlobalVar3.h"
--#endif
-
- #else /* FILENAME83 defined for the DOS machines */
-
---- papyrus-3.7.1.orig/DicomDir/DicomDirDataSetWrite.c
-+++ papyrus-3.7.1/DicomDir/DicomDirDataSetWrite.c
-@@ -56,9 +56,7 @@
-
- /* ------------------------- includes -----------------------------------------*/
-
--#ifndef DicomdirH
- #include "DicomDir.h"
--#endif
-
-
- /********************************************************************************/
---- papyrus-3.7.1.orig/DicomDir/DicomDirFiles.c
-+++ papyrus-3.7.1/DicomDir/DicomDirFiles.c
-@@ -55,9 +55,7 @@
- #include <string.h>
- #include <memory.h>
-
--#ifndef DicomdirH
- #include "DicomDir.h"
--#endif
-
-
- #ifdef _WINDOWS
---- papyrus-3.7.1.orig/DicomDir/DicomDirInitRecords.c
-+++ papyrus-3.7.1/DicomDir/DicomDirInitRecords.c
-@@ -54,9 +54,7 @@
-
- #include <stdio.h>
-
--#ifndef DicomdirH
- #include "DicomDir.h"
--#endif
-
-
- /********************************************************************************/
-
=====================================
debian/patches/series
=====================================
@@ -1,6 +1,5 @@
fixmakefiles.patch
fixcase.patch
hardening.patch
-#fixcxx.patch
addcmake.patch
fixcomment.patch
=====================================
debian/rules
=====================================
@@ -4,6 +4,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@ --buildsystem=cmake
-
-get-orig-source:
- uscan --verbose --force-download --rename
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,12 @@
+Reference:
+ Author: O. Ratib and H. Hoehn and C. Girard and C. Parisot
+ Title: "PAPYRUS 3.0: DICOM-compatible file format"
+ Journal: Medical Informatics
+ Year: 1994
+ Volume: 19
+ Number: 2
+ Pages: 171-178
+ DOI: 10.3109/14639239409001384
+ PMID: 7799692
+ URL: https://www.tandfonline.com/doi/abs/10.3109/14639239409001384
+ eprint: https://www.tandfonline.com/doi/pdf/10.3109/14639239409001384
=====================================
debian/watch
=====================================
@@ -1,3 +1,5 @@
-version=3
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
- http://sf.net/jpeg/Papyrus([\d])([\d])([\d])\.tar\.gz
+# Homepage and SourceForge repository have vanished
+version=4
+
+opts=dversionmangle=s/.*/0.No-Site/;s/\+dfsg//g \
+ https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz
View it on GitLab: https://salsa.debian.org/med-team/papyrus/compare/9a0e51232228219729fd9bd11865dbcc17ed718c...8db5a8051078f83441e0e2010bee5c9c0a9268ea
--
View it on GitLab: https://salsa.debian.org/med-team/papyrus/compare/9a0e51232228219729fd9bd11865dbcc17ed718c...8db5a8051078f83441e0e2010bee5c9c0a9268ea
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/20180920/ff5d6a07/attachment-0001.html>
More information about the debian-med-commit
mailing list