summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-08-05 08:13:54 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-08-05 08:13:54 +0000
commit92793e9576ed4c6aa38b44c28ab5e336ea1329a6 (patch)
tree6addb33f2eb3fa2c4e9eb5029b6a11a82faa2e09
parent0d32ea14896ced68874e9bc6e4b1ab0cb08bb46e (diff)
downloadgcc-5-92793e9576ed4c6aa38b44c28ab5e336ea1329a6.tar.gz
* Adjust libstdc++-breaks: Break libantlr-dev instead of antlr;
adjust libreoffice version (closes: #794203), drop xxsd break (see #793289), remove cython breaks (closes: #794511), add breaks for packages built using cython (chemps2, fiona, guiqwt, htseq, imposm, pysph, pytaglib, python-scipy, python-sfml, rasterio). git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8194 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/gen-libstdc-breaks.sh10
-rw-r--r--debian/libstdc++-breaks.Debian17
-rw-r--r--debian/libstdc++-breaks.Ubuntu3
4 files changed, 20 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index 087c6b4..cddb3b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
gcc-5 (5.2.1-15) UNRELEASED; urgency=medium
* Adjust libstdc++-breaks: Break libantlr-dev instead of antlr;
- adjust libreoffice version (closes: #794203).
+ adjust libreoffice version (closes: #794203), drop xxsd break (see
+ #793289), remove cython breaks (closes: #794511), add breaks for
+ packages built using cython (chemps2, fiona, guiqwt, htseq, imposm,
+ pysph, pytaglib, python-scipy, python-sfml, rasterio).
* Ignore missing libstdc++ symbols on sparc64 (work around #792204).
-- Matthias Klose <doko@debian.org> Sat, 01 Aug 2015 20:27:57 +0200
diff --git a/debian/gen-libstdc-breaks.sh b/debian/gen-libstdc-breaks.sh
index b8e43a4..de35a4a 100755
--- a/debian/gen-libstdc-breaks.sh
+++ b/debian/gen-libstdc-breaks.sh
@@ -21,8 +21,6 @@ libcpprest2.4
printer-driver-brlaser
c++-annotations
clustalx
-cython
-cython3
libdavix0
libdballe6
dff
@@ -83,8 +81,7 @@ wesnoth-1.12-core
widelands
libwreport2
xflr5
-libxmltooling6
-xsdcxx')
+libxmltooling6')
else
pkgs=$(echo '
antlr
@@ -98,8 +95,6 @@ printer-driver-brlaser
c++-annotations
chromium-browser
clustalx
-cython
-cython3
libdavix0
libdballe6
dff
@@ -161,8 +156,7 @@ wesnoth-1.12-core
widelands
libwreport2
xflr5
-libxmltooling6
-xsdcxx')
+libxmltooling6')
fi
fn=debian/libstdc++-breaks.$vendor
diff --git a/debian/libstdc++-breaks.Debian b/debian/libstdc++-breaks.Debian
index fef7b9e..3c7047c 100644
--- a/debian/libstdc++-breaks.Debian
+++ b/debian/libstdc++-breaks.Debian
@@ -9,8 +9,6 @@ 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),
@@ -72,4 +70,17 @@ 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),
+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),
diff --git a/debian/libstdc++-breaks.Ubuntu b/debian/libstdc++-breaks.Ubuntu
index 4922a7f..646efa3 100644
--- a/debian/libstdc++-breaks.Ubuntu
+++ b/debian/libstdc++-breaks.Ubuntu
@@ -9,8 +9,6 @@ printer-driver-brlaser (<= 3-3),
c++-annotations (<= 10.2.0-1),
chromium-browser (<= 43.0.2357.130-0ubuntu2),
clustalx (<= ),
-cython (<= 0.22.1-1build1),
-cython3 (<= 0.22.1-1build1),
libdavix0 (<= 0.4.0-1build1),
libdballe6 (<= 6.8-1),
dff (<= 1.3.0+dfsg.1-4.1build2),
@@ -73,4 +71,3 @@ widelands (<= 1:18-3build1),
libwreport2 (<= 2.14-1),
xflr5 (<= 6.09.06-2),
libxmltooling6 (<= 1.5.3-2.1),
-xsdcxx (<= 4.0.0-1),