Package: release.debian.org Severity: normal Tags: stretch User: [email protected] Usertags: pu
Hi, I'd like to revisit #864597 (upgrade-reports: jessie -> stretch: gnome fails to upgrade: cycle found while processing triggers) again ... As I had noted there, adding a Breaks: tzdata-java to gcc-6-base would have fixed this faulty upgrade path as well. The fix of reverting the dependency change in ca-certificates-java made the trigger cycle go away, but reintroduced some upgrade issues where openjdk-7 was kept installed instead of being upgraded to openjdk-8. The attached patch adds this Breaks (not yet fixed in sid) as well as a few libstdc++6 v5 related Breaks (already fixed in sid). I don't know if doko has more changes that should go to stretch, I "only" care for the upgrade path issues. (And I won't upload gcc-6 without his explicit Ack, but preferably he should to the upload). If this is acceptable for stretch r1, we should get it into s-p-u asap, s.t. I can test the affected upgrade paths in piuparts to be sure we don't introduce regressions (but fix the upgrade paths that kept openjdk-7 installed instead of upgrading to openjdk-8). Doing upgrade tests from jessie(+pu) to stretch+pu can be done easily with piuparts. Andreas
diff -u gcc-6-6.3.0/debian/changelog gcc-6-6.3.0/debian/changelog --- gcc-6-6.3.0/debian/changelog +++ gcc-6-6.3.0/debian/changelog @@ -1,3 +1,13 @@ +gcc-6 (6.3.0-18+deb9u1) stretch; urgency=medium + + * Non-maintainer upload. + * libstdc++6: Add more Breaks to smoothen upgrades from jessie to stretch. + Closes: #863845, #863745. + * gcc-6-base: Add Breaks: tzdata-java to smoothen the openjdk 7 -> 8 upgrade + path from jessie to stretch. Closes: #863820. + + -- Andreas Beckmann <[email protected]> Sat, 01 Jul 2017 15:00:25 +0200 + gcc-6 (6.3.0-18) unstable; urgency=medium * Update to SVN 20170516 (r248076) from the gcc-6-branch. diff -u gcc-6-6.3.0/debian/control gcc-6-6.3.0/debian/control --- gcc-6-6.3.0/debian/control +++ gcc-6-6.3.0/debian/control @@ -33,7 +33,7 @@ Priority: required Depends: ${misc:Depends} Replaces: ${base:Replaces} -Breaks: ${base:Breaks} +Breaks: ${base:Breaks}, tzdata-java Description: GCC, the GNU Compiler Collection (base package) This package contains files common to all languages and libraries contained in the GNU Compiler Collection (GCC). @@ -1952,7 +1952,7 @@ Provides: libstdc++6-armel [armel], libstdc++6-armhf [armhf] Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Breaks: ${multiarch:breaks}, libantlr-dev (<= 2.7.7+dfsg-6), libaqsis1 (<= 1.8.2-1), libassimp3 (<= 3.0~dfsg-4), blockattack (<= 1.4.1+ds1-2.1+b2), boo (<= 0.9.5~git20110729.r1.202a430-2), libboost-date-time1.54.0, libboost-date-time1.55.0, libcpprest2.4 (<= 2.4.0-2), printer-driver-brlaser (<= 3-3), c++-annotations (<= 10.2.0-1), clustalx (<= 2.1+lgpl-3), libdavix0 (<= 0.4.0-1+b1), libdballe6 (<= 6.8-1), dff (<= 1.3.0+dfsg.1-4.1+b3), libdiet-sed2.8 (<= 2.8.0-1+b3), libdiet-client2.8 (<= 2.8.0-1+b3), libdiet-admin2.8 (<= 2.8.0-1+b3), digikam-private-libs (<= 4:4.4.0-1.1+b2), emscripten (<= 1.22.1-1), ergo (<= 3.4.0-1), fceux (<= 2.2.2+dfsg0-1), flush (<= 0.9.12-3.1), libfreefem++ (<= 3.37.1-1), freeorion (<= 0.4.4+git20150327-2), fslview (<= 4.0.1-4), fwbuilder (<= 5.1.0-4), libgazebo5 (<= 5.0.1+dfsg-2.1), libgetfem4++ (<= 4.2.1~beta1~svn4635~dfsg-3+b1), libgmsh2 (<= 2.9.3+dfsg1-1), gnote (<= 3.16.2-1), gnudatalanguage (<= 0.9.5-2+b2), python-healpy (<= 1.8.1-1+b1), innoextract (<= 1.4-1+b1), libinsighttoolkit4.7 (<= 4.7.2-2), libdap17 (<= 3.14.0-2), libdapclient6 (<= 3.14.0-2), libdapserver7 (<= 3.14.0-2), libkolabxml1 (<= 1.1.0-3), libpqxx-4.0 (<= 4.0.1+dfsg-3), libreoffice-core (<= 1:4.4.5-2), librime1 (<= 1.2+dfsg-2), libwibble-dev (<= 1.1-1), lightspark (<= 0.7.2+git20150512-2+b1), libmarisa0 (<= 0.2.4-8), mira-assembler (<= 4.9.5-1), mongodb (<= 1:2.4.14-2), mongodb-server (<= 1:2.4.14-2), ncbi-blast+ (<= 2.2.30-4), libogre-1.8.0 (<= 1.8.0+dfsg1-7+b1), libogre-1.9.0 (<= 1.9.0+dfsg1-4), openscad (<= 2014.03+dfsg-1+b1), libopenwalnut1 (<= 1.4.0~rc1+hg3a3147463ee2-1+b1), passepartout (<= 0.7.1-1.1), pdf2djvu (<= 0.7.21-2), photoprint (<= 0.4.2~pre2-2.3+b2), plastimatch (<= 1.6.2+dfsg-1), plee-the-bear (<= 0.6.0-3.1), povray (<= 1:3.7.0.0-8), powertop (<= 2.6.1-1), psi4 (<= 4.0~beta5+dfsg-2+b1), python3-taglib (<= 0.3.6+dfsg-2+b2), realtimebattle (<= 1.0.8-14), ruby-passenger (<= 5.0.7-1), libapache2-mod-passenger (<= 5.0.7-1), schroot (<= 1.6.10-1+b1), sqli tebrowser (<= 3.5.1-3), tecnoballz (<= 0.93.1-6), wesnoth-1.12-core (<= 1:1.12.4-1), widelands (<= 1:18-3+b1), libwreport2 (<= 2.14-1), xflr5 (<= 6.09.06-2), libxmltooling6 (<= 1.5.3-2.1), libchemps2-1 (<= 1.5-1), python-fiona (<= 1.5.1-2), python3-fiona (<= 1.5.1-2), fiona (<= 1.5.1-2), python-guiqwt (<= 2.3.1-1), python-htseq (<= 0.5.4p3-2), python-imposm (<= 2.5.0-3+b2), python-pysph (<= 0~20150606.gitfa26de9-5), python3-taglib (<= 0.3.6+dfsg-2+b2), python-scipy (<= 0.14.1-1), python3-scipy (<= 0.14.1-1), python-sfml (<= 2.2~git20150611.196c88+dfsg-1+b1), python3-sfml (<= 2.2~git20150611.196c88+dfsg-1+b1), python-rasterio (<= 0.24.0-1), libopenmpi1.6, libopencv-core2.4, libsigc++-2.0-0c2a (<= 2.4.1-1+b1), +Breaks: ${multiarch:breaks}, libantlr-dev (<= 2.7.7+dfsg-6), libaqsis1 (<= 1.8.2-1), libassimp3 (<= 3.0~dfsg-4), blockattack (<= 1.4.1+ds1-2.1+b2), boo (<= 0.9.5~git20110729.r1.202a430-2), libboost-date-time1.54.0, libboost-date-time1.55.0, libcpprest2.4 (<= 2.4.0-2), printer-driver-brlaser (<= 3-3), c++-annotations (<= 10.2.0-1), clustalx (<= 2.1+lgpl-3), libdavix0 (<= 0.4.0-1+b1), libdballe6 (<= 6.8-1), dff (<= 1.3.0+dfsg.1-4.1+b3), libdiet-sed2.8 (<= 2.8.0-1+b3), libdiet-client2.8 (<= 2.8.0-1+b3), libdiet-admin2.8 (<= 2.8.0-1+b3), digikam-private-libs (<= 4:4.4.0-1.1+b2), emscripten (<= 1.22.1-1), ergo (<= 3.4.0-1), fceux (<= 2.2.2+dfsg0-1), flush (<= 0.9.12-3.1), libfreefem++ (<= 3.37.1-1), freeorion (<= 0.4.4+git20150327-2), fslview (<= 4.0.1-4), fwbuilder (<= 5.1.0-4), libgazebo5 (<= 5.0.1+dfsg-2.1), libgetfem4++ (<= 4.2.1~beta1~svn4635~dfsg-3+b1), libgmsh2 (<= 2.9.3+dfsg1-1), gnote (<= 3.16.2-1), gnudatalanguage (<= 0.9.5-2+b2), python-healpy (<= 1.8.1-1+b1), innoextract (<= 1.4-1+b1), libinsighttoolkit4.7 (<= 4.7.2-2), libdap17 (<= 3.14.0-2), libdapclient6 (<= 3.14.0-2), libdapserver7 (<= 3.14.0-2), libkolabxml1 (<= 1.1.0-3), libpqxx-4.0 (<= 4.0.1+dfsg-3), libreoffice-core (<= 1:4.4.5-2), librime1 (<= 1.2+dfsg-2), libwibble-dev (<= 1.1-1), lightspark (<= 0.7.2+git20150512-2+b1), libmarisa0 (<= 0.2.4-8), mira-assembler (<= 4.9.5-1), mongodb (<= 1:2.4.14-2), mongodb-server (<= 1:2.4.14-2), ncbi-blast+ (<= 2.2.30-4), libogre-1.8.0 (<= 1.8.0+dfsg1-7+b1), libogre-1.9.0 (<= 1.9.0+dfsg1-4), openscad (<= 2014.03+dfsg-1+b1), libopenwalnut1 (<= 1.4.0~rc1+hg3a3147463ee2-1+b1), passepartout (<= 0.7.1-1.1), pdf2djvu (<= 0.7.21-2), photoprint (<= 0.4.2~pre2-2.3+b2), plastimatch (<= 1.6.2+dfsg-1), plee-the-bear (<= 0.6.0-3.1), povray (<= 1:3.7.0.0-8), powertop (<= 2.6.1-1), psi4 (<= 4.0~beta5+dfsg-2+b1), python3-taglib (<= 0.3.6+dfsg-2+b2), realtimebattle (<= 1.0.8-14), ruby-passenger (<= 5.0.7-1), libapache2-mod-passenger (<= 5.0.7-1), schroot (<= 1.6.10-1+b1), sqli tebrowser (<= 3.5.1-3), tecnoballz (<= 0.93.1-6), wesnoth-1.12-core (<= 1:1.12.4-1), widelands (<= 1:18-3+b1), libwreport2 (<= 2.14-1), xflr5 (<= 6.09.06-2), libxmltooling6 (<= 1.5.3-2.1), libchemps2-1 (<= 1.5-1), python-fiona (<= 1.5.1-2), python3-fiona (<= 1.5.1-2), fiona (<= 1.5.1-2), python-guiqwt (<= 2.3.1-1), python-htseq (<= 0.5.4p3-2), python-imposm (<= 2.5.0-3+b2), python-pysph (<= 0~20150606.gitfa26de9-5), python3-taglib (<= 0.3.6+dfsg-2+b2), python-scipy (<= 0.14.1-1), python3-scipy (<= 0.14.1-1), python-sfml (<= 2.2~git20150611.196c88+dfsg-1+b1), python3-sfml (<= 2.2~git20150611.196c88+dfsg-1+b1), python-rasterio (<= 0.24.0-1), libopenmpi1.6, libopencv-core2.4, libsigc++-2.0-0c2a (<= 2.4.1-1+b1), libktoblzcheck1c2a, libaqbanking34-plugins, liblhapdf0, libpythia8, libxapian30 (<= 1.4.1-1~bpo8+1), Conflicts: scim (<< 1.4.2-1) Replaces: libstdc++6-6-dbg (<< 4.9.0-3) Description: GNU Standard C++ Library v3 diff -u gcc-6-6.3.0/debian/control.m4 gcc-6-6.3.0/debian/control.m4 --- gcc-6-6.3.0/debian/control.m4 +++ gcc-6-6.3.0/debian/control.m4 @@ -153,7 +153,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(required)') Depends: ${misc:Depends} Replaces: ${base:Replaces} -Breaks: ${base:Breaks} +Breaks: ${base:Breaks}, tzdata-java BUILT_USING`'dnl Description: GCC, the GNU Compiler Collection (base package) This package contains files common to all languages and libraries diff -u gcc-6-6.3.0/debian/libstdc++-breaks.Debian gcc-6-6.3.0/debian/libstdc++-breaks.Debian --- gcc-6-6.3.0/debian/libstdc++-breaks.Debian +++ gcc-6-6.3.0/debian/libstdc++-breaks.Debian @@ -89,0 +90,5 @@ +libktoblzcheck1c2a, +libaqbanking34-plugins, +liblhapdf0, +libpythia8, +libxapian30 (<= 1.4.1-1~bpo8+1), diff -u gcc-6-6.3.0/debian/rules.parameters gcc-6-6.3.0/debian/rules.parameters --- gcc-6-6.3.0/debian/rules.parameters +++ gcc-6-6.3.0/debian/rules.parameters @@ -2,14 +2,14 @@ GCC_VERSION := 6.3.0 NEXT_GCC_VERSION := 6.3.1 BASE_VERSION := 6 -SOURCE_VERSION := 6.3.0-18 -DEB_VERSION := 6.3.0-18 -DEB_EVERSION := 1:6.3.0-18 -DEB_GDC_VERSION := 6.3.0-18 +SOURCE_VERSION := 6.3.0-18+deb9u1 +DEB_VERSION := 6.3.0-18+deb9u1 +DEB_EVERSION := 1:6.3.0-18+deb9u1 +DEB_GDC_VERSION := 6.3.0-18+deb9u1 DEB_SOVERSION := 5 DEB_SOEVERSION := 1:5 DEB_LIBGCC_SOVERSION := -DEB_LIBGCC_VERSION := 1:6.3.0-18 +DEB_LIBGCC_VERSION := 1:6.3.0-18+deb9u1 DEB_STDCXX_SOVERSION := 5 DEB_GCJ_SOVERSION := 5 PKG_GCJ_EXT := 17
