From 702e07c861723d4ef703d045c9fb5f5bddd7c3ce Mon Sep 17 00:00:00 2001 From: Tobi Sim Date: Thu, 12 Mar 2015 19:14:26 +0100 Subject: [PATCH] changed arch armv7l->armv7hl,x86->i686 --- Makefile | 18 ++++++++++-------- .../PIL/BdfFontFile.py | 0 .../PIL/BmpImagePlugin.py | 0 .../PIL/BufrStubImagePlugin.py | 0 .../PIL/ContainerIO.py | 0 .../PIL/CurImagePlugin.py | 0 .../PIL/DcxImagePlugin.py | 0 .../PIL/EpsImagePlugin.py | 0 .../PIL/ExifTags.py | 0 .../PIL/FitsStubImagePlugin.py | 0 .../PIL/FliImagePlugin.py | 0 .../PIL/FontFile.py | 0 .../PIL/FpxImagePlugin.py | 0 .../PIL/GbrImagePlugin.py | 0 .../PIL/GdImageFile.py | 0 .../PIL/GifImagePlugin.py | 0 .../PIL/GimpGradientFile.py | 0 .../PIL/GimpPaletteFile.py | 0 .../PIL/GribStubImagePlugin.py | 0 .../PIL/Hdf5StubImagePlugin.py | 0 .../PIL/IcnsImagePlugin.py | 0 .../PIL/IcoImagePlugin.py | 0 .../PIL/ImImagePlugin.py | 0 .../PIL/Image.py | 0 .../PIL/ImageChops.py | 0 .../PIL/ImageCms.py | 0 .../PIL/ImageColor.py | 0 .../PIL/ImageDraw.py | 0 .../PIL/ImageDraw2.py | 0 .../PIL/ImageEnhance.py | 0 .../PIL/ImageFile.py | 0 .../PIL/ImageFileIO.py | 0 .../PIL/ImageFilter.py | 0 .../PIL/ImageFont.py | 0 .../PIL/ImageGrab.py | 0 .../PIL/ImageMath.py | 0 .../PIL/ImageMode.py | 0 .../PIL/ImageMorph.py | 0 .../PIL/ImageOps.py | 0 .../PIL/ImagePalette.py | 0 .../PIL/ImagePath.py | 0 .../PIL/ImageQt.py | 0 .../PIL/ImageSequence.py | 0 .../PIL/ImageShow.py | 0 .../PIL/ImageStat.py | 0 .../PIL/ImageTk.py | 0 .../PIL/ImageTransform.py | 0 .../PIL/ImageWin.py | 0 .../PIL/ImtImagePlugin.py | 0 .../PIL/IptcImagePlugin.py | 0 .../PIL/Jpeg2KImagePlugin.py | 0 .../PIL/JpegImagePlugin.py | 0 .../PIL/JpegPresets.py | 0 .../PIL/McIdasImagePlugin.py | 0 .../PIL/MicImagePlugin.py | 0 .../PIL/MpegImagePlugin.py | 0 .../PIL/MpoImagePlugin.py | 0 .../PIL/MspImagePlugin.py | 0 .../PIL/OleFileIO-README.md | 0 .../PIL/OleFileIO.py | 0 .../PIL/PSDraw.py | 0 .../PIL/PaletteFile.py | 0 .../PIL/PalmImagePlugin.py | 0 .../PIL/PcdImagePlugin.py | 0 .../PIL/PcfFontFile.py | 0 .../PIL/PcxImagePlugin.py | 0 .../PIL/PdfImagePlugin.py | 0 .../PIL/PixarImagePlugin.py | 0 .../PIL/PngImagePlugin.py | 0 .../PIL/PpmImagePlugin.py | 0 .../PIL/PsdImagePlugin.py | 0 .../PIL/PyAccess.py | 0 .../PIL/SgiImagePlugin.py | 0 .../PIL/SpiderImagePlugin.py | 0 .../PIL/SunImagePlugin.py | 0 .../PIL/TarIO.py | 0 .../PIL/TgaImagePlugin.py | 0 .../PIL/TiffImagePlugin.py | 0 .../PIL/TiffTags.py | 0 .../PIL/WalImageFile.py | 0 .../PIL/WebPImagePlugin.py | 0 .../PIL/WmfImagePlugin.py | 0 .../PIL/XVThumbImagePlugin.py | 0 .../PIL/XbmImagePlugin.py | 0 .../PIL/XpmImagePlugin.py | 0 .../PIL/__init__.py | 0 .../PIL/_binary.py | 0 .../PIL/_imaging.cpython-34m.so | Bin .../PIL/_imagingmath.cpython-34m.so | Bin .../PIL/_imagingmorph.cpython-34m.so | Bin .../PIL/_util.py | 0 .../Pillow-2.7.0.data/scripts/pilconvert.py | 0 .../Pillow-2.7.0.data/scripts/pildriver.py | 0 .../Pillow-2.7.0.data/scripts/pilfile.py | 0 .../Pillow-2.7.0.data/scripts/pilfont.py | 0 .../Pillow-2.7.0.data/scripts/pilprint.py | 0 .../Pillow-2.7.0.dist-info/DESCRIPTION.rst | 0 .../Pillow-2.7.0.dist-info/METADATA | 0 .../Pillow-2.7.0.dist-info/RECORD | 0 .../Pillow-2.7.0.dist-info/WHEEL | 0 .../Pillow-2.7.0.dist-info/metadata.json | 0 .../Pillow-2.7.0.dist-info/top_level.txt | 0 .../Pillow-2.7.0.dist-info/zip-safe | 0 .../__init__.py | 0 .../PIL/BdfFontFile.py | 0 .../PIL/BmpImagePlugin.py | 0 .../PIL/BufrStubImagePlugin.py | 0 .../PIL/ContainerIO.py | 0 .../PIL/CurImagePlugin.py | 0 .../PIL/DcxImagePlugin.py | 0 .../PIL/EpsImagePlugin.py | 0 .../PIL/ExifTags.py | 0 .../PIL/FitsStubImagePlugin.py | 0 .../PIL/FliImagePlugin.py | 0 .../PIL/FontFile.py | 0 .../PIL/FpxImagePlugin.py | 0 .../PIL/GbrImagePlugin.py | 0 .../PIL/GdImageFile.py | 0 .../PIL/GifImagePlugin.py | 0 .../PIL/GimpGradientFile.py | 0 .../PIL/GimpPaletteFile.py | 0 .../PIL/GribStubImagePlugin.py | 0 .../PIL/Hdf5StubImagePlugin.py | 0 .../PIL/IcnsImagePlugin.py | 0 .../PIL/IcoImagePlugin.py | 0 .../PIL/ImImagePlugin.py | 0 .../PIL/Image.py | 0 .../PIL/ImageChops.py | 0 .../PIL/ImageCms.py | 0 .../PIL/ImageColor.py | 0 .../PIL/ImageDraw.py | 0 .../PIL/ImageDraw2.py | 0 .../PIL/ImageEnhance.py | 0 .../PIL/ImageFile.py | 0 .../PIL/ImageFileIO.py | 0 .../PIL/ImageFilter.py | 0 .../PIL/ImageFont.py | 0 .../PIL/ImageGrab.py | 0 .../PIL/ImageMath.py | 0 .../PIL/ImageMode.py | 0 .../PIL/ImageMorph.py | 0 .../PIL/ImageOps.py | 0 .../PIL/ImagePalette.py | 0 .../PIL/ImagePath.py | 0 .../PIL/ImageQt.py | 0 .../PIL/ImageSequence.py | 0 .../PIL/ImageShow.py | 0 .../PIL/ImageStat.py | 0 .../PIL/ImageTk.py | 0 .../PIL/ImageTransform.py | 0 .../PIL/ImageWin.py | 0 .../PIL/ImtImagePlugin.py | 0 .../PIL/IptcImagePlugin.py | 0 .../PIL/Jpeg2KImagePlugin.py | 0 .../PIL/JpegImagePlugin.py | 0 .../PIL/JpegPresets.py | 0 .../PIL/McIdasImagePlugin.py | 0 .../PIL/MicImagePlugin.py | 0 .../PIL/MpegImagePlugin.py | 0 .../PIL/MpoImagePlugin.py | 0 .../PIL/MspImagePlugin.py | 0 .../PIL/OleFileIO-README.md | 0 .../PIL/OleFileIO.py | 0 .../PIL/PSDraw.py | 0 .../PIL/PaletteFile.py | 0 .../PIL/PalmImagePlugin.py | 0 .../PIL/PcdImagePlugin.py | 0 .../PIL/PcfFontFile.py | 0 .../PIL/PcxImagePlugin.py | 0 .../PIL/PdfImagePlugin.py | 0 .../PIL/PixarImagePlugin.py | 0 .../PIL/PngImagePlugin.py | 0 .../PIL/PpmImagePlugin.py | 0 .../PIL/PsdImagePlugin.py | 0 .../PIL/PyAccess.py | 0 .../PIL/SgiImagePlugin.py | 0 .../PIL/SpiderImagePlugin.py | 0 .../PIL/SunImagePlugin.py | 0 .../PIL/TarIO.py | 0 .../PIL/TgaImagePlugin.py | 0 .../PIL/TiffImagePlugin.py | 0 .../PIL/TiffTags.py | 0 .../PIL/WalImageFile.py | 0 .../PIL/WebPImagePlugin.py | 0 .../PIL/WmfImagePlugin.py | 0 .../PIL/XVThumbImagePlugin.py | 0 .../PIL/XbmImagePlugin.py | 0 .../PIL/XpmImagePlugin.py | 0 .../PIL/__init__.py | 0 .../PIL/_binary.py | 0 .../PIL/_imaging.cpython-34m.so | Bin .../PIL/_imagingmath.cpython-34m.so | Bin .../PIL/_imagingmorph.cpython-34m.so | Bin .../PIL/_util.py | 0 .../Pillow-2.7.0.data/scripts/pilconvert.py | 0 .../Pillow-2.7.0.data/scripts/pildriver.py | 0 .../Pillow-2.7.0.data/scripts/pilfile.py | 0 .../Pillow-2.7.0.data/scripts/pilfont.py | 0 .../Pillow-2.7.0.data/scripts/pilprint.py | 0 .../Pillow-2.7.0.dist-info/DESCRIPTION.rst | 0 .../Pillow-2.7.0.dist-info/METADATA | 0 .../Pillow-2.7.0.dist-info/RECORD | 0 .../Pillow-2.7.0.dist-info/WHEEL | 0 .../Pillow-2.7.0.dist-info/metadata.json | 0 .../Pillow-2.7.0.dist-info/top_level.txt | 0 .../Pillow-2.7.0.dist-info/zip-safe | 0 qml/sailfish-python.qml | 4 ++-- 207 files changed, 12 insertions(+), 10 deletions(-) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/BdfFontFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/BmpImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/BufrStubImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ContainerIO.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/CurImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/DcxImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/EpsImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ExifTags.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/FitsStubImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/FliImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/FontFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/FpxImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/GbrImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/GdImageFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/GifImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/GimpGradientFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/GimpPaletteFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/GribStubImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/Hdf5StubImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/IcnsImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/IcoImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/Image.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageChops.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageCms.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageColor.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageDraw.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageDraw2.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageEnhance.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageFileIO.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageFilter.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageFont.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageGrab.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageMath.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageMode.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageMorph.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageOps.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImagePalette.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImagePath.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageQt.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageSequence.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageShow.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageStat.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageTk.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageTransform.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImageWin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/ImtImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/IptcImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/Jpeg2KImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/JpegImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/JpegPresets.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/McIdasImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/MicImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/MpegImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/MpoImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/MspImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/OleFileIO-README.md (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/OleFileIO.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PSDraw.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PaletteFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PalmImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PcdImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PcfFontFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PcxImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PdfImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PixarImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PngImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PpmImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PsdImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/PyAccess.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/SgiImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/SpiderImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/SunImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/TarIO.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/TgaImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/TiffImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/TiffTags.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/WalImageFile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/WebPImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/WmfImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/XVThumbImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/XbmImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/XpmImagePlugin.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/__init__.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/_binary.py (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/PIL/_imaging.cpython-34m.so (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/PIL/_imagingmath.cpython-34m.so (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/PIL/_imagingmorph.cpython-34m.so (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/PIL/_util.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.data/scripts/pilconvert.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.data/scripts/pildriver.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.data/scripts/pilfile.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.data/scripts/pilfont.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.data/scripts/pilprint.py (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.dist-info/DESCRIPTION.rst (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.dist-info/METADATA (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/Pillow-2.7.0.dist-info/RECORD (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/Pillow-2.7.0.dist-info/WHEEL (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/Pillow-2.7.0.dist-info/metadata.json (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.dist-info/top_level.txt (100%) rename pyPackages/{pillowx86 => pillow-armv7hl}/Pillow-2.7.0.dist-info/zip-safe (100%) rename pyPackages/{pillowarmv7l => pillow-armv7hl}/__init__.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/BdfFontFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/BmpImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/BufrStubImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ContainerIO.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/CurImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/DcxImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/EpsImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ExifTags.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/FitsStubImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/FliImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/FontFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/FpxImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/GbrImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/GdImageFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/GifImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/GimpGradientFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/GimpPaletteFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/GribStubImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/Hdf5StubImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/IcnsImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/IcoImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/Image.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageChops.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageCms.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageColor.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageDraw.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageDraw2.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageEnhance.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageFileIO.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageFilter.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageFont.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageGrab.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageMath.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageMode.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageMorph.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageOps.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImagePalette.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImagePath.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageQt.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageSequence.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageShow.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageStat.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageTk.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageTransform.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImageWin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/ImtImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/IptcImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/Jpeg2KImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/JpegImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/JpegPresets.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/McIdasImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/MicImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/MpegImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/MpoImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/MspImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/OleFileIO-README.md (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/OleFileIO.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PSDraw.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PaletteFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PalmImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PcdImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PcfFontFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PcxImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PdfImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PixarImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PngImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PpmImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PsdImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/PyAccess.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/SgiImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/SpiderImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/SunImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/TarIO.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/TgaImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/TiffImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/TiffTags.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/WalImageFile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/WebPImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/WmfImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/XVThumbImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/XbmImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/XpmImagePlugin.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/__init__.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/_binary.py (100%) rename pyPackages/{pillowx86 => pillow-i686}/PIL/_imaging.cpython-34m.so (100%) rename pyPackages/{pillowx86 => pillow-i686}/PIL/_imagingmath.cpython-34m.so (100%) rename pyPackages/{pillowx86 => pillow-i686}/PIL/_imagingmorph.cpython-34m.so (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/PIL/_util.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.data/scripts/pilconvert.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.data/scripts/pildriver.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.data/scripts/pilfile.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.data/scripts/pilfont.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.data/scripts/pilprint.py (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.dist-info/DESCRIPTION.rst (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.dist-info/METADATA (100%) rename pyPackages/{pillowx86 => pillow-i686}/Pillow-2.7.0.dist-info/RECORD (100%) rename pyPackages/{pillowx86 => pillow-i686}/Pillow-2.7.0.dist-info/WHEEL (100%) rename pyPackages/{pillowx86 => pillow-i686}/Pillow-2.7.0.dist-info/metadata.json (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.dist-info/top_level.txt (100%) rename pyPackages/{pillowarmv7l => pillow-i686}/Pillow-2.7.0.dist-info/zip-safe (100%) diff --git a/Makefile b/Makefile index de5a1a5..0a59486 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,13 @@ Appname:=$(shell cat appname.txt) prefix:=/usr temp:=/tmp/fpm-jolla -builddir:=./build sdkpath:=$(HOME)/SailfishOS dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;) arch:=armv7hl -rpmname:=$(Appname)-$(arch).rpm +version:=0.0.1 +rpmname:=$(Appname)-$(version).$(arch).rpm jolla_usb_ip:=192.168.2.15 jolla_wifi_ip:=Jolla -jolla_ip:=$(jolla_usb_ip) all: clean build-tmp rpm-virt rpm-jolla @@ -16,6 +15,7 @@ all: clean build-tmp rpm-virt rpm-jolla make-jolla-usb: build-tmp rpm-jolla send-jolla make-jolla-wifi: build-tmp rpm-jolla send-jolla-wifi make-jolla-ap: build-tmp rpm-jolla send-jolla-ap +make-virt: arch:=i686 make-virt: build-tmp rpm-virt send-virt build-tmp: @@ -29,14 +29,15 @@ build-tmp: cp ./dat/$(Appname).desktop $(temp)/usr/share/applications/ install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname) -rpm-virt: - cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * +rpm-virt: arch:=i686 +rpm-virt: build-tmp + cd $(temp);fpm -f -s dir -t rpm -v $(version) $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * -rpm-jolla: - cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * +rpm-jolla: build-tmp + cd $(temp);fpm -f -s dir -t rpm -v $(version) $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * send-virt: - cat $(temp)/$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) + cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root' -p2223 root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) send-jolla-wifi: cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) @@ -48,6 +49,7 @@ send-jolla-ap: send-jolla: cat $(temp)/$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) + clean: rm -rf $(temp) rm -rf $(builddir) diff --git a/pyPackages/pillowx86/PIL/BdfFontFile.py b/pyPackages/pillow-armv7hl/PIL/BdfFontFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/BdfFontFile.py rename to pyPackages/pillow-armv7hl/PIL/BdfFontFile.py diff --git a/pyPackages/pillowx86/PIL/BmpImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/BmpImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/BmpImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/BmpImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/BufrStubImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/BufrStubImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/BufrStubImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/BufrStubImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/ContainerIO.py b/pyPackages/pillow-armv7hl/PIL/ContainerIO.py similarity index 100% rename from pyPackages/pillowx86/PIL/ContainerIO.py rename to pyPackages/pillow-armv7hl/PIL/ContainerIO.py diff --git a/pyPackages/pillowx86/PIL/CurImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/CurImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/CurImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/CurImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/DcxImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/DcxImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/DcxImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/DcxImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/EpsImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/EpsImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/EpsImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/EpsImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/ExifTags.py b/pyPackages/pillow-armv7hl/PIL/ExifTags.py similarity index 100% rename from pyPackages/pillowx86/PIL/ExifTags.py rename to pyPackages/pillow-armv7hl/PIL/ExifTags.py diff --git a/pyPackages/pillowx86/PIL/FitsStubImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/FitsStubImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/FitsStubImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/FitsStubImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/FliImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/FliImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/FliImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/FliImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/FontFile.py b/pyPackages/pillow-armv7hl/PIL/FontFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/FontFile.py rename to pyPackages/pillow-armv7hl/PIL/FontFile.py diff --git a/pyPackages/pillowx86/PIL/FpxImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/FpxImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/FpxImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/FpxImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/GbrImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/GbrImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/GbrImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/GbrImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/GdImageFile.py b/pyPackages/pillow-armv7hl/PIL/GdImageFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/GdImageFile.py rename to pyPackages/pillow-armv7hl/PIL/GdImageFile.py diff --git a/pyPackages/pillowx86/PIL/GifImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/GifImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/GifImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/GifImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/GimpGradientFile.py b/pyPackages/pillow-armv7hl/PIL/GimpGradientFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/GimpGradientFile.py rename to pyPackages/pillow-armv7hl/PIL/GimpGradientFile.py diff --git a/pyPackages/pillowx86/PIL/GimpPaletteFile.py b/pyPackages/pillow-armv7hl/PIL/GimpPaletteFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/GimpPaletteFile.py rename to pyPackages/pillow-armv7hl/PIL/GimpPaletteFile.py diff --git a/pyPackages/pillowx86/PIL/GribStubImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/GribStubImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/GribStubImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/GribStubImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/Hdf5StubImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/Hdf5StubImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/Hdf5StubImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/Hdf5StubImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/IcnsImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/IcnsImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/IcnsImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/IcnsImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/IcoImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/IcoImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/IcoImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/IcoImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/ImImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/ImImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/ImImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/Image.py b/pyPackages/pillow-armv7hl/PIL/Image.py similarity index 100% rename from pyPackages/pillowx86/PIL/Image.py rename to pyPackages/pillow-armv7hl/PIL/Image.py diff --git a/pyPackages/pillowx86/PIL/ImageChops.py b/pyPackages/pillow-armv7hl/PIL/ImageChops.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageChops.py rename to pyPackages/pillow-armv7hl/PIL/ImageChops.py diff --git a/pyPackages/pillowx86/PIL/ImageCms.py b/pyPackages/pillow-armv7hl/PIL/ImageCms.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageCms.py rename to pyPackages/pillow-armv7hl/PIL/ImageCms.py diff --git a/pyPackages/pillowx86/PIL/ImageColor.py b/pyPackages/pillow-armv7hl/PIL/ImageColor.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageColor.py rename to pyPackages/pillow-armv7hl/PIL/ImageColor.py diff --git a/pyPackages/pillowx86/PIL/ImageDraw.py b/pyPackages/pillow-armv7hl/PIL/ImageDraw.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageDraw.py rename to pyPackages/pillow-armv7hl/PIL/ImageDraw.py diff --git a/pyPackages/pillowx86/PIL/ImageDraw2.py b/pyPackages/pillow-armv7hl/PIL/ImageDraw2.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageDraw2.py rename to pyPackages/pillow-armv7hl/PIL/ImageDraw2.py diff --git a/pyPackages/pillowx86/PIL/ImageEnhance.py b/pyPackages/pillow-armv7hl/PIL/ImageEnhance.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageEnhance.py rename to pyPackages/pillow-armv7hl/PIL/ImageEnhance.py diff --git a/pyPackages/pillowx86/PIL/ImageFile.py b/pyPackages/pillow-armv7hl/PIL/ImageFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageFile.py rename to pyPackages/pillow-armv7hl/PIL/ImageFile.py diff --git a/pyPackages/pillowx86/PIL/ImageFileIO.py b/pyPackages/pillow-armv7hl/PIL/ImageFileIO.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageFileIO.py rename to pyPackages/pillow-armv7hl/PIL/ImageFileIO.py diff --git a/pyPackages/pillowx86/PIL/ImageFilter.py b/pyPackages/pillow-armv7hl/PIL/ImageFilter.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageFilter.py rename to pyPackages/pillow-armv7hl/PIL/ImageFilter.py diff --git a/pyPackages/pillowx86/PIL/ImageFont.py b/pyPackages/pillow-armv7hl/PIL/ImageFont.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageFont.py rename to pyPackages/pillow-armv7hl/PIL/ImageFont.py diff --git a/pyPackages/pillowx86/PIL/ImageGrab.py b/pyPackages/pillow-armv7hl/PIL/ImageGrab.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageGrab.py rename to pyPackages/pillow-armv7hl/PIL/ImageGrab.py diff --git a/pyPackages/pillowx86/PIL/ImageMath.py b/pyPackages/pillow-armv7hl/PIL/ImageMath.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageMath.py rename to pyPackages/pillow-armv7hl/PIL/ImageMath.py diff --git a/pyPackages/pillowx86/PIL/ImageMode.py b/pyPackages/pillow-armv7hl/PIL/ImageMode.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageMode.py rename to pyPackages/pillow-armv7hl/PIL/ImageMode.py diff --git a/pyPackages/pillowx86/PIL/ImageMorph.py b/pyPackages/pillow-armv7hl/PIL/ImageMorph.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageMorph.py rename to pyPackages/pillow-armv7hl/PIL/ImageMorph.py diff --git a/pyPackages/pillowx86/PIL/ImageOps.py b/pyPackages/pillow-armv7hl/PIL/ImageOps.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageOps.py rename to pyPackages/pillow-armv7hl/PIL/ImageOps.py diff --git a/pyPackages/pillowx86/PIL/ImagePalette.py b/pyPackages/pillow-armv7hl/PIL/ImagePalette.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImagePalette.py rename to pyPackages/pillow-armv7hl/PIL/ImagePalette.py diff --git a/pyPackages/pillowx86/PIL/ImagePath.py b/pyPackages/pillow-armv7hl/PIL/ImagePath.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImagePath.py rename to pyPackages/pillow-armv7hl/PIL/ImagePath.py diff --git a/pyPackages/pillowx86/PIL/ImageQt.py b/pyPackages/pillow-armv7hl/PIL/ImageQt.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageQt.py rename to pyPackages/pillow-armv7hl/PIL/ImageQt.py diff --git a/pyPackages/pillowx86/PIL/ImageSequence.py b/pyPackages/pillow-armv7hl/PIL/ImageSequence.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageSequence.py rename to pyPackages/pillow-armv7hl/PIL/ImageSequence.py diff --git a/pyPackages/pillowx86/PIL/ImageShow.py b/pyPackages/pillow-armv7hl/PIL/ImageShow.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageShow.py rename to pyPackages/pillow-armv7hl/PIL/ImageShow.py diff --git a/pyPackages/pillowx86/PIL/ImageStat.py b/pyPackages/pillow-armv7hl/PIL/ImageStat.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageStat.py rename to pyPackages/pillow-armv7hl/PIL/ImageStat.py diff --git a/pyPackages/pillowx86/PIL/ImageTk.py b/pyPackages/pillow-armv7hl/PIL/ImageTk.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageTk.py rename to pyPackages/pillow-armv7hl/PIL/ImageTk.py diff --git a/pyPackages/pillowx86/PIL/ImageTransform.py b/pyPackages/pillow-armv7hl/PIL/ImageTransform.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageTransform.py rename to pyPackages/pillow-armv7hl/PIL/ImageTransform.py diff --git a/pyPackages/pillowx86/PIL/ImageWin.py b/pyPackages/pillow-armv7hl/PIL/ImageWin.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImageWin.py rename to pyPackages/pillow-armv7hl/PIL/ImageWin.py diff --git a/pyPackages/pillowx86/PIL/ImtImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/ImtImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/ImtImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/ImtImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/IptcImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/IptcImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/IptcImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/IptcImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/Jpeg2KImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/Jpeg2KImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/Jpeg2KImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/Jpeg2KImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/JpegImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/JpegImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/JpegImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/JpegImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/JpegPresets.py b/pyPackages/pillow-armv7hl/PIL/JpegPresets.py similarity index 100% rename from pyPackages/pillowx86/PIL/JpegPresets.py rename to pyPackages/pillow-armv7hl/PIL/JpegPresets.py diff --git a/pyPackages/pillowx86/PIL/McIdasImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/McIdasImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/McIdasImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/McIdasImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/MicImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/MicImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/MicImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/MicImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/MpegImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/MpegImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/MpegImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/MpegImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/MpoImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/MpoImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/MpoImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/MpoImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/MspImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/MspImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/MspImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/MspImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/OleFileIO-README.md b/pyPackages/pillow-armv7hl/PIL/OleFileIO-README.md similarity index 100% rename from pyPackages/pillowx86/PIL/OleFileIO-README.md rename to pyPackages/pillow-armv7hl/PIL/OleFileIO-README.md diff --git a/pyPackages/pillowx86/PIL/OleFileIO.py b/pyPackages/pillow-armv7hl/PIL/OleFileIO.py similarity index 100% rename from pyPackages/pillowx86/PIL/OleFileIO.py rename to pyPackages/pillow-armv7hl/PIL/OleFileIO.py diff --git a/pyPackages/pillowx86/PIL/PSDraw.py b/pyPackages/pillow-armv7hl/PIL/PSDraw.py similarity index 100% rename from pyPackages/pillowx86/PIL/PSDraw.py rename to pyPackages/pillow-armv7hl/PIL/PSDraw.py diff --git a/pyPackages/pillowx86/PIL/PaletteFile.py b/pyPackages/pillow-armv7hl/PIL/PaletteFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/PaletteFile.py rename to pyPackages/pillow-armv7hl/PIL/PaletteFile.py diff --git a/pyPackages/pillowx86/PIL/PalmImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PalmImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PalmImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PalmImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PcdImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PcdImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PcdImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PcdImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PcfFontFile.py b/pyPackages/pillow-armv7hl/PIL/PcfFontFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/PcfFontFile.py rename to pyPackages/pillow-armv7hl/PIL/PcfFontFile.py diff --git a/pyPackages/pillowx86/PIL/PcxImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PcxImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PcxImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PcxImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PdfImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PdfImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PdfImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PdfImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PixarImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PixarImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PixarImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PixarImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PngImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PngImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PngImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PngImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PpmImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PpmImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PpmImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PpmImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PsdImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/PsdImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/PsdImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/PsdImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/PyAccess.py b/pyPackages/pillow-armv7hl/PIL/PyAccess.py similarity index 100% rename from pyPackages/pillowx86/PIL/PyAccess.py rename to pyPackages/pillow-armv7hl/PIL/PyAccess.py diff --git a/pyPackages/pillowx86/PIL/SgiImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/SgiImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/SgiImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/SgiImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/SpiderImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/SpiderImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/SpiderImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/SpiderImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/SunImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/SunImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/SunImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/SunImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/TarIO.py b/pyPackages/pillow-armv7hl/PIL/TarIO.py similarity index 100% rename from pyPackages/pillowx86/PIL/TarIO.py rename to pyPackages/pillow-armv7hl/PIL/TarIO.py diff --git a/pyPackages/pillowx86/PIL/TgaImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/TgaImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/TgaImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/TgaImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/TiffImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/TiffImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/TiffImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/TiffImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/TiffTags.py b/pyPackages/pillow-armv7hl/PIL/TiffTags.py similarity index 100% rename from pyPackages/pillowx86/PIL/TiffTags.py rename to pyPackages/pillow-armv7hl/PIL/TiffTags.py diff --git a/pyPackages/pillowx86/PIL/WalImageFile.py b/pyPackages/pillow-armv7hl/PIL/WalImageFile.py similarity index 100% rename from pyPackages/pillowx86/PIL/WalImageFile.py rename to pyPackages/pillow-armv7hl/PIL/WalImageFile.py diff --git a/pyPackages/pillowx86/PIL/WebPImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/WebPImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/WebPImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/WebPImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/WmfImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/WmfImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/WmfImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/WmfImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/XVThumbImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/XVThumbImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/XVThumbImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/XVThumbImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/XbmImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/XbmImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/XbmImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/XbmImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/XpmImagePlugin.py b/pyPackages/pillow-armv7hl/PIL/XpmImagePlugin.py similarity index 100% rename from pyPackages/pillowx86/PIL/XpmImagePlugin.py rename to pyPackages/pillow-armv7hl/PIL/XpmImagePlugin.py diff --git a/pyPackages/pillowx86/PIL/__init__.py b/pyPackages/pillow-armv7hl/PIL/__init__.py similarity index 100% rename from pyPackages/pillowx86/PIL/__init__.py rename to pyPackages/pillow-armv7hl/PIL/__init__.py diff --git a/pyPackages/pillowx86/PIL/_binary.py b/pyPackages/pillow-armv7hl/PIL/_binary.py similarity index 100% rename from pyPackages/pillowx86/PIL/_binary.py rename to pyPackages/pillow-armv7hl/PIL/_binary.py diff --git a/pyPackages/pillowarmv7l/PIL/_imaging.cpython-34m.so b/pyPackages/pillow-armv7hl/PIL/_imaging.cpython-34m.so similarity index 100% rename from pyPackages/pillowarmv7l/PIL/_imaging.cpython-34m.so rename to pyPackages/pillow-armv7hl/PIL/_imaging.cpython-34m.so diff --git a/pyPackages/pillowarmv7l/PIL/_imagingmath.cpython-34m.so b/pyPackages/pillow-armv7hl/PIL/_imagingmath.cpython-34m.so similarity index 100% rename from pyPackages/pillowarmv7l/PIL/_imagingmath.cpython-34m.so rename to pyPackages/pillow-armv7hl/PIL/_imagingmath.cpython-34m.so diff --git a/pyPackages/pillowarmv7l/PIL/_imagingmorph.cpython-34m.so b/pyPackages/pillow-armv7hl/PIL/_imagingmorph.cpython-34m.so similarity index 100% rename from pyPackages/pillowarmv7l/PIL/_imagingmorph.cpython-34m.so rename to pyPackages/pillow-armv7hl/PIL/_imagingmorph.cpython-34m.so diff --git a/pyPackages/pillowx86/PIL/_util.py b/pyPackages/pillow-armv7hl/PIL/_util.py similarity index 100% rename from pyPackages/pillowx86/PIL/_util.py rename to pyPackages/pillow-armv7hl/PIL/_util.py diff --git a/pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilconvert.py b/pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilconvert.py similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilconvert.py rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilconvert.py diff --git a/pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pildriver.py b/pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pildriver.py similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pildriver.py rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pildriver.py diff --git a/pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilfile.py b/pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilfile.py similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilfile.py rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilfile.py diff --git a/pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilfont.py b/pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilfont.py similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilfont.py rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilfont.py diff --git a/pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilprint.py b/pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilprint.py similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.data/scripts/pilprint.py rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.data/scripts/pilprint.py diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/DESCRIPTION.rst b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/DESCRIPTION.rst similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/DESCRIPTION.rst rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/DESCRIPTION.rst diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/METADATA b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/METADATA similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/METADATA rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/METADATA diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/RECORD b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/RECORD similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/RECORD rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/RECORD diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/WHEEL b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/WHEEL similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/WHEEL rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/WHEEL diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/metadata.json b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/metadata.json similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/metadata.json rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/metadata.json diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/top_level.txt b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/top_level.txt similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/top_level.txt rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/top_level.txt diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/zip-safe b/pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/zip-safe similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/zip-safe rename to pyPackages/pillow-armv7hl/Pillow-2.7.0.dist-info/zip-safe diff --git a/pyPackages/pillowarmv7l/__init__.py b/pyPackages/pillow-armv7hl/__init__.py similarity index 100% rename from pyPackages/pillowarmv7l/__init__.py rename to pyPackages/pillow-armv7hl/__init__.py diff --git a/pyPackages/pillowarmv7l/PIL/BdfFontFile.py b/pyPackages/pillow-i686/PIL/BdfFontFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/BdfFontFile.py rename to pyPackages/pillow-i686/PIL/BdfFontFile.py diff --git a/pyPackages/pillowarmv7l/PIL/BmpImagePlugin.py b/pyPackages/pillow-i686/PIL/BmpImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/BmpImagePlugin.py rename to pyPackages/pillow-i686/PIL/BmpImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/BufrStubImagePlugin.py b/pyPackages/pillow-i686/PIL/BufrStubImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/BufrStubImagePlugin.py rename to pyPackages/pillow-i686/PIL/BufrStubImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/ContainerIO.py b/pyPackages/pillow-i686/PIL/ContainerIO.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ContainerIO.py rename to pyPackages/pillow-i686/PIL/ContainerIO.py diff --git a/pyPackages/pillowarmv7l/PIL/CurImagePlugin.py b/pyPackages/pillow-i686/PIL/CurImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/CurImagePlugin.py rename to pyPackages/pillow-i686/PIL/CurImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/DcxImagePlugin.py b/pyPackages/pillow-i686/PIL/DcxImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/DcxImagePlugin.py rename to pyPackages/pillow-i686/PIL/DcxImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/EpsImagePlugin.py b/pyPackages/pillow-i686/PIL/EpsImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/EpsImagePlugin.py rename to pyPackages/pillow-i686/PIL/EpsImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/ExifTags.py b/pyPackages/pillow-i686/PIL/ExifTags.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ExifTags.py rename to pyPackages/pillow-i686/PIL/ExifTags.py diff --git a/pyPackages/pillowarmv7l/PIL/FitsStubImagePlugin.py b/pyPackages/pillow-i686/PIL/FitsStubImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/FitsStubImagePlugin.py rename to pyPackages/pillow-i686/PIL/FitsStubImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/FliImagePlugin.py b/pyPackages/pillow-i686/PIL/FliImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/FliImagePlugin.py rename to pyPackages/pillow-i686/PIL/FliImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/FontFile.py b/pyPackages/pillow-i686/PIL/FontFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/FontFile.py rename to pyPackages/pillow-i686/PIL/FontFile.py diff --git a/pyPackages/pillowarmv7l/PIL/FpxImagePlugin.py b/pyPackages/pillow-i686/PIL/FpxImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/FpxImagePlugin.py rename to pyPackages/pillow-i686/PIL/FpxImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/GbrImagePlugin.py b/pyPackages/pillow-i686/PIL/GbrImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/GbrImagePlugin.py rename to pyPackages/pillow-i686/PIL/GbrImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/GdImageFile.py b/pyPackages/pillow-i686/PIL/GdImageFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/GdImageFile.py rename to pyPackages/pillow-i686/PIL/GdImageFile.py diff --git a/pyPackages/pillowarmv7l/PIL/GifImagePlugin.py b/pyPackages/pillow-i686/PIL/GifImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/GifImagePlugin.py rename to pyPackages/pillow-i686/PIL/GifImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/GimpGradientFile.py b/pyPackages/pillow-i686/PIL/GimpGradientFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/GimpGradientFile.py rename to pyPackages/pillow-i686/PIL/GimpGradientFile.py diff --git a/pyPackages/pillowarmv7l/PIL/GimpPaletteFile.py b/pyPackages/pillow-i686/PIL/GimpPaletteFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/GimpPaletteFile.py rename to pyPackages/pillow-i686/PIL/GimpPaletteFile.py diff --git a/pyPackages/pillowarmv7l/PIL/GribStubImagePlugin.py b/pyPackages/pillow-i686/PIL/GribStubImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/GribStubImagePlugin.py rename to pyPackages/pillow-i686/PIL/GribStubImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/Hdf5StubImagePlugin.py b/pyPackages/pillow-i686/PIL/Hdf5StubImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/Hdf5StubImagePlugin.py rename to pyPackages/pillow-i686/PIL/Hdf5StubImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/IcnsImagePlugin.py b/pyPackages/pillow-i686/PIL/IcnsImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/IcnsImagePlugin.py rename to pyPackages/pillow-i686/PIL/IcnsImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/IcoImagePlugin.py b/pyPackages/pillow-i686/PIL/IcoImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/IcoImagePlugin.py rename to pyPackages/pillow-i686/PIL/IcoImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/ImImagePlugin.py b/pyPackages/pillow-i686/PIL/ImImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImImagePlugin.py rename to pyPackages/pillow-i686/PIL/ImImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/Image.py b/pyPackages/pillow-i686/PIL/Image.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/Image.py rename to pyPackages/pillow-i686/PIL/Image.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageChops.py b/pyPackages/pillow-i686/PIL/ImageChops.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageChops.py rename to pyPackages/pillow-i686/PIL/ImageChops.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageCms.py b/pyPackages/pillow-i686/PIL/ImageCms.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageCms.py rename to pyPackages/pillow-i686/PIL/ImageCms.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageColor.py b/pyPackages/pillow-i686/PIL/ImageColor.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageColor.py rename to pyPackages/pillow-i686/PIL/ImageColor.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageDraw.py b/pyPackages/pillow-i686/PIL/ImageDraw.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageDraw.py rename to pyPackages/pillow-i686/PIL/ImageDraw.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageDraw2.py b/pyPackages/pillow-i686/PIL/ImageDraw2.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageDraw2.py rename to pyPackages/pillow-i686/PIL/ImageDraw2.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageEnhance.py b/pyPackages/pillow-i686/PIL/ImageEnhance.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageEnhance.py rename to pyPackages/pillow-i686/PIL/ImageEnhance.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageFile.py b/pyPackages/pillow-i686/PIL/ImageFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageFile.py rename to pyPackages/pillow-i686/PIL/ImageFile.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageFileIO.py b/pyPackages/pillow-i686/PIL/ImageFileIO.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageFileIO.py rename to pyPackages/pillow-i686/PIL/ImageFileIO.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageFilter.py b/pyPackages/pillow-i686/PIL/ImageFilter.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageFilter.py rename to pyPackages/pillow-i686/PIL/ImageFilter.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageFont.py b/pyPackages/pillow-i686/PIL/ImageFont.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageFont.py rename to pyPackages/pillow-i686/PIL/ImageFont.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageGrab.py b/pyPackages/pillow-i686/PIL/ImageGrab.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageGrab.py rename to pyPackages/pillow-i686/PIL/ImageGrab.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageMath.py b/pyPackages/pillow-i686/PIL/ImageMath.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageMath.py rename to pyPackages/pillow-i686/PIL/ImageMath.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageMode.py b/pyPackages/pillow-i686/PIL/ImageMode.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageMode.py rename to pyPackages/pillow-i686/PIL/ImageMode.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageMorph.py b/pyPackages/pillow-i686/PIL/ImageMorph.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageMorph.py rename to pyPackages/pillow-i686/PIL/ImageMorph.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageOps.py b/pyPackages/pillow-i686/PIL/ImageOps.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageOps.py rename to pyPackages/pillow-i686/PIL/ImageOps.py diff --git a/pyPackages/pillowarmv7l/PIL/ImagePalette.py b/pyPackages/pillow-i686/PIL/ImagePalette.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImagePalette.py rename to pyPackages/pillow-i686/PIL/ImagePalette.py diff --git a/pyPackages/pillowarmv7l/PIL/ImagePath.py b/pyPackages/pillow-i686/PIL/ImagePath.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImagePath.py rename to pyPackages/pillow-i686/PIL/ImagePath.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageQt.py b/pyPackages/pillow-i686/PIL/ImageQt.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageQt.py rename to pyPackages/pillow-i686/PIL/ImageQt.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageSequence.py b/pyPackages/pillow-i686/PIL/ImageSequence.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageSequence.py rename to pyPackages/pillow-i686/PIL/ImageSequence.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageShow.py b/pyPackages/pillow-i686/PIL/ImageShow.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageShow.py rename to pyPackages/pillow-i686/PIL/ImageShow.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageStat.py b/pyPackages/pillow-i686/PIL/ImageStat.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageStat.py rename to pyPackages/pillow-i686/PIL/ImageStat.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageTk.py b/pyPackages/pillow-i686/PIL/ImageTk.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageTk.py rename to pyPackages/pillow-i686/PIL/ImageTk.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageTransform.py b/pyPackages/pillow-i686/PIL/ImageTransform.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageTransform.py rename to pyPackages/pillow-i686/PIL/ImageTransform.py diff --git a/pyPackages/pillowarmv7l/PIL/ImageWin.py b/pyPackages/pillow-i686/PIL/ImageWin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImageWin.py rename to pyPackages/pillow-i686/PIL/ImageWin.py diff --git a/pyPackages/pillowarmv7l/PIL/ImtImagePlugin.py b/pyPackages/pillow-i686/PIL/ImtImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/ImtImagePlugin.py rename to pyPackages/pillow-i686/PIL/ImtImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/IptcImagePlugin.py b/pyPackages/pillow-i686/PIL/IptcImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/IptcImagePlugin.py rename to pyPackages/pillow-i686/PIL/IptcImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/Jpeg2KImagePlugin.py b/pyPackages/pillow-i686/PIL/Jpeg2KImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/Jpeg2KImagePlugin.py rename to pyPackages/pillow-i686/PIL/Jpeg2KImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/JpegImagePlugin.py b/pyPackages/pillow-i686/PIL/JpegImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/JpegImagePlugin.py rename to pyPackages/pillow-i686/PIL/JpegImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/JpegPresets.py b/pyPackages/pillow-i686/PIL/JpegPresets.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/JpegPresets.py rename to pyPackages/pillow-i686/PIL/JpegPresets.py diff --git a/pyPackages/pillowarmv7l/PIL/McIdasImagePlugin.py b/pyPackages/pillow-i686/PIL/McIdasImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/McIdasImagePlugin.py rename to pyPackages/pillow-i686/PIL/McIdasImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/MicImagePlugin.py b/pyPackages/pillow-i686/PIL/MicImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/MicImagePlugin.py rename to pyPackages/pillow-i686/PIL/MicImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/MpegImagePlugin.py b/pyPackages/pillow-i686/PIL/MpegImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/MpegImagePlugin.py rename to pyPackages/pillow-i686/PIL/MpegImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/MpoImagePlugin.py b/pyPackages/pillow-i686/PIL/MpoImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/MpoImagePlugin.py rename to pyPackages/pillow-i686/PIL/MpoImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/MspImagePlugin.py b/pyPackages/pillow-i686/PIL/MspImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/MspImagePlugin.py rename to pyPackages/pillow-i686/PIL/MspImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/OleFileIO-README.md b/pyPackages/pillow-i686/PIL/OleFileIO-README.md similarity index 100% rename from pyPackages/pillowarmv7l/PIL/OleFileIO-README.md rename to pyPackages/pillow-i686/PIL/OleFileIO-README.md diff --git a/pyPackages/pillowarmv7l/PIL/OleFileIO.py b/pyPackages/pillow-i686/PIL/OleFileIO.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/OleFileIO.py rename to pyPackages/pillow-i686/PIL/OleFileIO.py diff --git a/pyPackages/pillowarmv7l/PIL/PSDraw.py b/pyPackages/pillow-i686/PIL/PSDraw.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PSDraw.py rename to pyPackages/pillow-i686/PIL/PSDraw.py diff --git a/pyPackages/pillowarmv7l/PIL/PaletteFile.py b/pyPackages/pillow-i686/PIL/PaletteFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PaletteFile.py rename to pyPackages/pillow-i686/PIL/PaletteFile.py diff --git a/pyPackages/pillowarmv7l/PIL/PalmImagePlugin.py b/pyPackages/pillow-i686/PIL/PalmImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PalmImagePlugin.py rename to pyPackages/pillow-i686/PIL/PalmImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PcdImagePlugin.py b/pyPackages/pillow-i686/PIL/PcdImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PcdImagePlugin.py rename to pyPackages/pillow-i686/PIL/PcdImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PcfFontFile.py b/pyPackages/pillow-i686/PIL/PcfFontFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PcfFontFile.py rename to pyPackages/pillow-i686/PIL/PcfFontFile.py diff --git a/pyPackages/pillowarmv7l/PIL/PcxImagePlugin.py b/pyPackages/pillow-i686/PIL/PcxImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PcxImagePlugin.py rename to pyPackages/pillow-i686/PIL/PcxImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PdfImagePlugin.py b/pyPackages/pillow-i686/PIL/PdfImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PdfImagePlugin.py rename to pyPackages/pillow-i686/PIL/PdfImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PixarImagePlugin.py b/pyPackages/pillow-i686/PIL/PixarImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PixarImagePlugin.py rename to pyPackages/pillow-i686/PIL/PixarImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PngImagePlugin.py b/pyPackages/pillow-i686/PIL/PngImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PngImagePlugin.py rename to pyPackages/pillow-i686/PIL/PngImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PpmImagePlugin.py b/pyPackages/pillow-i686/PIL/PpmImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PpmImagePlugin.py rename to pyPackages/pillow-i686/PIL/PpmImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PsdImagePlugin.py b/pyPackages/pillow-i686/PIL/PsdImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PsdImagePlugin.py rename to pyPackages/pillow-i686/PIL/PsdImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/PyAccess.py b/pyPackages/pillow-i686/PIL/PyAccess.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/PyAccess.py rename to pyPackages/pillow-i686/PIL/PyAccess.py diff --git a/pyPackages/pillowarmv7l/PIL/SgiImagePlugin.py b/pyPackages/pillow-i686/PIL/SgiImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/SgiImagePlugin.py rename to pyPackages/pillow-i686/PIL/SgiImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/SpiderImagePlugin.py b/pyPackages/pillow-i686/PIL/SpiderImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/SpiderImagePlugin.py rename to pyPackages/pillow-i686/PIL/SpiderImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/SunImagePlugin.py b/pyPackages/pillow-i686/PIL/SunImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/SunImagePlugin.py rename to pyPackages/pillow-i686/PIL/SunImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/TarIO.py b/pyPackages/pillow-i686/PIL/TarIO.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/TarIO.py rename to pyPackages/pillow-i686/PIL/TarIO.py diff --git a/pyPackages/pillowarmv7l/PIL/TgaImagePlugin.py b/pyPackages/pillow-i686/PIL/TgaImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/TgaImagePlugin.py rename to pyPackages/pillow-i686/PIL/TgaImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/TiffImagePlugin.py b/pyPackages/pillow-i686/PIL/TiffImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/TiffImagePlugin.py rename to pyPackages/pillow-i686/PIL/TiffImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/TiffTags.py b/pyPackages/pillow-i686/PIL/TiffTags.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/TiffTags.py rename to pyPackages/pillow-i686/PIL/TiffTags.py diff --git a/pyPackages/pillowarmv7l/PIL/WalImageFile.py b/pyPackages/pillow-i686/PIL/WalImageFile.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/WalImageFile.py rename to pyPackages/pillow-i686/PIL/WalImageFile.py diff --git a/pyPackages/pillowarmv7l/PIL/WebPImagePlugin.py b/pyPackages/pillow-i686/PIL/WebPImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/WebPImagePlugin.py rename to pyPackages/pillow-i686/PIL/WebPImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/WmfImagePlugin.py b/pyPackages/pillow-i686/PIL/WmfImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/WmfImagePlugin.py rename to pyPackages/pillow-i686/PIL/WmfImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/XVThumbImagePlugin.py b/pyPackages/pillow-i686/PIL/XVThumbImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/XVThumbImagePlugin.py rename to pyPackages/pillow-i686/PIL/XVThumbImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/XbmImagePlugin.py b/pyPackages/pillow-i686/PIL/XbmImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/XbmImagePlugin.py rename to pyPackages/pillow-i686/PIL/XbmImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/XpmImagePlugin.py b/pyPackages/pillow-i686/PIL/XpmImagePlugin.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/XpmImagePlugin.py rename to pyPackages/pillow-i686/PIL/XpmImagePlugin.py diff --git a/pyPackages/pillowarmv7l/PIL/__init__.py b/pyPackages/pillow-i686/PIL/__init__.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/__init__.py rename to pyPackages/pillow-i686/PIL/__init__.py diff --git a/pyPackages/pillowarmv7l/PIL/_binary.py b/pyPackages/pillow-i686/PIL/_binary.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/_binary.py rename to pyPackages/pillow-i686/PIL/_binary.py diff --git a/pyPackages/pillowx86/PIL/_imaging.cpython-34m.so b/pyPackages/pillow-i686/PIL/_imaging.cpython-34m.so similarity index 100% rename from pyPackages/pillowx86/PIL/_imaging.cpython-34m.so rename to pyPackages/pillow-i686/PIL/_imaging.cpython-34m.so diff --git a/pyPackages/pillowx86/PIL/_imagingmath.cpython-34m.so b/pyPackages/pillow-i686/PIL/_imagingmath.cpython-34m.so similarity index 100% rename from pyPackages/pillowx86/PIL/_imagingmath.cpython-34m.so rename to pyPackages/pillow-i686/PIL/_imagingmath.cpython-34m.so diff --git a/pyPackages/pillowx86/PIL/_imagingmorph.cpython-34m.so b/pyPackages/pillow-i686/PIL/_imagingmorph.cpython-34m.so similarity index 100% rename from pyPackages/pillowx86/PIL/_imagingmorph.cpython-34m.so rename to pyPackages/pillow-i686/PIL/_imagingmorph.cpython-34m.so diff --git a/pyPackages/pillowarmv7l/PIL/_util.py b/pyPackages/pillow-i686/PIL/_util.py similarity index 100% rename from pyPackages/pillowarmv7l/PIL/_util.py rename to pyPackages/pillow-i686/PIL/_util.py diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilconvert.py b/pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilconvert.py similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilconvert.py rename to pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilconvert.py diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pildriver.py b/pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pildriver.py similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pildriver.py rename to pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pildriver.py diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilfile.py b/pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilfile.py similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilfile.py rename to pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilfile.py diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilfont.py b/pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilfont.py similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilfont.py rename to pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilfont.py diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilprint.py b/pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilprint.py similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.data/scripts/pilprint.py rename to pyPackages/pillow-i686/Pillow-2.7.0.data/scripts/pilprint.py diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/DESCRIPTION.rst b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/DESCRIPTION.rst similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/DESCRIPTION.rst rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/DESCRIPTION.rst diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/METADATA b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/METADATA similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/METADATA rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/METADATA diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/RECORD b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/RECORD similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/RECORD rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/RECORD diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/WHEEL b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/WHEEL similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/WHEEL rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/WHEEL diff --git a/pyPackages/pillowx86/Pillow-2.7.0.dist-info/metadata.json b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/metadata.json similarity index 100% rename from pyPackages/pillowx86/Pillow-2.7.0.dist-info/metadata.json rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/metadata.json diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/top_level.txt b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/top_level.txt similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/top_level.txt rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/top_level.txt diff --git a/pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/zip-safe b/pyPackages/pillow-i686/Pillow-2.7.0.dist-info/zip-safe similarity index 100% rename from pyPackages/pillowarmv7l/Pillow-2.7.0.dist-info/zip-safe rename to pyPackages/pillow-i686/Pillow-2.7.0.dist-info/zip-safe diff --git a/qml/sailfish-python.qml b/qml/sailfish-python.qml index 8c71c86..4b6d328 100644 --- a/qml/sailfish-python.qml +++ b/qml/sailfish-python.qml @@ -11,9 +11,9 @@ ApplicationWindow { py.addImportPath(Qt.resolvedUrl('../src')); py.importModule_sync("os") if (py.evaluate("os.uname().machine") == "armv7l"){ - py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillowarmv7l')); + py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillow-armv7hl')); } else { - py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillowx86')); + py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillow-x86')); } py.importModule('main',function(){ py.call("helloworld",[])