From cec56cb9a2b387207400d96763daccbd403c23c8 Mon Sep 17 00:00:00 2001 From: Florian Bach Date: Sun, 16 Jan 2022 10:12:55 +0100 Subject: [PATCH] Make Github recognize LICENSE --- LICENSE | 40 ++++---------------------------------- README.md | 35 +++++++++++++++++++++++++++++++++ bundle_calibre_plugin.sh | 3 ++- calibre-plugin/__init__.py | 5 +++-- 4 files changed, 44 insertions(+), 39 deletions(-) diff --git a/LICENSE b/LICENSE index 529d317..f288702 100755 --- a/LICENSE +++ b/LICENSE @@ -1,39 +1,7 @@ -acsm-calibre-plugin / DeACSM -Copyright (c) 2021 Leseratte10 - -This software is a Python reimplementation of the C++ library -"libgourou" by Grégory Soutadé which is under the LGPLv3 or later -license (http://indefero.soutade.fr/p/libgourou/). - -I have no idea whether a reimplementation in another language counts -as "derivative use", so just in case it does, I'm putting this project -under the GPLv3 (which is allowed in the LGPLv3 license) to prevent any -licensing issues. - -============================================================================== - -acsm-calibre-plugin / DeACSM -Copyright (c) 2021 Leseratte10 - -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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -============================================================================== - GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -677,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -696,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/README.md b/README.md index 9b13abf..461f08f 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,41 @@ This is a Calibre plugin that allows you to turn ACSM files into EPUB or PDF files without the need for Adobe Digital Editions. It is a full Python reimplementation of libgourou by Grégory Soutadé (http://indefero.soutade.fr/p/libgourou/). +
+ ACSM Input Plugin for Calibre - Copyright (c) 2021-2022 Leseratte10 + +``` +ACSM Input Plugin for Calibre (DeACSM) / acsm-calibre-plugin +Copyright (c) 2021-2022 Leseratte10 + +This software is a Python reimplementation of the C++ library +"libgourou" by Grégory Soutadé which is under the LGPLv3 or later +license (http://indefero.soutade.fr/p/libgourou/). + +I have no idea whether a reimplementation in another language counts +as "derivative use", so just in case it does, I'm putting this project +under the GPLv3 (which is allowed in the LGPLv3 license) to prevent any +licensing issues. + +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +See the "LICENSE" file for a full copy of the GNU GPL v3. +``` + +
+ + ## Setup Download the plugin and import it into Calibre, then open the plugin settings. The plugin should display "Not authorized for any ADE ID". You now have multiple options to authorize the plugin: diff --git a/bundle_calibre_plugin.sh b/bundle_calibre_plugin.sh index 2cc90a7..faf8cf0 100755 --- a/bundle_calibre_plugin.sh +++ b/bundle_calibre_plugin.sh @@ -17,8 +17,9 @@ rm -r __pycache__ # Set module ID. This needs to be changed if any of the module ZIPs change. echo -n "2021-12-19-03" > module_id.txt -# Copy LICENSE so it'll be included in the ZIP. +# Copy LICENSE and README.md so it'll be included in the ZIP. cp ../LICENSE LICENSE +cp ../README.md README.md # Create ZIP file from calibre-plugin folder. zip -r ../calibre-plugin.zip * diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 00d3b27..d08dbac 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -34,9 +34,10 @@ # allow converting an anonymous auth to an AdobeID auth, # update python-cryptography from 3.4.8 to 36.0.1, update python-rsa from 4.7.2 to 4.8. # Currently in development: -# Ignore fatal HTTP errors during optional fulfillment notifications, -# allow authorizing an eReader through USB, add a ton of testing code, +# Ignore fatal HTTP errors and/or a missing or broken server during optional +# fulfillment notifications, allow authorizing an eReader through USB (experimental), # drop dependencies python-cryptography, python-rsa and python-pyasn1. +# add a ton of testing code, try to prevent AV false-positives. PLUGIN_NAME = "DeACSM" PLUGIN_VERSION_TUPLE = (0, 0, 15)