about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--LICENSE.txt2
-rw-r--r--README.md2
-rwxr-xr-xdocker/Build2
-rw-r--r--docker/Dockerfile5
-rwxr-xr-xkcc-c2e.py8
-rwxr-xr-xkcc-c2p.py8
-rw-r--r--kcc.iss2
-rwxr-xr-xkcc.py8
-rw-r--r--kindlecomicconverter/KCC_gui.py (renamed from kcc/KCC_gui.py)2
-rw-r--r--kindlecomicconverter/KCC_rc.py (renamed from kcc/KCC_rc.py)0
-rw-r--r--kindlecomicconverter/KCC_ui.py (renamed from kcc/KCC_ui.py)0
-rw-r--r--kindlecomicconverter/KCC_ui_editor.py (renamed from kcc/KCC_ui_editor.py)0
-rw-r--r--kindlecomicconverter/__init__.py (renamed from kcc/__init__.py)2
-rw-r--r--kindlecomicconverter/cbxarchive.py (renamed from kcc/cbxarchive.py)2
-rwxr-xr-xkindlecomicconverter/comic2ebook.py (renamed from kcc/comic2ebook.py)2
-rw-r--r--kindlecomicconverter/comic2panel.py (renamed from kcc/comic2panel.py)2
-rw-r--r--kindlecomicconverter/dualmetafix.py (renamed from kcc/dualmetafix.py)2
-rwxr-xr-xkindlecomicconverter/image.py (renamed from kcc/image.py)2
-rw-r--r--kindlecomicconverter/kindle.py (renamed from kcc/kindle.py)2
-rw-r--r--kindlecomicconverter/metadata.py (renamed from kcc/metadata.py)2
-rw-r--r--kindlecomicconverter/pdfjpgextract.py (renamed from kcc/pdfjpgextract.py)2
-rw-r--r--kindlecomicconverter/rarfile.py (renamed from kcc/rarfile.py)0
-rw-r--r--kindlecomicconverter/shared.py (renamed from kcc/shared.py)2
-rw-r--r--other/osx/Info.plist2
-rwxr-xr-xsetup.py18
26 files changed, 42 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index b28f15b..e5b7ef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,5 @@ kindlegen*
 *.spec
 setup.bat
 setup.sh
-kcc/sentry.py
+kindlecomicconverter/sentry.py
 build/
diff --git a/LICENSE.txt b/LICENSE.txt
index cfe3e84..5d0945e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 ISC LICENSE
 
 Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-Copyright (c) 2013-2016 Paweł Jastrzębski <pawelj@iosphe.re>
+Copyright (c) 2013-2017 Paweł Jastrzębski <pawelj@iosphe.re>
 
 Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the
diff --git a/README.md b/README.md
index 3f8b676..b124454 100644
--- a/README.md
+++ b/README.md
@@ -495,5 +495,5 @@ The app relies and includes the following scripts:
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
 
 ## COPYRIGHT
-Copyright (c) 2012-2016 Ciro Mattia Gonano and Paweł Jastrzębski.
+Copyright (c) 2012-2017 Ciro Mattia Gonano and Paweł Jastrzębski.
 **KCC** is released under ISC LICENSE; see LICENSE.txt for further details.
diff --git a/docker/Build b/docker/Build
index 67c7b7f..6135fb9 100755
--- a/docker/Build
+++ b/docker/Build
@@ -2,7 +2,7 @@
 set -e
 
 pip3 install --upgrade pip setuptools wheel
-pip3 install pillow python-slugify psutil pyinstaller==3.1.1 raven pyqt5 certifi
+pip3 install pillow python-slugify psutil pyinstaller raven pyqt5 certifi
 gem install fpm
 
 cd /app
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5164aff..784bfac 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,12 +6,9 @@ ADD ./Build /Build
 
 RUN printf "deb http://httpredir.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list
 RUN printf "Package: *\nPin: release a=testing\nPin-Priority: 400\n" > /etc/apt/preferences.d/stretch.pref
-RUN printf "deb http://httpredir.debian.org/debian sid main" > /etc/apt/sources.list.d/sid.list
-RUN printf "Package: *\nPin: release a=testing\nPin-Priority: 300\n" > /etc/apt/preferences.d/sid.pref
 RUN apt-get update && apt-get -y dist-upgrade
 RUN apt-get -y install build-essential curl ruby ruby-dev libpng-dev libjpeg-dev
-RUN apt-get -y -t testing install python3 python3-dev
-RUN apt-get -y -t unstable install python3-pyqt5
+RUN apt-get -y -t testing install python3 python3-dev python3-pyqt5
 RUN curl https://bootstrap.pypa.io/get-pip.py | python3
 RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
diff --git a/kcc-c2e.py b/kcc-c2e.py
index c98ae0b..cb83188 100755
--- a/kcc-c2e.py
+++ b/kcc-c2e.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -23,12 +23,12 @@ if sys.version_info[0] != 3:
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-from kcc.shared import dependencyCheck
+from kindlecomicconverter.shared import dependencyCheck
 dependencyCheck(2)
 
 from multiprocessing import freeze_support
-from kcc import __version__
-from kcc.comic2ebook import main
+from kindlecomicconverter import __version__
+from kindlecomicconverter.comic2ebook import main
 
 if __name__ == "__main__":
     freeze_support()
diff --git a/kcc-c2p.py b/kcc-c2p.py
index adab111..bc6aa6b 100755
--- a/kcc-c2p.py
+++ b/kcc-c2p.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -23,12 +23,12 @@ if sys.version_info[0] != 3:
     print('ERROR: This is Python 3 script!')
     exit(1)
 
-from kcc.shared import dependencyCheck
+from kindlecomicconverter.shared import dependencyCheck
 dependencyCheck(1)
 
 from multiprocessing import freeze_support
-from kcc import __version__
-from kcc.comic2panel import main
+from kindlecomicconverter import __version__
+from kindlecomicconverter.comic2panel import main
 
 if __name__ == "__main__":
     freeze_support()
diff --git a/kcc.iss b/kcc.iss
index 9f0e8e6..b001db0 100644
--- a/kcc.iss
+++ b/kcc.iss
@@ -12,7 +12,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-AppCopyright=Copyright (C) 2012-2016 Ciro Mattia Gonano and Paweł Jastrzębski
+AppCopyright=Copyright (C) 2012-2017 Ciro Mattia Gonano and Paweł Jastrzębski
 ArchitecturesAllowed=x64 
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
diff --git a/kcc.py b/kcc.py
index 28045fc..a93e48f 100755
--- a/kcc.py
+++ b/kcc.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -59,15 +59,15 @@ elif sys.platform.startswith('win'):
 # Load additional Sentry configuration
 if getattr(sys, 'frozen', False):
     try:
-        import kcc.sentry
+        import kindlecomicconverter.sentry
     except:
         pass
 
-from kcc.shared import dependencyCheck
+from kindlecomicconverter.shared import dependencyCheck
 dependencyCheck(3)
 
 from multiprocessing import freeze_support
-from kcc import KCC_gui
+from kindlecomicconverter import KCC_gui
 
 if __name__ == "__main__":
     freeze_support()
diff --git a/kcc/KCC_gui.py b/kindlecomicconverter/KCC_gui.py
index b60c2be..16952ab 100644
--- a/kcc/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/KCC_rc.py b/kindlecomicconverter/KCC_rc.py
index e4334c8..e4334c8 100644
--- a/kcc/KCC_rc.py
+++ b/kindlecomicconverter/KCC_rc.py
diff --git a/kcc/KCC_ui.py b/kindlecomicconverter/KCC_ui.py
index 6e2ed50..6e2ed50 100644
--- a/kcc/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
diff --git a/kcc/KCC_ui_editor.py b/kindlecomicconverter/KCC_ui_editor.py
index 56dc07d..56dc07d 100644
--- a/kcc/KCC_ui_editor.py
+++ b/kindlecomicconverter/KCC_ui_editor.py
diff --git a/kcc/__init__.py b/kindlecomicconverter/__init__.py
index 8fd5a24..c0a62f7 100644
--- a/kcc/__init__.py
+++ b/kindlecomicconverter/__init__.py
@@ -1,4 +1,4 @@
 __version__ = '5.2.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2016, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
+__copyright__ = '2012-2017, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
diff --git a/kcc/cbxarchive.py b/kindlecomicconverter/cbxarchive.py
index 3c857e7..726432b 100644
--- a/kcc/cbxarchive.py
+++ b/kindlecomicconverter/cbxarchive.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/comic2ebook.py b/kindlecomicconverter/comic2ebook.py
index 3cdc7c9..e5bcc89 100755
--- a/kcc/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/comic2panel.py b/kindlecomicconverter/comic2panel.py
index 5e2b4f9..522587c 100644
--- a/kcc/comic2panel.py
+++ b/kindlecomicconverter/comic2panel.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/dualmetafix.py b/kindlecomicconverter/dualmetafix.py
index ffb9890..566ceb5 100644
--- a/kcc/dualmetafix.py
+++ b/kindlecomicconverter/dualmetafix.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Based on initial version of DualMetaFix. Copyright (C) 2013 Kevin Hendricks
-# Changes for KCC Copyright (C) 2014-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Changes for KCC Copyright (C) 2014-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/kcc/image.py b/kindlecomicconverter/image.py
index 28098e7..b83bea7 100755
--- a/kcc/image.py
+++ b/kindlecomicconverter/image.py
@@ -2,7 +2,7 @@
 # Copyright (C) 2011  Stanislav (proDOOMman) Kosolapov <prodoomman@gmail.com>
 # Copyright (c) 2016  Alberto Planas <aplanas@gmail.com>
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/kcc/kindle.py b/kindlecomicconverter/kindle.py
index 90e15e1..1eea63c 100644
--- a/kcc/kindle.py
+++ b/kindlecomicconverter/kindle.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/metadata.py b/kindlecomicconverter/metadata.py
index 2dd51c5..f2cf488 100644
--- a/kcc/metadata.py
+++ b/kindlecomicconverter/metadata.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/pdfjpgextract.py b/kindlecomicconverter/pdfjpgextract.py
index 06403ad..90d0643 100644
--- a/kcc/pdfjpgextract.py
+++ b/kindlecomicconverter/pdfjpgextract.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Based upon the code snippet by Ned Batchelder
 # (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
diff --git a/kcc/rarfile.py b/kindlecomicconverter/rarfile.py
index afb19a7..afb19a7 100644
--- a/kcc/rarfile.py
+++ b/kindlecomicconverter/rarfile.py
diff --git a/kcc/shared.py b/kindlecomicconverter/shared.py
index c228d30..3843f39 100644
--- a/kcc/shared.py
+++ b/kindlecomicconverter/shared.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2016 Pawel Jastrzebski <pawelj@iosphe.re>
+# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/other/osx/Info.plist b/other/osx/Info.plist
index 0eb9c94..d549ea2 100644
--- a/other/osx/Info.plist
+++ b/other/osx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>MacOS/Kindle Comic Converter</string>
 	<key>CFBundleGetInfoString</key>
-	<string>KindleComicConverter 5.2.1, written 2012-2016 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
+	<string>KindleComicConverter 5.2.1, written 2012-2017 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
 	<key>CFBundleIconFile</key>
 	<string>comic2ebook.icns</string>
 	<key>CFBundleIdentifier</key>
diff --git a/setup.py b/setup.py
index a1f1b73..827edc8 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ import shutil
 import setuptools
 import distutils.cmd
 from distutils.command.build import build
-from kcc import __version__
+from kindlecomicconverter import __version__
 
 NAME = 'KindleComicConverter'
 MAIN = 'kcc.py'
@@ -38,7 +38,10 @@ class BuildBinaryCommand(distutils.cmd.Command):
 
     def run(self):
         if sys.platform == 'darwin':
-            os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s --noupx kcc.py')
+            if os.path.isfile('KCC.spec'):
+                os.system('pyinstaller KCC.spec')
+            else:
+                os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s --noupx kcc.py')
             shutil.copy('other/osx/7za', 'dist/Kindle Comic Converter.app/Contents/Resources')
             shutil.copy('other/osx/unrar', 'dist/Kindle Comic Converter.app/Contents/Resources')
             shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents')
@@ -51,7 +54,10 @@ class BuildBinaryCommand(distutils.cmd.Command):
             os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
             exit(0)
         elif sys.platform == 'win32':
-            os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
+            if os.path.isfile('KCC.spec'):
+                os.system('pyinstaller KCC.spec')
+            else:
+                os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
             if os.path.isfile('setup.bat'):
                 os.system('setup.bat')
             exit(0)
@@ -59,19 +65,19 @@ class BuildBinaryCommand(distutils.cmd.Command):
             if self.pyz:
                 script = '''
                 cp kcc.py __main__.py
-                zip kcc.zip __main__.py kcc/*.py
+                zip kcc.zip __main__.py kindlecomicconverter/*.py
                 echo "#!/usr/bin/env python3" > kcc-bin
                 cat kcc.zip >> kcc-bin
                 chmod +x kcc-bin
 
                 cp kcc-c2e.py __main__.py
-                zip kcc-c2e.zip __main__.py kcc/*.py
+                zip kcc-c2e.zip __main__.py kindlecomicconverter/*.py
                 echo "#!/usr/bin/env python3" > kcc-c2e-bin
                 cat kcc-c2e.zip >> kcc-c2e-bin
                 chmod +x kcc-c2e-bin
 
                 cp kcc-c2p.py __main__.py
-                zip kcc-c2p.zip __main__.py kcc/*.py
+                zip kcc-c2p.zip __main__.py kindlecomicconverter/*.py
                 echo "#!/usr/bin/env python3" > kcc-c2p-bin
                 cat kcc-c2p.zip >> kcc-c2p-bin
                 chmod +x kcc-c2p-bin
generated by cgit-pink (baitinq) at 2025-02-02 13:33:44 +0000