Gert Wollny pushed to branch master at Debian Med / aeskulap
Commits: 3e38aff3 by Gert Wollny at 2018-07-22T13:40:41+02:00 d/p/gcc8: Fix friend declaration, Closes: #897699 - - - - - 0b92b9cb by Gert Wollny at 2018-07-22T13:43:17+02:00 d/* Apply 'cme fix dpkg' correct VCS & standards version - - - - - 08c560d7 by Gert Wollny at 2018-07-22T13:44:36+02:00 update changfelog for release - - - - - d2364a5c by Gert Wollny at 2018-07-22T13:45:53+02:00 d/p/po_ Fix spelling - - - - - a021a4b8 by Gert Wollny at 2018-07-22T14:54:38+02:00 Merge branch 'master' of salsa.debian.org:med-team/aeskulap - - - - - 8 changed files: - debian/changelog - debian/control - debian/copyright - + debian/patches/gcc8-friend-ifx.patch - debian/patches/po_makefile.patch - debian/patches/remove-appdata.patch - debian/patches/remove_rpath.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +aeskulap (0.2.2b1+git20161206-5) unstable; urgency=medium + + * d/p/gcc8: Fix friend declaration, Closes: #897699 + * d/* Apply 'cme fix dpkg' + - correct VCS + - bump standards version to 4.1.5 (no changes needed) + + -- Gert Wollny <[email protected]> Sun, 22 Jul 2018 13:43:24 +0200 + aeskulap (0.2.2b1+git20161206-4) unstable; urgency=medium [ Andreas Tille ] ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: aeskulap Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Andreas Tille <[email protected]>, - Gert Wollny <[email protected]> + Gert Wollny <[email protected]> Section: science Priority: optional Build-Depends: debhelper (>= 10), @@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 10), intltool, libdcmtk-dev, libtiff-dev -Standards-Version: 4.1.3 -Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/aeskulap.git -Vcs-Git: https://anonscm.debian.org/git/debian-med/aeskulap.git +Standards-Version: 4.1.5 +Vcs-Browser: https://salsa.debian.org/med-team/aeskulap +Vcs-Git: https://salsa.debian.org/med-team/aeskulap.git Homepage: http://aeskulap.nongnu.org Package: aeskulap ===================================== debian/copyright ===================================== --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Aeskulap Upstream-Contact: Alexander Pipelka <[email protected]> Source: http://www.bms-austria.com/~pipelka/aeskulap/ @@ -38,8 +38,8 @@ Files: debian/* Copyright: 2007-2012 Andreas Tille <[email protected]> License: GPL-2 -Files: debian/bundle-glademm.patch -Copyright: 2001 Free Software Foundation +Files: debian/bundle-glademm.patch +Copyright: 2001 Free Software Foundation 2002 The libglademm Development Team License: LGPL-2.0 @@ -50,4 +50,3 @@ License: GPL-2 License: LGPL-2.0 On Debian GNU/Linux you can find these licenses under `/usr/share/common-licenses/LGPL-2.1' - ===================================== debian/patches/gcc8-friend-ifx.patch ===================================== --- /dev/null +++ b/debian/patches/gcc8-friend-ifx.patch @@ -0,0 +1,15 @@ +Author: Gert Wollny <[email protected]> +Description: Fix friend function declaration for g++8 +Debian-Bug: https://bugs.debian.org/897699 + +--- a/imagepool/poolinstance.h ++++ b/imagepool/poolinstance.h +@@ -43,7 +43,7 @@ + + Instance(const std::string& sopinstanceuid); + +- friend void ImagePool::remove_instance(const Glib::RefPtr<ImagePool::Instance>&); ++ friend void remove_instance(const Glib::RefPtr<ImagePool::Instance>&); + + friend class ImagePool::Loader; + ===================================== debian/patches/po_makefile.patch ===================================== --- a/debian/patches/po_makefile.patch +++ b/debian/patches/po_makefile.patch @@ -1,7 +1,7 @@ Author: Gert Wollny <[email protected]> Last-Update: Thu, 06 Dec 2016 22:18:10 +0100 Description: reintroduce the po/Makefile.in.in - It is is required but was dropped from the upstream code. + It is required but was dropped from the upstream code. --- /dev/null +++ b/po/Makefile.in.in ===================================== debian/patches/remove-appdata.patch ===================================== --- a/debian/patches/remove-appdata.patch +++ b/debian/patches/remove-appdata.patch @@ -1,3 +1,4 @@ +Description: Remove appdata --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,8 +68,8 @@ ===================================== debian/patches/remove_rpath.patch ===================================== --- a/debian/patches/remove_rpath.patch +++ b/debian/patches/remove_rpath.patch @@ -1,8 +1,7 @@ +Description: Do not use rpath +Bug-Debian: https://bugs.debian.org/731952 Author: Andreas Tille <[email protected]> Last-Update: Thu, 12 Dec 2013 09:43:10 +0100 -Bug-Debian: http://bugs.debian.org/731952 -Description: Do not use rpath - --- a/configure.ac +++ b/configure.ac @@ -115,7 +115,7 @@ ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ newDicomElement.patch GSettings-configuratio-storage.patch remove-appdata.patch bundle-glademm.patch +gcc8-friend-ifx.patch View it on GitLab: https://salsa.debian.org/med-team/aeskulap/compare/fe15aad7eab1e1da0e69b6e42a4b0eb6eacb57c7...a021a4b8d8bb8a1ec1c0365768d50c53f811aa00 -- View it on GitLab: https://salsa.debian.org/med-team/aeskulap/compare/fe15aad7eab1e1da0e69b6e42a4b0eb6eacb57c7...a021a4b8d8bb8a1ec1c0365768d50c53f811aa00 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
