summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-08-01 11:42:06 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-08-01 11:42:06 +0000
commit7858eaba347fc1e8446a99340e13a3aa176a5506 (patch)
tree31ff757f5f64882f1ee238f6d182b889f1e69c8b
parent6499846cd5b31eab4108a03ec105115563518e3a (diff)
downloadgcc-5-7858eaba347fc1e8446a99340e13a3aa176a5506.tar.gz
gcc-5 (5.2.1-14) unstable; urgency=high
* Fix libstdc++6 breaks. -- Matthias Klose <doko@debian.org> Fri, 31 Jul 2015 04:12:08 +0200 git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8186 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rwxr-xr-xdebian/gen-libstdc-breaks.sh3
-rw-r--r--debian/libstdc++-breaks.Debian3
4 files changed, 12 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 6839838..a11e2e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
-gcc-5 (5.2.1-13) UNRELEASED; urgency=medium
+gcc-5 (5.2.1-14) unstable; urgency=high
+ * Fix libstdc++6 breaks.
+
+ -- Matthias Klose <doko@debian.org> Fri, 31 Jul 2015 04:12:08 +0200
+
+gcc-5 (5.2.1-13) unstable; urgency=high
+
+ * Upload to unstable (https://wiki.debian.org/GCC5). See also
+ https://lists.debian.org/debian-devel-announce/2015/07/msg00000.html
* Update to SVN 20150730 (r226411, 5.2.1) from the gcc-5-branch.
- Fix PR libstdc++/67015. Closes: #793784.
* Fix version macros in the plugin-header.h header. Closes: #793478.
diff --git a/debian/control b/debian/control
index 57f3da9..d8b2ecc 100644
--- a/debian/control
+++ b/debian/control
@@ -1927,7 +1927,7 @@ Depends: gcc-5-base (= ${gcc:Version}), ${dep:libc}, ${shlibs:Depends}, ${misc:D
Provides: libstdc++6-armel [armel], libstdc++6-armhf [armhf]
Multi-Arch: same
Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}, antlr (<= 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), chromium-browser (<= ), clustalx (<= 2.1+lgpl-3), cython (<= 0.22.1-1), cython3 (<= 0.22.1-1), 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), 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.6 (<= ), 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.4-1), 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.1+dfsg-2), 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 (<= 4.0.53-1+b2), libapache2-mod-passenger (<= 4.0.53-1+b2), sqlitebrowser (<= 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), xsdcxx (<= 4.0.0-1),
+Breaks: ${multiarch:breaks}, antlr (<= 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), cython (<= 0.22.1-1), cython3 (<= 0.22.1-1), 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.4-1), 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), sqlitebrowser (<= 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), xsdcxx (<= 4.0.0-1),
Conflicts: scim (<< 1.4.2-1)
Replaces: libstdc++6-5-dbg (<< 4.9.0-3)
Description: GNU Standard C++ Library v3
diff --git a/debian/gen-libstdc-breaks.sh b/debian/gen-libstdc-breaks.sh
index 0556668..b8e43a4 100755
--- a/debian/gen-libstdc-breaks.sh
+++ b/debian/gen-libstdc-breaks.sh
@@ -20,7 +20,6 @@ libboost-date-time1.55.0
libcpprest2.4
printer-driver-brlaser
c++-annotations
-chromium-browser
clustalx
cython
cython3
@@ -46,7 +45,7 @@ gnote
gnudatalanguage
python-healpy
innoextract
-libinsighttoolkit4.6
+libinsighttoolkit4.7
libdap17
libdapclient6
libdapserver7
diff --git a/debian/libstdc++-breaks.Debian b/debian/libstdc++-breaks.Debian
index 464730d..6a33080 100644
--- a/debian/libstdc++-breaks.Debian
+++ b/debian/libstdc++-breaks.Debian
@@ -8,7 +8,6 @@ libboost-date-time1.55.0,
libcpprest2.4 (<= 2.4.0-2),
printer-driver-brlaser (<= 3-3),
c++-annotations (<= 10.2.0-1),
-chromium-browser (<= ),
clustalx (<= 2.1+lgpl-3),
cython (<= 0.22.1-1),
cython3 (<= 0.22.1-1),
@@ -34,7 +33,7 @@ gnote (<= 3.16.2-1),
gnudatalanguage (<= 0.9.5-2+b2),
python-healpy (<= 1.8.1-1+b1),
innoextract (<= 1.4-1+b1),
-libinsighttoolkit4.6 (<= ),
+libinsighttoolkit4.7 (<= 4.7.2-2),
libdap17 (<= 3.14.0-2),
libdapclient6 (<= 3.14.0-2),
libdapserver7 (<= 3.14.0-2),