diff options
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | debian/patches/0002-use-the-system-mathjax-privacy-breach.patch | 4 | ||||
-rw-r--r-- | debian/patches/0003-fix-unit-test.patch | 2 | ||||
-rw-r--r-- | debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch | 44 | ||||
-rw-r--r-- | debian/patches/0006-prefer-pyqt5-over-pyside.patch | 52 | ||||
-rw-r--r-- | debian/patches/0007-add-install_requires-dependencies.patch | 4 | ||||
-rw-r--r-- | debian/patches/series | 2 |
7 files changed, 9 insertions, 104 deletions
diff --git a/debian/changelog b/debian/changelog index f42e9f9..7ab9cb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ silx (0.7.0+dfsg-1) UNRELEASED; urgency=medium * remove al the thir_party code * New upstream version 0.7.0+dfsg * Bumped Strandards-Versions to 4.1.3 (nothing to do) + * d/patches + - 0005-slocale.h-is-removed-in-GLIBC-2.26.patch (obsolete) + - 0006-prefer-pyqt5-over-pyside.patch (obsolete) - -- Picca Frédéric-Emmanuel <picca@debian.org> Sun, 04 Mar 2018 10:32:44 +0100 + -- Picca Frédéric-Emmanuel <picca@debian.org> Sun, 04 Mar 2018 10:55:59 +0100 silx (0.6.1+dfsg-2) unstable; urgency=medium diff --git a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch index cb6fb00..d1fa79d 100644 --- a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch +++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch @@ -8,10 +8,10 @@ Subject: use the system mathjax (privacy breach) 1 file changed, 5 insertions(+) diff --git a/doc/source/conf.py b/doc/source/conf.py -index e724d3c..d01cd39 100644 +index 234e4fa..ab5e24b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py -@@ -133,6 +133,11 @@ pygments_style = 'sphinx' +@@ -142,6 +142,11 @@ pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch index e441748..ceaebf4 100644 --- a/debian/patches/0003-fix-unit-test.patch +++ b/debian/patches/0003-fix-unit-test.patch @@ -8,7 +8,7 @@ Subject: fix unit test 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/silx/opencl/common.py b/silx/opencl/common.py -index ebf50c7..5661530 100644 +index e955f46..07159e2 100644 --- a/silx/opencl/common.py +++ b/silx/opencl/common.py @@ -61,7 +61,14 @@ else: diff --git a/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch b/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch deleted file mode 100644 index fb081bb..0000000 --- a/debian/patches/0005-slocale.h-is-removed-in-GLIBC-2.26.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Vicente Armando Sole <sole@titan.esrf.fr> -Date: Mon, 27 Nov 2017 10:46:30 +0100 -Subject: slocale.h is removed in GLIBC 2.26 - ---- - silx/io/specfile/src/locale_management.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/silx/io/specfile/src/locale_management.c b/silx/io/specfile/src/locale_management.c -index 163ed75..62111cc 100644 ---- a/silx/io/specfile/src/locale_management.c -+++ b/silx/io/specfile/src/locale_management.c -@@ -24,15 +24,23 @@ - #include <stdlib.h> - - #ifdef _GNU_SOURCE --#include <xlocale.h> --#include <locale.h> -+# include <locale.h> -+# ifdef __GLIBC__ -+# include <features.h> -+# if !((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ > 25))) -+# /* strtod_l has been moved to stdlib.h since glibc 2.26 */ -+# include <xlocale.h> -+# endif -+# else -+# include <xlocale.h> -+# endif - #else --#ifdef PYMCA_POSIX --#else --#ifdef SPECFILE_POSIX --#include <locale.h> --#endif --#endif -+# ifdef PYMCA_POSIX -+# else -+# ifdef SPECFILE_POSIX -+# include <locale.h> -+# endif -+# endif - #endif - - #include <string.h> diff --git a/debian/patches/0006-prefer-pyqt5-over-pyside.patch b/debian/patches/0006-prefer-pyqt5-over-pyside.patch deleted file mode 100644 index 253751b..0000000 --- a/debian/patches/0006-prefer-pyqt5-over-pyside.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= - <picca@synchrotron-soleil.fr> -Date: Mon, 14 Aug 2017 14:58:02 +0200 -Subject: prefer pyqt5 over pyside - ---- - silx/gui/qt/_qt.py | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/silx/gui/qt/_qt.py b/silx/gui/qt/_qt.py -index 0962c21..67f3e46 100644 ---- a/silx/gui/qt/_qt.py -+++ b/silx/gui/qt/_qt.py -@@ -64,12 +64,12 @@ HAS_OPENGL = False - """True if Qt provides support for OpenGL (QtOpenGL).""" - - # First check for an already loaded wrapper --if 'PySide.QtCore' in sys.modules: -- BINDING = 'PySide' -- --elif 'PyQt5.QtCore' in sys.modules: -+if 'PyQt5.QtCore' in sys.modules: - BINDING = 'PyQt5' - -+elif 'PySide.QtCore' in sys.modules: -+ BINDING = 'PySide' -+ - elif 'PyQt4.QtCore' in sys.modules: - BINDING = 'PyQt4' - -@@ -78,17 +78,17 @@ else: # Then try Qt bindings - import PyQt4 # noqa - except ImportError: - try: -- import PySide # noqa -+ import PyQt5 # noqa - except ImportError: - try: -- import PyQt5 # noqa -+ import PySide # noqa - except ImportError: - raise ImportError( - 'No Qt wrapper found. Install PyQt4, PyQt5 or PySide.') - else: -- BINDING = 'PyQt5' -+ BINDING = 'PySide' - else: -- BINDING = 'PySide' -+ BINDING = 'PyQt5' - else: - BINDING = 'PyQt4' - diff --git a/debian/patches/0007-add-install_requires-dependencies.patch b/debian/patches/0007-add-install_requires-dependencies.patch index 8d5759b..bc04415 100644 --- a/debian/patches/0007-add-install_requires-dependencies.patch +++ b/debian/patches/0007-add-install_requires-dependencies.patch @@ -8,10 +8,10 @@ Subject: add install_requires dependencies 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index bede4df..c41df00 100644 +index 08e4f90..da74ffd 100644 --- a/setup.py +++ b/setup.py -@@ -701,7 +701,23 @@ def get_project_configuration(dry_run): +@@ -776,7 +776,23 @@ def get_project_configuration(dry_run): # for most of the computation "numpy", # for the script launcher diff --git a/debian/patches/series b/debian/patches/series index 820176e..1339c13 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 0002-use-the-system-mathjax-privacy-breach.patch 0003-fix-unit-test.patch -0006-prefer-pyqt5-over-pyside.patch 0007-add-install_requires-dependencies.patch -0005-slocale.h-is-removed-in-GLIBC-2.26.patch |