Bye, bye DEBs

README.md

@@ -29,10 +29,7 @@ If you find **KCC** valuable you can consider donating to the authors:
 You can find the latest released binary at the following links:
 - **[Windows](http://kcc.iosphe.re/Windows/) (64-bit only)**
 - **[macOS](http://kcc.iosphe.re/OSX/) (10.12+)**
-- **Linux:** 
-  - [Ubuntu 17.10](http://kcc.iosphe.re/LinuxArtful/)
-  - [Ubuntu 16.04 / Debian 9](http://kcc.iosphe.re/LinuxXenial/)
-  - [Ubuntu 14.04 / Debian 8](http://kcc.iosphe.re/LinuxTrusty/)
+- **Linux:** Currently unavailable.
 
 ## PYPI
 **KCC** is also available on PyPI.
@@ -51,18 +48,17 @@ Following software is required to run Linux version of **KCC** and/or bare sourc
 
 On Debian based distributions these two commands should install all needed dependencies:
 ```
-sudo apt-get install python3 python3-dev python3-pip libpng-dev libjpeg-dev p7zip-full unrar
+sudo apt-get install python3 python3-dev python3-pip libpng-dev libjpeg-dev p7zip-full
 sudo pip3 install --upgrade pillow python-slugify psutil pyqt5 raven
 ```
 
 ### Optional dependencies
 - [KindleGen](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211) v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation)*
-- [UnRAR](http://www.rarlab.com/download.htm) *(For CBR/RAR support)*
-- [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*
+- [7z](http://www.7-zip.org/download.html) *(For CBZ/ZIP, CBR/RAR, 7z/CB7 support)*
 
 ## INPUT FORMATS
 **KCC** can understand and convert, at the moment, the following input types:
-- Folders containing: PNG, JPG or GIF files
+- Folders containing: PNG, JPG, GIF or WebP files
 - CBZ, ZIP *(With `7z` executable)*
 - CBR, RAR *(With `7z` executable)*
 - CB7, 7Z *(With `7z` executable)*
@@ -172,12 +168,12 @@ The app relies and includes the following scripts:
 * [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu-KoAHD.kepub.epub)
 * [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu-KoAH2O.kepub.epub)
 * [Kobo Aura ONE](http://kcc.iosphe.re/Samples/Ubunchu-KoAO.kepub.epub)
+* [Kobo Forma](http://kcc.iosphe.re/Samples/Ubunchu-KoF.kepub.epub)
 
 ## PRIVACY
-**KCC** is initiating internet connections in three cases:
-* During startup - Version check
-* When MCD metadata are used - Cover download
-* When error occurs - Automatic reporting
+**KCC** is initiating internet connections in two cases:
+* During startup - Version check.
+* When error occurs - Automatic reporting on Windows and MacOS.
 
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).

kindlecomicconverter/KCC_gui.py

@@ -957,8 +957,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Kindle PW 1/2",
             "Kindle",
             "Separator",
-            "Kobo Aura ONE",
             "Kobo Forma",
+            "Kobo Aura ONE",
             "Kobo Aura H2O",
             "Kobo Aura HD",
             "Kobo Aura",

kindlecomicconverter/image.py

@@ -90,8 +90,8 @@ class ProfileData:
         'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8),
         'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8),
         'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8),
-        'KoF': ("Kobo Forma", (1440, 1920), Palette16, 1.8),
         'KoAO': ("Kobo Aura ONE", (1404, 1872), Palette16, 1.8),
+        'KoF': ("Kobo Forma", (1440, 1920), Palette16, 1.8),
         'OTHER': ("Other", (0, 0), Palette16, 1.8),
     }
 

other/linux/kindlecomicconverter

@@ -1,4 +0,0 @@
-kindlecomicconverter: binary-without-manpage usr/bin/kcc
-kindlecomicconverter: wrong-name-for-changelog-of-native-package usr/share/doc/kindlecomicconverter/changelog.Debian.gz
-kindlecomicconverter: file-missing-in-md5sums usr/share/doc/kindlecomicconverter/changelog.Debian.gz
-kindlecomicconverter: hardening-no-relro usr/bin/kcc

other/linux/kindlecomicconverter.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Kindle Comic Converter
-GenericName=Kindle Comic Converter
-Comment=Comic and Manga converter for e-book readers
-Icon=/usr/share/kindlecomicconverter/comic2ebook.png
-Exec=/usr/bin/kcc %f
-Terminal=false
-Categories=Graphics;
-MimeType=application/zip;application/x-rar;application/x-7z-compressed;

setup.py

@@ -6,7 +6,7 @@ pip/pyinstaller build script for KCC.
 Install as Python package:
     python3 setup.py install
 
-Create EXE/APP/DEB:
+Create EXE/APP:
     python3 setup.py build_binary
 """
 
@@ -49,22 +49,6 @@ class BuildBinaryCommand(distutils.cmd.Command):
             os.system('pyinstaller -y -F -i icons\\comic2ebook.ico -n KCC -w --noupx kcc.py')
             exit(0)
         else:
-            os.system('pyinstaller -y -F kcc.py')
-            os.system('mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter '
-                      'dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides')
-            os.system('mv dist/kcc dist/usr/bin')
-            os.system('cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter')
-            os.system('cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright')
-            os.system('cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications')
-            os.system('cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides')
-            os.chdir('dist')
-            os.system('fpm -f -s dir -t deb -n kindlecomicconverter -v ' + VERSION +
-                      ' -m "Pawel Jastrzebski <pawelj@iosphe.re>" --license "ISC" '
-                      '--description "$(printf "Comic and Manga converter for e-book '
-                      'readers.\nThis app allows you to transform your PNG, JPG, GIF, '
-                      'CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books.")" '
-                      '--url "https://kcc.iosphe.re/" --deb-priority "optional" --vendor "" '
-                      '--category "graphics" -d "p7zip-full" -d "p7zip-rar" -d "libc6" usr')
             exit(0)