debian/changelog

+mgltools-dejavu (1.5.7-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debhelper-compat 12
+  * Standards-Version: 4.4.0
+  * Switch to pybuild
+  * fix Python Imaging Library imports
+  * Match Debian's naming of opengltk/OpenGL/Tk/Togl/togl
+
+ -- Michael R. Crusoe <michael.crusoe@gmail.com>  Fri, 08 Nov 2019 15:44:34 +0100
+
 mgltools-dejavu (1.5.7-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-11

debian/control

@@ -5,14 +5,16 @@ Uploaders: Steffen Moeller <moeller@debian.org>,
 Section: non-free/science
 XS-Autobuild: yes
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                python-all,
                mesa-common-dev,
                x11proto-core-dev,
                libx11-dev,
                python-numpy,
-               dh-python
-Standards-Version: 4.3.0
+               python-pil,
+               dh-python,
+               mgltools-opengltk
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/mgltools-dejavu
 Vcs-Git: https://salsa.debian.org/med-team/mgltools-dejavu.git
 Homepage: http://mgltools.scripps.edu/
@@ -22,6 +24,7 @@ Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
+         python-pil,
          mgltools-opengltk,
          mgltools-pyglf,
          mgltools-geomutils

debian/patches/fix_import

+From: Michael R. Crusoe <michael.crusoe@gmail.com>
+Subject: fix imports for Python Imaging Library
+--- mgltools-dejavu.orig/DejaVu/Camera.py
++++ mgltools-dejavu/DejaVu/Camera.py
+@@ -36,9 +36,9 @@
+ 
+ import os, sys, warnings
+ 
+-import Image
+-import ImageFilter
+-import ImageChops
++from PIL import Image
++from PIL import ImageFilter
++from PIL import ImageChops
+ 
+ import tkMessageBox
+ 
+--- mgltools-dejavu.orig/DejaVu/StickerImage.py
++++ mgltools-dejavu/DejaVu/StickerImage.py
+@@ -19,7 +19,7 @@
+ #
+ 
+ import os
+-import Image
++from PIL import Image
+ from copy import deepcopy
+ 
+ from opengltk.extent import _gllib
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Arcs3D.py
++++ mgltools-dejavu/DejaVu/Tests/test_Arcs3D.py
+@@ -18,7 +18,7 @@
+ from DejaVu.IndexedPolylines import IndexedPolylines
+ from DejaVu.ViewerGUI import ViewerGUI
+ from DejaVu import viewerConst,datamodel
+-import Image
++from PIL import Image
+ from math import sqrt
+ from DejaVu.Points import Points, CrossSet
+ from DejaVu.Arcs3D import Arcs3D
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Arrows.py
++++ mgltools-dejavu/DejaVu/Tests/test_Arrows.py
+@@ -11,7 +11,7 @@
+ from math import sqrt
+ from DejaVu.Viewer import Viewer
+ from DejaVu.Arrows import Arrows
+-import Image
++from PIL import Image
+ 
+ 
+ class Arrows__init__Tests(unittest.TestCase):
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Axis.py
++++ mgltools-dejavu/DejaVu/Tests/test_Axis.py
+@@ -6,7 +6,7 @@
+ from math import sqrt
+ from DejaVu.Viewer import Viewer
+ from DejaVu.Arrows import Axis
+-import Image
++from PIL import Image
+ from time import sleep
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Box.py
++++ mgltools-dejavu/DejaVu/Tests/test_Box.py
+@@ -6,7 +6,7 @@
+ import unittest
+ import sys, os
+ import numpy
+-import Image
++from PIL import Image
+ 
+ from math import sqrt
+ from Tkinter import Menubutton
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Camera.py
++++ mgltools-dejavu/DejaVu/Tests/test_Camera.py
+@@ -17,7 +17,7 @@
+ from DejaVu.IndexedPolygons import IndexedPolygons
+ from DejaVu.ViewerGUI import ViewerGUI
+ from DejaVu import viewerConst,datamodel
+-import Image
++from PIL import Image
+ from math import sqrt
+ from mglutil.math.rotax import rotax
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_CrossSet.py
++++ mgltools-dejavu/DejaVu/Tests/test_CrossSet.py
+@@ -9,7 +9,7 @@
+ import numpy
+ from DejaVu.Viewer import Viewer
+ from time import sleep
+-import Image
++from PIL import Image
+ from math import sqrt
+ from DejaVu.Points import CrossSet
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Cylinders.py
++++ mgltools-dejavu/DejaVu/Tests/test_Cylinders.py
+@@ -11,7 +11,7 @@
+ from DejaVu.Viewer import Viewer
+ from time import sleep
+ from DejaVu.Cylinders import Cylinders
+-import Image
++from PIL import Image
+ 
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Ellipsoids.py
++++ mgltools-dejavu/DejaVu/Tests/test_Ellipsoids.py
+@@ -6,7 +6,7 @@
+ from DejaVu.Viewer import Viewer
+ from DejaVu.Ellipsoids import Ellipsoids
+ from string import split
+-import Image
++from PIL import Image
+ 
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Fan3D.py
++++ mgltools-dejavu/DejaVu/Tests/test_Fan3D.py
+@@ -10,7 +10,7 @@
+ import unittest
+ from DejaVu.Viewer import Viewer
+ from time import sleep
+-import Image
++from PIL import Image
+ from math import sqrt
+ from DejaVu.Arcs3D import Fan3D
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_GridBox.py
++++ mgltools-dejavu/DejaVu/Tests/test_GridBox.py
+@@ -13,7 +13,7 @@
+ from DejaVu.Viewer import Viewer
+ from math import sqrt
+ from DejaVu.Box import GridBox
+-import Image
++from PIL import Image
+ from time import sleep
+ from Tkinter import Menubutton
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_IndexedPolygons.py
++++ mgltools-dejavu/DejaVu/Tests/test_IndexedPolygons.py
+@@ -12,7 +12,7 @@
+ import numpy
+ from DejaVu.Viewer import Viewer
+ from DejaVu.IndexedPolygons import IndexedPolygons
+-import Image
++from PIL import Image
+ 
+ class IndexedPolygons__init__Tests(unittest.TestCase):
+     """test keywords for __init__:
+--- mgltools-dejavu.orig/DejaVu/Tests/test_IndexedPolylines.py
++++ mgltools-dejavu/DejaVu/Tests/test_IndexedPolylines.py
+@@ -13,7 +13,7 @@
+ import types
+ from DejaVu.Viewer import Viewer
+ from DejaVu.IndexedPolylines import IndexedPolylines
+-import Image
++from PIL import Image
+ 
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Labels.py
++++ mgltools-dejavu/DejaVu/Tests/test_Labels.py
+@@ -11,7 +11,7 @@
+ from DejaVu.Viewer import Viewer
+ from time import sleep
+ from DejaVu import viewerConst
+-import Image
++from PIL import Image
+ from DejaVu.glfLabels import GlfLabels
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Points.py
++++ mgltools-dejavu/DejaVu/Tests/test_Points.py
+@@ -10,12 +10,12 @@
+ import numpy
+ from opengltk.OpenGL import GL
+ from DejaVu.Viewer import Viewer
+-import Image
++from PIL import Image
+ from math import sqrt
+ from DejaVu.Points import Points,CrossSet
+ from time import sleep
+ 
+-import Image
++from PIL import Image
+ from math import sqrt
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_Spheres.py
++++ mgltools-dejavu/DejaVu/Tests/test_Spheres.py
+@@ -13,7 +13,7 @@
+ from DejaVu.Spheres import Spheres,TriangulateIcos,TriangulateIcosByEdgeCenterPoint
+ from time import sleep
+ from DejaVu import viewerConst
+-import Image
++from PIL import Image
+ 
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Tests/test_triangleStrip.py
++++ mgltools-dejavu/DejaVu/Tests/test_triangleStrip.py
+@@ -6,7 +6,7 @@
+ from DejaVu.triangle_strip import Triangle_strip
+ from time import sleep
+ 
+-import Image
++from PIL import Image
+ from math import sqrt
+ 
+ 
+--- mgltools-dejavu.orig/DejaVu/Texture.py
++++ mgltools-dejavu/DejaVu/Texture.py
+@@ -13,7 +13,7 @@
+ #
+ 
+ import sys, os
+-import Image
++from PIL import Image
+ import numpy
+ import warnings
+ 
+@@ -404,7 +404,7 @@
+ if __name__ == '__main__':
+ 
+     t = Texture()
+-    import Image
++    from PIL import Image
+     im = Image.open('lena.jpg')
+     t.Set(enable=1, image=im)
+ 
+--- mgltools-dejavu.orig/DejaVu/Viewer.py
++++ mgltools-dejavu/DejaVu/Viewer.py
+@@ -31,7 +31,7 @@
+ from time import time, sleep
+ import re
+ try:
+-    import Image
++    from PIL import Image
+ except:
+     pass
+ 
+@@ -2135,7 +2135,7 @@
+                       w, h = aoim.size
+                       aoims = aoim.resize( (int(w*scale), int(h*scale)) )
+                       # blur the mask
+-                      import ImageFilter, ImageChops, ImageEnhance
++                      from PIL import ImageFilter, ImageChops, ImageEnhance
+                       enhancer = ImageEnhance.Brightness(aoims)
+                       aoimsb = enhancer.enhance(1.15)
+                       aoimsb = aoimsb.filter(ImageFilter.SMOOTH_MORE)
+--- mgltools-dejavu.orig/DejaVu/ViewerGUI.py
++++ mgltools-dejavu/DejaVu/ViewerGUI.py
+@@ -1685,7 +1685,7 @@
+         
+ 
+     def getButtonIcon(self):
+-        import Image, ImageChops, ImageTk
++        from PIL import Image, ImageChops, ImageTk
+         c = self.viewer.currentCamera
+         im = c.GrabFrontBuffer()
+         def autocrop(im, bgcolor):
+--- mgltools-dejavu.orig/DejaVu/VisionInterface/DejaVuNodes.py
++++ mgltools-dejavu/DejaVu/VisionInterface/DejaVuNodes.py
+@@ -1558,8 +1558,8 @@
+ 
+ try:
+     from opengltk.extent import _gllib
+-    import Image
+-    import ImageChops
++    from PIL import Image
++    from PIL import ImageChops
+ 
+     class ImageViewerNode(NetworkNode):
+         """create an instance of an OpenGL-based image viewer
+@@ -1772,13 +1772,13 @@
+ 
+         if smooth:
+             from time import time
+-            import ImageFilter, ImageChops
++            from PIL import ImageFilter, ImageChops
+             t1 = time()
+             outlinesmooth = outline.filter(ImageFilter.SMOOTH_MORE)
+             #outline = ImageChops.multiply(outline, outlinesmooth)
+             print time()-t1
+             
+-        import ImageChops
++        from PIL import ImageChops
+         contouredImage = ImageChops.multiply(image, outline)
+ ##         mask = dstrong
+ ##         mask.shape = ( width, height, -1)
+--- mgltools-dejavu.orig/DejaVu/VisionInterface/DejaVuTypes.py
++++ mgltools-dejavu/DejaVu/VisionInterface/DejaVuTypes.py
+@@ -20,7 +20,7 @@
+ # $Id$
+ #
+ 
+-import Image
++from PIL import Image
+ import numpy
+ 
+ from NetworkEditor.datatypes import AnyArrayType
+@@ -51,7 +51,7 @@
+ 
+ class TextureType(AnyArrayType):
+ 
+-    from Image import Image
++    from PIL import Image
+     def __init__(self, name='texture', datashape=None, color='#995699',
+                  shape='rect', width=None, height=None, klass=None):
+ 
+--- mgltools-dejavu.orig/DejaVu/imageViewer.py
++++ mgltools-dejavu/DejaVu/imageViewer.py
+@@ -2,7 +2,7 @@
+ ## This file is not used anymore.
+ import Tkinter, os
+ import numpy
+-import Image
++from PIL import Image
+ from opengltk.OpenGL import GL
+ from opengltk.extent import _gllib
+ from DejaVu.EventHandler import EventManager
+--- mgltools-dejavu.orig/DejaVu/scenarioInterface/animationGUI.py
++++ mgltools-dejavu/DejaVu/scenarioInterface/animationGUI.py
+@@ -1271,7 +1271,7 @@
+     def addOrientButton(self, maa):
+         master = self.MAAContainer.interior()
+         if hasattr(maa, 'ims') and maa.ims is not None:
+-            import ImageTk
++            from PIL import ImageTk
+             photo = ImageTk.PhotoImage(maa.ims)
+         else:
+             self.viewer.master.lift()
+--- mgltools-dejavu.orig/DejaVu/tileRenderer.py
++++ mgltools-dejavu/DejaVu/tileRenderer.py
+@@ -351,7 +351,7 @@
+ ##          # read the tile into buffer
+ ##          gllib.glReadPixels(srcX, srcY, srcWidth, srcHeight,
+ ##                             self.ImageFormat, self.ImageType, self.oneTileRenderBuffer)
+-##          import Image, sys
++##          from PIL import Image, sys
+ ##          im = Image.fromstring('RGB', (srcWidth, srcHeight),
+ ##                                self.oneTileRenderBuffer) 
+ ##          if sys.platform!='win32':

debian/patches/series

+fix_import
+togl_soversion

debian/patches/togl_soversion

+Author: Michael R. Crusoe <michael.crusoe@gmail.com>
+Description: Match Debian's naming of opengltk/OpenGL/Tk/Togl/togl.$TRIPLET.so
+--- mgltools-dejavu.orig/DejaVu/__init__.py
++++ mgltools-dejavu/DejaVu/__init__.py
+@@ -101,7 +101,7 @@
+     #    toglVersion = master.tk.call('package', 'require', 'Togl','1.7')  
+     #else:
+     #    toglVersion = master.tk.call('package', 'require', 'Togl','2.1')
+-    toglVersion = master.tk.call('package', 'require', 'Togl','2.1')
++    toglVersion = master.tk.call('package', 'require', 'Togl')
+ 
+     return toglVersion
+ 

debian/rules

@@ -9,8 +9,10 @@ BRANCH=`cat debian/get-orig-source/current-branch`
 RCVERSION=`cat debian/get-orig-source/rc-version`
 SRC=DejaVuDIST
 
+export PYBUILD_DISABLE=test
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean