Merge pull request #165 from ciromattia/dev

5.0

10 files changed, 62 insertions, 3 deletions

diff --git a/other/linux/kindlecomicconverter b/other/linux/kindlecomicconverter
new file mode 100644
index 0000000..5b9b428
--- /dev/null
+++ b/other/linux/kindlecomicconverter
@@ -0,0 +1,4 @@
+kindlecomicconverter: statically-linked-binary usr/bin/kcc
+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
diff --git a/other/linux/kindlecomicconverter.desktop b/other/linux/kindlecomicconverter.desktop
new file mode 100644
index 0000000..a985e9d
--- /dev/null
+++ b/other/linux/kindlecomicconverter.desktop
@@ -0,0 +1,11 @@
+[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
+Terminal=false
+Categories=Graphics;
+MimeType=application/zip;application/x-rar;application/x-7z-compressed;
diff --git a/other/7za b/other/osx/7za
index 8669495..8669495 100755
--- a/other/7za
+++ b/other/osx/7za
Binary files differdiff --git a/other/osx/Info.plist b/other/osx/Info.plist
new file mode 100644
index 0000000..bb87c7d
--- /dev/null
+++ b/other/osx/Info.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>Kindle Comic Converter</string>
+	<key>CFBundleExecutable</key>
+	<string>MacOS/Kindle Comic Converter</string>
+	<key>CFBundleGetInfoString</key>
+	<string>KindleComicConverter 5.0, written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
+	<key>CFBundleIconFile</key>
+	<string>comic2ebook.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.kindlecomicconverter.KindleComicConverter</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Kindle Comic Converter</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>5.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>5.0.0</string>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>PATH</key>
+		<string>./../Resources:/usr/local/bin:/usr/bin:/bin</string>
+	</dict>
+	<key>LSHasLocalizedDisplayName</key>
+	<false/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9.0</string>
+	<key>NSAppleScriptEnabled</key>
+	<false/>
+	<key>NSHumanReadableCopyright</key>
+	<string>ISC License (ISCL)</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/other/unrar b/other/osx/unrar
index 02e3413..02e3413 100755
--- a/other/unrar
+++ b/other/osx/unrar
Binary files differdiff --git a/other/qt.conf b/other/qt.conf
deleted file mode 100644
index d9a44c7..0000000
--- a/other/qt.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-; Qt Configuration file
-[Paths]
-Plugins = PlugIns
diff --git a/other/7za.exe b/other/windows/7za.exe
index 7f6bf86..7f6bf86 100644
--- a/other/7za.exe
+++ b/other/windows/7za.exe
Binary files differdiff --git a/other/Additional-LICENSE.txt b/other/windows/Additional-LICENSE.txt
index 891d453..891d453 100644
--- a/other/Additional-LICENSE.txt
+++ b/other/windows/Additional-LICENSE.txt
diff --git a/other/InstallWarning.rtf b/other/windows/InstallWarning.rtf
index faf6e4d..faf6e4d 100644
--- a/other/InstallWarning.rtf
+++ b/other/windows/InstallWarning.rtf
diff --git a/other/UnRAR.exe b/other/windows/UnRAR.exe
index cfc0c07..cfc0c07 100644
--- a/other/UnRAR.exe
+++ b/other/windows/UnRAR.exe
Binary files differ