From baf6d516b9a084419db00f10571ae8c960d94179 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 1 May 2020 00:12:48 -0500 Subject: [PATCH] Sync from the archive. --- debian/changelog | 12 +++++-- debian/control | 31 +++++++++---------- debian/copyright | 18 +++++------ debian/gbp.conf | 6 ++++ debian/patches/core-cli-upload-option.patch | 28 ----------------- .../patches/disable-cli-upload-option.patch | 21 ------------- debian/patches/series | 2 -- debian/rules | 7 ++++- 8 files changed, 44 insertions(+), 81 deletions(-) create mode 100644 debian/gbp.conf delete mode 100644 debian/patches/core-cli-upload-option.patch delete mode 100644 debian/patches/disable-cli-upload-option.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index eee9dd6..2bab286 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -screengrab (1.101-1ubuntu1) disco; urgency=medium +screengrab (2.0.0-1) unstable; urgency=medium - * Lubuntuify the package. + * New upstream version 2.0.0 + * Bumped Standards-Version to 4.4.1, no changes needed + * Switched to gbp + * Removed patches - not needed anymore + * Added build dependency lxqt-build-tools (Closes: #948917) + * Removed explicit build dependencies covered by lxqt-build-tools + * Make dh_config more verbose about used options - -- Simon Quigley Sat, 09 Mar 2019 12:22:10 -0600 + -- Alf Gaida Sat, 08 Feb 2020 17:05:20 +0100 screengrab (1.101-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9959b6a..9101982 100644 --- a/debian/control +++ b/debian/control @@ -1,33 +1,30 @@ Source: screengrab -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team -Uploaders: Simon Quigley +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) Section: graphics Priority: optional -Build-Depends: cmake, - debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 12), libkf5windowsystem-dev, libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 3.3.1~), - libqt5xdgiconloader-dev (>= 3.3.1~), + libqt5xdg-dev (>= 3.4.0~), + libqt5xdgiconloader-dev (>= 3.4.0~) , libx11-dev, libx11-xcb-dev, - libxcb-xfixes0-dev [!kfreebsd-any], libxcb1-dev, - pkg-config, - qttools5-dev, - qttools5-dev-tools -Standards-Version: 4.3.0 -Vcs-Browser: https://phab.lubuntu.me/source/screengrab/ -Vcs-Git: https://phab.lubuntu.me/source/screengrab.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/screengrab -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/screengrab.git + libxcb-xfixes0-dev [!kfreebsd-any], + lxqt-build-tools +Standards-Version: 4.4.1 +Vcs-Browser: https://salsa.debian.org/lxqt-team/screengrab +Vcs-Git: https://salsa.debian.org/lxqt-team/screengrab.git Homepage: https://github.com/lxqt/screengrab Package: screengrab Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Crossplatform tool for getting screenshots Screengrab working in Linux and Windows. The program uses Qt and is independent of any desktop environment. diff --git a/debian/copyright b/debian/copyright index 04cefd7..4e641c1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Copyright: 2009-2015 Artem Galichkin License: GPL-2.0+ Files: debian/* -Copyright: 2012-2019 Alf Gaida +Copyright: 2012-2020 Alf Gaida 2010-2013 Artem Galichkin License: GPL-2.0+ @@ -46,13 +46,13 @@ License: BSD-3-Clause without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..8957fee --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz + diff --git a/debian/patches/core-cli-upload-option.patch b/debian/patches/core-cli-upload-option.patch deleted file mode 100644 index 7d37c7c..0000000 --- a/debian/patches/core-cli-upload-option.patch +++ /dev/null @@ -1,28 +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 -@@ -536,8 +536,9 @@ - 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 -+ /// FIXMA - In module interface need add the mthod for geting module cmdLine option - const QString UPLOAD_CMD_PARAM = "upload"; - const QString UPLOAD_CMD_PARAM_SHORT = "u"; - QCommandLineOption u(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM); -@@ -549,6 +550,9 @@ - } 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 8402392..0000000 --- a/debian/patches/disable-cli-upload-option.patch +++ /dev/null @@ -1,21 +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 -@@ -36,11 +36,11 @@ - - ModuleUploader::ModuleUploader(QObject *parent) : - QObject(parent), _ignoreCmdParam(false), -- _optUpload(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM) -+ _optUpload(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM) - { - 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 deleted file mode 100644 index c21f3de..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -disable-cli-upload-option.patch -core-cli-upload-option.patch diff --git a/debian/rules b/debian/rules index 5e0cfa1..b960713 100755 --- a/debian/rules +++ b/debian/rules @@ -16,4 +16,9 @@ override_dh_makeshlibs: # do nothing override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo + dh_auto_configure -- \ + -DSG_DBUS_NOTIFY=ON \ + -DSG_EXT_EDIT=ON \ + -DSG_GLOBALSHORTCUTS=OFF \ + -DUPDATE_TRANSLATIONS=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo