Lubuntu/screengrab-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picked upstream version 1.96.

Browse Source 
* Removed disable-upload.patch, applied upstream
* Bumped minimum version libqt5xdg-dev (>= 2.0.0)
* Added buid dependency libqt5svg5-dev
* Added build dependency libqt5xdgiconloader-dev
* Removed --parallel from rules, compat 10 standard
This commit is contained in:
Alf Gaida 2016-10-19 00:00:24 +02:00
parent 1e59e248db
commit eae01a5850
9 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
build/
*.qm
*.kdev4

2
CMakeLists.txt
View File

@ -39,7 +39,7 @@ find_package(
) )
# add version define # add version define
set(SCREENGRAB_VERSION "1.95") set(SCREENGRAB_VERSION "1.96")
set(SCREENGRAB_VERSION_DEV "2.0-beta1") set(SCREENGRAB_VERSION_DEV "2.0-beta1")
# set(DEV_BUILD True) # set(DEV_BUILD True)

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
screengrab (1.96-1) unstable; urgency=medium
* Cherry-picked upstream version 1.96.
* Removed disable-upload.patch, applied upstream
* Bumped minimum version libqt5xdg-dev (>= 2.0.0)
* Added buid dependency libqt5svg5-dev
* Added build dependency libqt5xdgiconloader-dev
* Removed --parallel from rules, compat 10 standard
-- Alf Gaida <agaida@siduction.org> Tue, 18 Oct 2016 23:59:57 +0200
screengrab (1.96~38-g975f8ce-1) unstable; urgency=medium screengrab (1.96~38-g975f8ce-1) unstable; urgency=medium
* Cherry-picked upstream snapshot 1.96~38-g975f8ce * Cherry-picked upstream snapshot 1.96~38-g975f8ce

2
debian/compat vendored
View File

@ -1 +1 @@
9 10

8
debian/control vendored
View File

@ -5,11 +5,13 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org> Andrew Lee (李健秋) <ajqlee@debian.org>
Section: graphics Section: graphics
Priority: optional Priority: optional
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 10),
cmake (>= 3.0.2), cmake (>= 3.0.2),
libkf5windowsystem-dev, libkf5windowsystem-dev,
libqt5svg5-dev,
libqt5x11extras5-dev, libqt5x11extras5-dev,
libqt5xdg-dev (>= 1.3.0), libqt5xdg-dev (>= 2.0.0),
libqt5xdgiconloader-dev,
libx11-dev, libx11-dev,
libx11-xcb-dev, libx11-xcb-dev,
libxcb1-dev, libxcb1-dev,
@ -18,7 +20,7 @@ Build-Depends: debhelper (>= 9),
qttools5-dev, qttools5-dev,
qttools5-dev-tools qttools5-dev-tools
Standards-Version: 3.9.8 Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git/?h=debian/sid Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/screengrab.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git -b debian/sid Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/screengrab.git -b debian/sid
Homepage: https://github.com/QtDesktop/screengrab Homepage: https://github.com/QtDesktop/screengrab

33
debian/patches/disable-uploads.patch vendored
View File

@ -1,33 +0,0 @@
Description: Disable uploads
Author: Alf Gaida <agaida@siduction.org>
--- a/src/core/modulemanager.cpp
+++ b/src/core/modulemanager.cpp
@@ -18,9 +18,9 @@
#include "modulemanager.h"
-#ifdef SG_EXT_UPLOADS
-#include "src/modules/uploader/moduleuploader.h"
-#endif
+// #ifdef SG_EXT_UPLOADS
+// #include "src/modules/uploader/moduleuploader.h"
+// #endif
#ifdef SG_EXT_EDIT
#include "src/modules/extedit/moduleextedit.h"
@@ -35,10 +35,10 @@ ModuleManager::ModuleManager()
void ModuleManager::initModules()
{
-#ifdef SG_EXT_UPLOADS
- ModuleUploader *uploader = new ModuleUploader();
- _modules->insert(MOD_UPLOADER , uploader);
-#endif
+//#ifdef SG_EXT_UPLOADS
+// ModuleUploader *uploader = new ModuleUploader();
+// _modules->insert(MOD_UPLOADER , uploader);
+//#endif
#ifdef SG_EXT_EDIT
ModuleExtEdit *extedit = new ModuleExtEdit();
_modules->insert(MOD_EXT_EDIT.data(), extedit);

1
debian/patches/series vendored
View File

@ -1,4 +1,3 @@
disable-uploads.patch
build-date-time.patch build-date-time.patch
disable-cli-upload-option.patch disable-cli-upload-option.patch

3
debian/rules vendored
View File

@ -6,8 +6,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
%: %:
dh ${@} --buildsystem=cmake \ dh ${@} --buildsystem=cmake
--parallel
override_dh_install: override_dh_install:
rm -f $(currdir)/debian/screengrab/usr/share/doc/screengrab/LICENSE.txt rm -f $(currdir)/debian/screengrab/usr/share/doc/screengrab/LICENSE.txt

14
src/core/modulemanager.cpp
View File

@ -18,9 +18,9 @@
#include "modulemanager.h" #include "modulemanager.h"
#ifdef SG_EXT_UPLOADS // #ifdef SG_EXT_UPLOADS
#include "src/modules/uploader/moduleuploader.h" // #include "src/modules/uploader/moduleuploader.h"
#endif // #endif
#ifdef SG_EXT_EDIT #ifdef SG_EXT_EDIT
#include "src/modules/extedit/moduleextedit.h" #include "src/modules/extedit/moduleextedit.h"
@ -35,10 +35,10 @@ ModuleManager::ModuleManager()
void ModuleManager::initModules() void ModuleManager::initModules()
{ {
#ifdef SG_EXT_UPLOADS //#ifdef SG_EXT_UPLOADS
ModuleUploader *uploader = new ModuleUploader(); // ModuleUploader *uploader = new ModuleUploader();
_modules->insert(MOD_UPLOADER , uploader); // _modules->insert(MOD_UPLOADER , uploader);
#endif //#endif
#ifdef SG_EXT_EDIT #ifdef SG_EXT_EDIT
ModuleExtEdit *extedit = new ModuleExtEdit(); ModuleExtEdit *extedit = new ModuleExtEdit();
_modules->insert(MOD_EXT_EDIT.data(), extedit); _modules->insert(MOD_EXT_EDIT.data(), extedit);