[med-svn] [Git][med-team/papyrus][master] 5 commits: d/patches: Update minimal cmake version to 3.7

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch master at Debian Med / papyrus


Commits:
2c66c1a0 by Mathieu Malaterre at 2022-09-02T15:40:24+02:00
d/patches: Update minimal cmake version to 3.7

This will remove warning about cmake 2.8 being used

- - - - -
3624ce50 by Mathieu Malaterre at 2022-09-02T15:40:38+02:00
d/rules: Expose a bit more warnings from the compilation

- - - - -
ee8d8ca0 by Mathieu Malaterre at 2022-09-02T15:41:02+02:00
d/patches: Remove register keyword from API

- - - - -
54811ed9 by Mathieu Malaterre at 2022-09-02T15:42:12+02:00
d/control: Bump Std-Vers to 4.6.1 no changes needed

- - - - -
8dacba02 by Mathieu Malaterre at 2022-09-02T15:43:55+02:00
d/changelog: Upload 3.7.1+dfsg-5 to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/addcmake.patch
- + debian/patches/register.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+papyrus (3.7.1+dfsg-5) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches: Update minimal cmake version to 3.7
+  * d/rules: Expose a bit more warnings from the compilation
+  * d/patches: Remove register keyword from API
+  * d/control: Bump Std-Vers to 4.6.1 no changes needed
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 02 Sep 2022 15:42:26 +0200
+
 papyrus (3.7.1+dfsg-4) unstable; urgency=medium
 
   * Standards-Version: 4.5.1 (routine-update)


=====================================
debian/control
=====================================
@@ -4,8 +4,8 @@ Uploaders: Andreas Tille <tille at debian.org>
 Section: libdevel
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               cmake
-Standards-Version: 4.5.1
+               cmake (>= 3.7)
+Standards-Version: 4.6.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


=====================================
debian/patches/addcmake.patch
=====================================
@@ -32,7 +32,7 @@ Index: Papyrus3/CMakeLists.txt
 @@ -0,0 +1,176 @@
 +# Copyright Mathieu Malaterre <malat at debian.org>
 +# LGPL-2.1
-+cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.7)
 +project(Papyrus3 C)
 +
 +set(JPEGDIRLL JpegDir/JpgLless)


=====================================
debian/patches/register.patch
=====================================
@@ -0,0 +1,30 @@
+Description: Remove register keyword
+ This will remove warning from client code:
+ /usr/include/Papyrus3/PapyWild3.h:80:41: warning: ISO C++17 does not allow ‘register’ storage class specifier [-Wregister]
+    80 | extern char     *wildname(register char *);
+       |                                         ^
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2022-09-02
+
+--- papyrus-3.7.1+dfsg.orig/PapyWild3.c
++++ papyrus-3.7.1+dfsg/PapyWild3.c
+@@ -77,7 +77,7 @@
+ /********************************************************************************/
+ 
+ char *
+-wildname (register char *inNameP)
++wildname (char *inNameP)
+ {
+   register int	i;
+   static char	theSaved [15];
+--- papyrus-3.7.1+dfsg.orig/PapyWild3.h
++++ papyrus-3.7.1+dfsg/PapyWild3.h
+@@ -77,7 +77,7 @@ extern void	wildcexit();
+ extern void	wildrexit();
+ extern void	tameexit();
+ #else
+-extern char	*wildname(register char *);
++extern char	*wildname(char *);
+ extern void	wild3(char *,char *);
+ 
+ extern void	wild2exit(char *, char *);


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ fixcase.patch
 hardening.patch
 addcmake.patch
 fixcomment.patch
+register.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall
 
 %:
 	dh $@ --buildsystem=cmake



View it on GitLab: https://salsa.debian.org/med-team/papyrus/-/compare/ce8013d5b3b99a56a1218e166f7263bb14cc8ce9...8dacba029371dce01cbd80f69a6e63de275b2ff2

-- 
View it on GitLab: https://salsa.debian.org/med-team/papyrus/-/compare/ce8013d5b3b99a56a1218e166f7263bb14cc8ce9...8dacba029371dce01cbd80f69a6e63de275b2ff2
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/20220902/2aba046e/attachment-0001.htm>