Sync from the archive.

This commit is contained in:
Simon Quigley 2020-05-01 00:12:48 -05:00
parent 786123caab
commit baf6d516b9
8 changed files with 44 additions and 81 deletions

12
debian/changelog vendored
View File

@ -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 <tsimonq2@ubuntu.com> Sat, 09 Mar 2019 12:22:10 -0600 -- Alf Gaida <agaida@siduction.org> Sat, 08 Feb 2020 17:05:20 +0100
screengrab (1.101-1) unstable; urgency=medium screengrab (1.101-1) unstable; urgency=medium

31
debian/control vendored
View File

@ -1,33 +1,30 @@
Source: screengrab Source: screengrab
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com> Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org> Uploaders: Alf Gaida <agaida@siduction.org>,
Uploaders: Simon Quigley <tsimonq2@ubuntu.com> ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: graphics Section: graphics
Priority: optional Priority: optional
Build-Depends: cmake, Build-Depends: debhelper-compat (= 12),
debhelper-compat (= 12),
libkf5windowsystem-dev, libkf5windowsystem-dev,
libqt5svg5-dev, libqt5svg5-dev,
libqt5x11extras5-dev, libqt5x11extras5-dev,
libqt5xdg-dev (>= 3.3.1~), libqt5xdg-dev (>= 3.4.0~),
libqt5xdgiconloader-dev (>= 3.3.1~), libqt5xdgiconloader-dev (>= 3.4.0~) ,
libx11-dev, libx11-dev,
libx11-xcb-dev, libx11-xcb-dev,
libxcb-xfixes0-dev [!kfreebsd-any],
libxcb1-dev, libxcb1-dev,
pkg-config, libxcb-xfixes0-dev [!kfreebsd-any],
qttools5-dev, lxqt-build-tools
qttools5-dev-tools Standards-Version: 4.4.1
Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/lxqt-team/screengrab
Vcs-Browser: https://phab.lubuntu.me/source/screengrab/ Vcs-Git: https://salsa.debian.org/lxqt-team/screengrab.git
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
Homepage: https://github.com/lxqt/screengrab Homepage: https://github.com/lxqt/screengrab
Package: screengrab Package: screengrab
Architecture: any Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${shlibs:Depends},
${misc:Depends}
Description: Crossplatform tool for getting screenshots Description: Crossplatform tool for getting screenshots
Screengrab working in Linux and Windows. The program uses Qt and is Screengrab working in Linux and Windows. The program uses Qt and is
independent of any desktop environment. independent of any desktop environment.

2
debian/copyright vendored
View File

@ -7,7 +7,7 @@ Copyright: 2009-2015 Artem Galichkin <doomer3d@gmail.com>
License: GPL-2.0+ License: GPL-2.0+
Files: debian/* Files: debian/*
Copyright: 2012-2019 Alf Gaida <agaida@siduction.org> Copyright: 2012-2020 Alf Gaida <agaida@siduction.org>
2010-2013 Artem Galichkin <doomer3d@gmail.com> 2010-2013 Artem Galichkin <doomer3d@gmail.com>
License: GPL-2.0+ License: GPL-2.0+

6
debian/gbp.conf vendored Normal file
View File

@ -0,0 +1,6 @@
[DEFAULT]
debian-branch = debian/sid
upstream-branch = upstream/latest
pristine-tar = True
compression = xz

View File

@ -1,28 +0,0 @@
Description: Disable cli upload option
Author: Alf Gaida <agaida@siduction.org>
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();
}

View File

@ -1,21 +0,0 @@
Description: Disable cli upload option
Author: Alf Gaida <agaida@siduction.org>
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()

View File

@ -1,2 +0,0 @@
disable-cli-upload-option.patch
core-cli-upload-option.patch

7
debian/rules vendored
View File

@ -16,4 +16,9 @@ override_dh_makeshlibs:
# do nothing # do nothing
override_dh_auto_configure: 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