diff -Nru root-system-5.34.30/debian/changelog root-system-5.34.30/debian/changelog --- root-system-5.34.30/debian/changelog 2015-11-11 21:55:45.000000000 +0000 +++ root-system-5.34.30/debian/changelog 2015-12-10 01:41:09.000000000 +0000 @@ -1,3 +1,29 @@ +root-system (5.34.30-0+rpi2) stretch-staging; urgency=medium + + [changes brought forward from 5.34.30-0+rpi1 by Peter Michael Green at Fri, 02 Oct 2015 02:38:22 +0000] + * Use ubuntu package as a base since Debian package is currently unusable + * Adjust configure script so that multiarch logic is enabled on Debian + derivatives other than Ubuntu and Mint and hence multiarched libraries + are found on said derivatives. + * Add build-conflicts on libqt4-private-dev. It contains the directory + /usr/include/src/corelib/global/ which confuses the configure script + * Version build-depends on libpythia8-dev as (>= 8.1.80-1), the headers + have moved and the configure script expects the new location. + * Remove unixodbc-dev alternative from build-depends as the package does not + build successfully with it. + + [changes introduced in 5.34.30-0+rpi2 by Peter Michael Green] + * Cleanup a large variety of files left behind by existing clean target + + *.o , *.d and *_tmp and rootcint_* files anywhere in the build tree + + *.par files in directories under etc + + graf2d/qt/src/moc_* gui/qtgsi/src/moc_* + + cint/cint/inc/configcint.h cint/cint/include/iosenum.h cint/cint/include/sys/types.h cint/cint/include/systypes.h cint/cint/src/loadfile_tmp.cxx + + config/Makefile.comp + + core/metautils/src/stlLoader_* + + core/utils/src/RStl_tmp.cxx main/src/proofserv.sh main/src/roots.sh + + -- Peter Michael Green Mon, 07 Dec 2015 11:46:59 +0000 + root-system (5.34.30-0ubuntu5) xenial; urgency=medium * Update for gsl_multifit_covar API changes in gsl2. diff -Nru root-system-5.34.30/debian/control root-system-5.34.30/debian/control --- root-system-5.34.30/debian/control 2015-11-10 15:02:13.000000000 +0000 +++ root-system-5.34.30/debian/control 2015-12-08 01:13:29.000000000 +0000 @@ -5,7 +5,8 @@ XSBC-Original-Maintainer: Debian Science Maintainers Uploaders: Lifeng Sun Homepage: http://root.cern.ch -Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, liblzma-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev, libgraphviz-dev, libavahi-core-dev, libsqlite3-dev, libxft-dev, dh-python, ruby, ruby-dev, libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew-dev, libftgl-dev, libgl2ps-dev, libxml2-dev, libgsl-dev, libavahi-compat-libdnssd-dev, libldap2-dev | libldap-dev, libjpeg-dev, libpng12-dev, libtiff-dev, libafterimage-dev, libgif-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libpythia8-dev, libglobus-gss-assist-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-module-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev +Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, liblzma-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev, libgraphviz-dev, libavahi-core-dev, libsqlite3-dev, libxft-dev, dh-python, ruby, ruby-dev, libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew-dev, libftgl-dev, libgl2ps-dev, libxml2-dev, libgsl-dev, libavahi-compat-libdnssd-dev, libldap2-dev | libldap-dev, libjpeg-dev, libpng12-dev, libtiff-dev, libafterimage-dev, libgif-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libpythia8-dev (>= 8.1.80-1), libglobus-gss-assist-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-module-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient-dev, libiodbc2-dev, libpq-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev +Build-Conflicts: libqt4-private-dev Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/debian-science/packages/root-system.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/root-system.git diff -Nru root-system-5.34.30/debian/libroot-bindings-python5.34.links root-system-5.34.30/debian/libroot-bindings-python5.34.links --- root-system-5.34.30/debian/libroot-bindings-python5.34.links 2015-08-14 11:12:33.000000000 +0000 +++ root-system-5.34.30/debian/libroot-bindings-python5.34.links 2015-12-08 03:39:03.000000000 +0000 @@ -1,2 +1,2 @@ -/usr/lib/x86_64-linux-gnu/root5.34/libPyROOT.so /usr/lib/python2.7/dist-packages/libPyROOT.so -/usr/lib/x86_64-linux-gnu/root5.34/ROOT.py /usr/lib/python2.7/dist-packages/ROOT.py +/usr/lib/arm-linux-gnueabihf/root5.34/libPyROOT.so /usr/lib/python2.7/dist-packages/libPyROOT.so +/usr/lib/arm-linux-gnueabihf/root5.34/ROOT.py /usr/lib/python2.7/dist-packages/ROOT.py diff -Nru root-system-5.34.30/debian/patches/79-fix-configure-for-derivatives.patch root-system-5.34.30/debian/patches/79-fix-configure-for-derivatives.patch --- root-system-5.34.30/debian/patches/79-fix-configure-for-derivatives.patch 1970-01-01 00:00:00.000000000 +0000 +++ root-system-5.34.30/debian/patches/79-fix-configure-for-derivatives.patch 2015-12-08 01:10:36.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Fix building on derivatives. + Previously the multiarch logic in the configure script was only enabled + if lsb-release -d returned "debian", "ubuntu" or "mint" on any derivative + where this was not the case (for example raspbian) the multiarch logic would + not be enabled, this would cause the configure script to fail to find libraries + and hence cause the package to FTBFS. + + This patch changes the logic to use dpkg-vendor --derives-from Debian + instead (with a check that dpkg-architecture actually exists first). So the + multiarch logic should be enabled on any derivative that describes itself as + being derived from debian. + +Author: Peter Michael Green + +Index: root-system-5.34.30/configure +=================================================================== +--- root-system-5.34.30.orig/configure ++++ root-system-5.34.30/configure +@@ -2021,14 +2021,8 @@ fi + + if test "x$platform" = "xlinux" -o "x$platform" = "xkfreebsd" -o "x$platform" = "xhurd"; then + linuxdist= +- if `$cwhich lsb_release > /dev/null 2>&1` ; then +- if lsb_release -d | grep -i 'ubuntu' > /dev/null 2>& 1; then +- linuxdist="multiarch" +- fi +- if lsb_release -d | grep -i 'debian' > /dev/null 2>& 1; then +- linuxdist="multiarch" +- fi +- if lsb_release -d | grep -i 'mint' > /dev/null 2>& 1; then ++ if `$cwhich dpkg-vendor > /dev/null 2>&1` ; then ++ if dpkg-vendor --derives-from Debian > /dev/null 2>& 1; then + linuxdist="multiarch" + fi + if lsb_release -d | grep -i 'LMDE' > /dev/null 2>& 1; then diff -Nru root-system-5.34.30/debian/patches/series root-system-5.34.30/debian/patches/series --- root-system-5.34.30/debian/patches/series 2015-11-11 21:53:21.000000000 +0000 +++ root-system-5.34.30/debian/patches/series 2015-12-08 01:10:36.000000000 +0000 @@ -35,3 +35,4 @@ ppc.diff fix-arm32.diff gsl-2.0-ftbfs +79-fix-configure-for-derivatives.patch diff -Nru root-system-5.34.30/debian/rules root-system-5.34.30/debian/rules --- root-system-5.34.30/debian/rules 2015-08-14 13:10:08.000000000 +0000 +++ root-system-5.34.30/debian/rules 2015-12-10 01:41:19.000000000 +0000 @@ -519,6 +519,16 @@ math/unuran/src/unuran-*-root/src/parser/Makefile # touch graf2d/asimage/src/headers.d rm -f $(filter-out debian/control, $(TEMPLATES:debian/skel/%.in=debian/%)) + rm -f `find . -name '*.o'` + rm -f `find . -name '*.d'` + rm -f `find . -name '*_tmp'` + rm -f `find etc -name '*.par'` + rm -f `find . -name 'rootcint_*'` + rm -f graf2d/qt/src/moc_* gui/qtgsi/src/moc_* + rm -f cint/cint/inc/configcint.h cint/cint/include/iosenum.h cint/cint/include/sys/types.h cint/cint/include/systypes.h cint/cint/src/loadfile_tmp.cxx + rm -f config/Makefile.comp + rm -f core/metautils/src/stlLoader_* + rm -f core/utils/src/RStl_tmp.cxx main/src/proofserv.sh main/src/roots.sh dh_clean pkglists: