Prepare release v10.0.3

noDRM · Jul 13, 2022 · 077e8f5 · 077e8f5
1 parent fed8bb7
commit 077e8f5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,7 +35,7 @@ List of changes since the fork of Apprentice Harper's repository:
 - Fix small issue with elibri watermark removal.
 - Adobe key name will now contain account email.
 
-## Fixes on master (not yet released):
+## Fixes in v10.0.3 (2022-07-13):
 
 - Fix issue where importing a key from Adobe Digital Editions would fail in Python2 (Calibre < 5) if there were non-ASCII characters in the username.
 - Add code to support importing multiple decryption keys from ADE.
@@ -56,13 +56,17 @@ List of changes since the fork of Apprentice Harper's repository:
 - Drop support for importing key data from the ancient, pre "DeDRM" Calibre plugins ("Ignoble Epub DeDRM", "eReader PDB 2 PML" and "K4MobiDeDRM"). These are from 2011, I doubt anyone still has these installed, I can't even find a working link for these to test them. If you still have encryption keys in one of these plugins, you will need to update to DeDRM v10.0.2 or older (to convert the keys) before updating to DeDRM v10.0.3 or newer.
 - Some Python3 bugfixes for Amazon books (merged #10 by ableeker).
 - Fix a bug where extracting an Adobe key from ADE on Linux through Wine did fail when using the OpenSSL backend (instead of PyCrypto). See #13 and #14 for details, thanks acaloiaro for the bugfix.
-- Make the plugin work on Calibre 6 (Qt 6). If you're running the Calibre 6 beta and you notice any issues, please open a bug report.
 - Fix IndexError when DeDRMing some Amazon eBooks.
-- Add support for books with the new ADE3.0+ DRM by merging #48 by a980e066a01. Thanks a lot!
+- Add support for books with the new ADE3.0+ DRM by merging #48 by a980e066a01. Thanks a lot! (Also fixes #96 on MacOS)
 - Remove OpenSSL support, now the plugin will always use the Python crypto libraries.
 - Obok: Fix issues with invalid UTF-8 characters by merging #26 by baby-bell.
 - ineptpdf: Fix broken V=3 key obfuscation algorithm. 
 - ineptpdf: (Hopefully) fix issues with some B&N PDF files.
 - Fix broken Amazon K4PC key retrieval (fixes #38)
 - Fix bug that corrupts output file for Print-Replica Amazon books (fixes #30).
 - Fix Nook Study key retrieval code (partially fixes #50).
+- Make the plugin work on Calibre 6 (Qt 6). (fixes #54 and #98) If you're running Calibre 6 and you notice any issues, please open a bug report.
+
+## Fixes on master (not yet released):
+
+- (None)
diff --git a/DeDRM_plugin/DeDRM_Help.htm b/DeDRM_plugin/DeDRM_Help.htm
@@ -17,7 +17,7 @@
 
 <body>
 
-<h1>DeDRM Plugin <span class="version">(v10.0.2)</span></h1>
+<h1>DeDRM Plugin <span class="version">(v10.0.3)</span></h1>
 
 <p>This plugin removes DRM from ebooks when they are imported into calibre. If you already have DRMed ebooks in your calibre library, you will need to remove them and import them again.</p>
 
@@ -39,14 +39,14 @@ <h3>Configuration</h3>
 
 <h3>Troubleshooting:</h3>
 
-<p >If you find that it’s not working for you , you can save a lot of time by trying to add the ebook to Calibre in debug mode. This will print out a lot of helpful info that can be copied into any online help requests.</p>
+<p>If you find that it’s not working for you , you can save a lot of time by trying to add the ebook to Calibre in debug mode. This will print out a lot of helpful info that can be copied into any online help requests.</p>
 
 <p>Open a command prompt (terminal window) and type "calibre-debug -g" (without the quotes). Calibre will launch, and you can can add the problem ebook the usual way. The debug info will be output to the original command prompt (terminal window). Copy the resulting output and paste it into the comment you make at my blog.</p>
 <p><span class="bold">Note:</span> The Mac version of Calibre doesn’t install the command line tools by default. If you go to the ‘Preferences’ page and click on the miscellaneous button, you’ll find the option to install the command line tools.</p>
 
 <h3>Credits:</h3>
 <ul>
-<li>NoDRM for a bunch of updates and maintenance since November 2021, and the Readium LCP support</li>
+<li>NoDRM for a bunch of updates and maintenance since November 2021<s>, and the Readium LCP support</s></li>
 <li>The Dark Reverser for the Mobipocket and eReader scripts</li>
 <li>i♥cabbages for the Adobe Digital Editions scripts</li>
 <li>Skindle aka Bart Simpson for the Amazon Kindle for PC script</li>

diff --git a/DeDRM_plugin/__version.py b/DeDRM_plugin/__version.py
@@ -4,7 +4,7 @@
 #@@CALIBRE_COMPAT_CODE@@
 
 PLUGIN_NAME = "DeDRM"
-__version__ = '10.0.2'
+__version__ = '10.0.3'
 
 PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")])
 PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE])

diff --git a/Obok_plugin/__init__.py b/Obok_plugin/__init__.py
@@ -3,7 +3,7 @@
                         print_function)
 
 __license__   = 'GPL v3'
-__version__ = '10.0.0'
+__version__ = '10.0.3'
 __docformat__ = 'restructuredtext en'
 
 #####################################################################
@@ -20,7 +20,7 @@
 PLUGIN_NAME = 'Obok DeDRM'
 PLUGIN_SAFE_NAME = PLUGIN_NAME.strip().lower().replace(' ', '_')
 PLUGIN_DESCRIPTION = _('Removes DRM from Kobo kepubs and adds them to the library.')
-PLUGIN_VERSION_TUPLE = (10, 0, 0)
+PLUGIN_VERSION_TUPLE = (10, 0, 3)
 PLUGIN_VERSION = '.'.join([str(x) for x in PLUGIN_VERSION_TUPLE])
 HELPFILE_NAME = PLUGIN_SAFE_NAME + '_Help.htm'
 PLUGIN_AUTHORS = 'Anon'

diff --git a/Obok_plugin/obok/obok.py b/Obok_plugin/obok/obok.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+# Version 10.0.3 July 2022
+# Fix Calibre 6
+#
 # Version 10.0.1 February 2022
 # Remove OpenSSL support to only support PyCryptodome; clean up the code.
 #

diff --git a/Obok_plugin/obok_dedrm_Help.htm b/Obok_plugin/obok_dedrm_Help.htm
@@ -8,7 +8,7 @@
 <body>
 
 <h1>Obok DeDRM Plugin</h1>
-<h3>(version 10.0.0)</h3>
+<h3>(version 10.0.2)</h3>
 
 <h3>Installation:</h3>