release 5.5.2+dfsg-2debian/5.5.2+dfsg-2

5 files changed, 8 insertions, 105 deletions

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index d627c91..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-embeded library
-- qhull
-
-copyright
-- check compatibility with GPL of the qhull
-- add header
-  * PyMca/PhysicalMemory.py
-  * PyMca/PyMcaPlugins/MotorInfoPlugin.py
-  * PyMca/PyMcaPlugins/MotorInfoWindow.py
-  * PyMca/PyMcaPlugins/StackScanWindowPlugin.py
-  * PyMca/PyMcaPlugins/XMCDPlugin.py
-  * PyMca/XMCDWindow.py
-  * PyMca/XRFMC/XMSOParser.py
-  * PyMca/XRFMC/XRFMCHelper.py
-  * PyMca/XRFMC/XRFMCPyMca.py
-  * PyMca/XRFMC/XRFMCPyMca.py
-  * PyMca/XRFMC/__init__.py
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 00e5735..62a5072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pymca (5.5.2+dfsg-2) unstable; urgency=medium
+
+  * Removed Python2 module (Closes: #937478)
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Thu, 10 Oct 2019 11:38:26 +0200
+
 pymca (5.5.2+dfsg-1) unstable; urgency=medium
 
   * New upstream version 5.5.2+dfsg
diff --git a/debian/control b/debian/control
index 0fdbf5a..e9c6189 100644
--- a/debian/control
+++ b/debian/control
@@ -4,34 +4,13 @@ Uploaders: Picca Frédéric-Emmanuel <picca@debian.org>
 Section: science
 Priority: optional
 Rules-Requires-Root: no
-Build-Depends: cython,
-               cython-dbg,
-               cython3,
+Build-Depends: cython3,
                cython3-dbg,
                dbus,
                debhelper-compat (= 12),
                dh-python,
                libglu1-mesa-dev,
                libqhull-dev,
-               python-all-dbg,
-               python-all-dev,
-               python-fisx (>= 1.1.6) <!nocheck>,
-               python-fisx-dbg (>= 1.1.6) <!nocheck>,
-               python-h5py <!nocheck> <!nodoc>,
-               python-h5py-dbg <!nocheck> <!nodoc>,
-               python-ipython,
-               python-matplotlib <!nodoc>,
-               python-matplotlib-dbg <!nodoc>,
-               python-numpy,
-               python-numpy-dbg,
-               python-opengl,
-               python-pyqt5 <!nodoc>,
-               python-pyqt5-dbg <!nodoc>,
-               python-pyqt5.qtopengl <!nodoc>,
-               python-pyqt5.qtopengl-dbg <!nodoc>,
-               python-qtconsole,
-               python-setuptools,
-               python-sphinx,
                python3-all-dbg,
                python3-all-dev,
                python3-fisx (>= 1.1.6) <!nocheck>,
@@ -84,69 +63,6 @@ Description: Applications and toolkit for X-ray fluorescence analysis -- scripts
  .
  This are the scripts of the package.
 
-Package: python-pymca5
-Architecture: any
-Section: python
-Depends: pymca-data (= ${source:Version}),
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends}
-Recommends: python-mdp, python-silx
-Description: Applications and toolkit for X-ray fluorescence analysis -- Python 2
- PyMca is set of applications and Python libraries for analysis of
- X-ray fluorescence spectra.
- .
- The applications included in this package are:
- .
-  * edfviewer - Display and inspection of data files in ESRF Data Format
-  * elementsinfo - Displays element specific X-ray data
-  * mca2edf - Converts files from SPEC MCA format to EDF
-  * peakidentifier - Displays X-ray fluorescence peaks in a given energy range
-  * pymcabatch - Batch fitting of spectra
-  * pymcapostbatch - Post-processing of batch fitting results
-  * pymca - Interactive data-analysis
-  * pymcaroitool - Region-of-interest (ROI) imaging tool
- .
- The PyMca toolkit can read data files in SPEC, ESRF data file (EDF),
- OMNIC, HDF5, AIFIRA and SupaVisio formats.
- .
- This is the Python 2 version of the package.
-
-Package: python-pymca5-dbg
-Architecture: any
-Section: debug
-Depends: python-fisx-dbg (>= 1.1.6-1~),
-         python-h5py-dbg,
-         python-matplotlib-dbg,
-         python-numpy-dbg,
-         python-opengl,
-         python-pymca5 (= ${binary:Version}),
-         python-pyqt5-dbg,
-         python-pyqt5.qtopengl-dbg,
-         ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends}
-Recommends: python-dbg, python-mdp, python-silx-dbg
-Description: Applications and toolkit for X-ray fluorescence analysis -- Python 2 debug
- PyMca is set of applications and Python libraries for analysis of
- X-ray fluorescence spectra.
- .
- The applications included in this package are:
- .
-  * edfviewer - Display and inspection of data files in ESRF Data Format
-  * elementsinfo - Displays element specific X-ray data
-  * mca2edf - Converts files from SPEC MCA format to EDF
-  * peakidentifier - Displays X-ray fluorescence peaks in a given energy range
-  * pymcabatch - Batch fitting of spectra
-  * pymcapostbatch - Post-processing of batch fitting results
-  * pymca - Interactive data-analysis
-  * pymcaroitool - Region-of-interest (ROI) imaging tool
- .
- The PyMca toolkit can read data files in SPEC, ESRF data file (EDF),
- OMNIC, HDF5, AIFIRA and SupaVisio formats.
- .
- This is the Python 2 debug version of the package.
-
 Package: python3-pymca5
 Architecture: any
 Section: python
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
deleted file mode 100644
index 8312180..0000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1 +0,0 @@
-pyqt5 python-pyqt5,python-pyqt5.qtopengl
diff --git a/debian/rules b/debian/rules
index 01709ee..50655de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ export WITH_OPENGL_TEST=False
 endif
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean
@@ -75,7 +75,6 @@ override_dh_install:
 	rm -f debian/pymca-data/usr/share/pymca/LICENSE.MIT
 	rm -rf debian/pymca-data/usr/share/pymca/doc/HTML/PyMCA_files/
 
-	dh_numpy
 	dh_numpy3
 
 override_dh_auto_test: