diff --git a/debian/changelog b/debian/changelog index 0d35764..cc70070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -screengrab (1.101-1ubuntu2) UNRELEASED; urgency=medium +screengrab (1.101-1ubuntu2) focal; urgency=medium - * Refreshed patches + * Removed patches, because they are applied upstream. - -- apt-ghetto Thu, 04 Jul 2019 17:55:29 +0200 + -- apt-ghetto Tue, 24 Dec 2019 13:45:09 +0100 screengrab (1.101-1ubuntu1) disco; urgency=medium diff --git a/debian/patches/core-cli-upload-option.patch b/debian/patches/core-cli-upload-option.patch deleted file mode 100644 index 0faa51e..0000000 --- a/debian/patches/core-cli-upload-option.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Disable cli upload option -Author: Alf Gaida -Bug-Debian: https://bugs.debian.org/834517 -Last-Update: 2016-09-19 - ---- a/src/core/core.cpp -+++ b/src/core/core.cpp -@@ -534,7 +534,7 @@ void Core::processCmdLineOpts(const QStringList& arguments) - for (int i=0; i < _screenTypeOpts.count(); ++i) - if (_cmdLine.isSet(_screenTypeOpts.at(i))) - _conf->setDefScreenshotType(i); -- -+/* - #ifdef SG_EXT_UPLOADS - /// FIXMA - In module interface need add the mthod for geting module cmdLine options - const QString UPLOAD_CMD_PARAM = QStringLiteral("upload"); -@@ -550,6 +550,9 @@ void Core::processCmdLineOpts(const QStringList& arguments) - #else - initWindow(); - #endif -+*/ -+ -+ initWindow(); - - } - diff --git a/debian/patches/disable-cli-upload-option.patch b/debian/patches/disable-cli-upload-option.patch deleted file mode 100644 index 2cd0d7e..0000000 --- a/debian/patches/disable-cli-upload-option.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Disable cli upload option -Author: Alf Gaida -Bug-Debian: https://bugs.debian.org/834517 -Last-Update: 2016-09-19 - ---- a/src/modules/uploader/moduleuploader.cpp -+++ b/src/modules/uploader/moduleuploader.cpp -@@ -40,7 +40,7 @@ ModuleUploader::ModuleUploader(QObject *parent) : - { - QString optUploadDescr = tr("Upload the screenshot to the default image host"); - _optUpload.setDescription(optUploadDescr); -- Core::instance()->addCmdLineOption(_optUpload); -+ // Core::instance()->addCmdLineOption(_optUpload); - } - - QString ModuleUploader::moduleName() diff --git a/debian/patches/series b/debian/patches/series index c21f3de..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -disable-cli-upload-option.patch -core-cli-upload-option.patch