Cherry-picking upstream version 1.10.16-29-g7e679db.

Removed patches, applied upstream
Fixed VCS fields, using plain /git/
Fixed copyrights Format field, using https
Exported LC_ALL=C.UTF-8 to prevent problems with reproducible builds
Set CMAKE_BUILD_TYPE=RelWithDebInfo
ubuntu/disco debian/1.10.16-29-g7e679db-1
Alf Gaida 8 years ago
parent bc7d180d99
commit 366a191d66

@ -31,7 +31,7 @@ endif()
find_package(Qt5 REQUIRED COMPONENTS Widgets X11Extras DBus LinguistTools)
include(GNUInstallDirs)
include(LXQtTranslateTs) # Altough the name it doesn't depend on LXQt in any way
include(LXQtTranslateTs) # Although the name it doesn't depend on LXQt in any way
include(LXQtTranslateDesktop)
include(Qt5TranslationLoader)
@ -57,7 +57,7 @@ install(FILES
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps"
)
# building tarball with CPack
# building tar-ball with CPack
include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
set(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})

@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
if (_translations)
list(SORT _translations)
add_custom_command(OUTPUT ${_outFile}
COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
else()
add_custom_command(OUTPUT ${_outFile}
COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
endif()

11
debian/changelog vendored

@ -1,3 +1,14 @@
qps (1.10.16-29-g7e679db-1) unstable; urgency=medium
* Cherry-picking upstream version 1.10.16-29-g7e679db.
* Removed patches, applied upstream
* Fixed VCS fields, using plain /git/
* Fixed copyrights Format field, using https
* Exported LC_ALL=C.UTF-8 to prevent problems with reproducible builds
* Set CMAKE_BUILD_TYPE=RelWithDebInfo
-- Alf Gaida <agaida@siduction.org> Fri, 22 Jul 2016 18:47:51 +0200
qps (1.10.16+20151210-3) unstable; urgency=medium
* Fixed Architecture - qps supports in the current state only

8
debian/control vendored

@ -5,15 +5,15 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: x11
Priority: optional
Build-Depends: cmake (>= 3.0.2),
debhelper (>= 9),
Build-Depends: debhelper (>= 9),
cmake (>= 3.0.2),
libxrender-dev,
libqt5x11extras5-dev,
qttools5-dev,
qttools5-dev-tools
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/qps.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/qps.git -b debian/sid
Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/qps.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/qps.git -b debian/sid
Homepage: https://github.com/qtdesktop/qps
Package: qps

2
debian/copyright vendored

@ -1,4 +1,4 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: qps
Source: http://github.com/QtDesktop/qps

@ -1,23 +0,0 @@
Description: fix the new grep behaviour
No need to care about upstream, i fixed it in upstream some days ago
Author: Alf Gaida <agaida@siduction.org>
--- qps-1.10.16+20151210.orig/cmake/LXQtTranslateDesktop.cmake
+++ qps-1.10.16+20151210/cmake/LXQtTranslateDesktop.cmake
@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
if (_translations)
list(SORT _translations)
add_custom_command(OUTPUT ${_outFile}
- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
+ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+ COMMAND grep -a -h ${_pattern} ${_translations} >> ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
else()
add_custom_command(OUTPUT ${_outFile}
- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
endif()

@ -1 +0,0 @@
fix-grep-behaviour.patch

11
debian/rules vendored

@ -1,9 +1,14 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
# export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export LC_ALL=C.UTF-8
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh ${@} --buildsystem=cmake \
dh ${@} --buildsystem cmake\
--parallel
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_BUILD_TYPE=Debug

@ -1,7 +1,7 @@
// checkboxdelegate.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "checkboxdelegate.h"

@ -1,7 +1,7 @@
// checkboxdelegate.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef CHECKBOXDELEGATE_H

@ -1,7 +1,7 @@
// command.C
// command.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include <stdlib.h>
#include <string.h>

@ -1,7 +1,7 @@
// command.h emacs, this is written in -*-c++-*-
// command.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg<EFBFBD>rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef COMMAND_H
#define COMMAND_H

@ -1,7 +1,7 @@
// commanddialog.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "commanddialog.h"

@ -1,7 +1,7 @@
// commanddialog.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef COMMANDDIALOG_H

@ -1,7 +1,7 @@
// commandmodel.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "commandmodel.h"

@ -1,4 +1,4 @@
// commandmodel.h emacs, this is written in -*-c++-*-
// commandmodel.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,7 +1,7 @@
// commandutils.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "commandutils.h"

@ -1,7 +1,7 @@
// commandutils.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef COMMANDUTILS_H
#define COMMANDUTILS_H

@ -1,4 +1,4 @@
// details.C
// details.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,4 +1,4 @@
// details.h emacs, this is written in -*-c++-*-
// details.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,4 +1,4 @@
// dialogs.C
// dialogs.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,4 +1,4 @@
// dialogs.h emacs, this is a -*-c++-*- file
// dialogs.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,7 +1,7 @@
// execwindow.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "execwindow.h"

@ -1,7 +1,7 @@
// execwindow.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef EXECWINDOW_H
#define EXECWINDOW_H

@ -1,4 +1,4 @@
// fieldsel.h emacs, this is written in -*-c++-*-
// fieldsel.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -3,7 +3,7 @@
// htable.cpp
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// TODO:
// * autoscroll speed proportional to distance from edge

@ -1,7 +1,7 @@
// htable.h emacs, this is written in -*-c++-*-
// htable.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// This file defines the HeadedTable class.
// A HeadedTable is a QTableView with one line of headers over each column.

@ -1,7 +1,7 @@
// infobar.C
// infobar.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// 13,245,200
#include <stdio.h>

@ -1,7 +1,7 @@
// infobar.h emacs, this is written in -*-c++-*-
// infobar.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef INFOBAR_H
#define INFOBAR_H

@ -1,7 +1,7 @@
// listmodel.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "listmodel.h"

@ -1,7 +1,7 @@
// listmodel.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef LISTMODEL_H
#define LISTMODEL_H

@ -1,7 +1,7 @@
// lookup.C
// lookup.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// This module implements asynchronous address->hostname lookup.

@ -1,7 +1,7 @@
// lookup.h emacs, this is written in -*-c++-*-
// lookup.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef LOOKUP_H
#define LOOKUP_H

@ -1,7 +1,7 @@
// prefs.C
// prefs.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "prefs.h"
#include "proc.h"

@ -1,7 +1,7 @@
// prefs.h emacs, this is written in -*-c++-*-
// prefs.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef PREFS_H
#define PREFS_H

@ -1,7 +1,7 @@
// proc.cpp for Linux
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// Oliver
/*

@ -1,8 +1,7 @@
// proc.h
// emacs, this is written in -*-c++-*- (who?)
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
//
#ifndef PROC_H

@ -1,7 +1,7 @@
// proc.cpp for Linux
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// Oliver
/*

@ -1,4 +1,4 @@
// proc.C
// proc.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,7 +1,7 @@
// pstable.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// ** toooo complex,so need new Design ... should be more simple.. (by
// fasthyun@magicn.com)

@ -1,7 +1,7 @@
// pstable.h emacs, this is written in -*-c++-*-
// pstable.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef PSTABLE_H
#define PSTABLE_H

@ -1,6 +1,6 @@
// qps -- Qt-based visual process status monitor
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// fasthyun@magicn.com 2005-2012
// daehyun.yang@gmail.com 2015-

@ -1,7 +1,7 @@
// qps.h emacs, this is written in -*-c++-*-
// qps.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegrd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef QPS_H
#define QPS_H

@ -1,5 +1,5 @@
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// fasthyun@magicn.com 2005-2012
// daehyun.yang@gmail.com 2015-

@ -1,5 +1,7 @@
// qpsapp.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
// fasthyun@magicn.com 2005-2012
// daehyun.yang@gmail.com 2015-

@ -1,4 +1,4 @@
// svec.C
// svec.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,4 +1,4 @@
// tablefield.h emacs, this is written in -*-c++-*-
// tablefield.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999

@ -1,7 +1,7 @@
// ttystr.C
// ttystr.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include <stdio.h>
#include <stdlib.h>

@ -1,7 +1,7 @@
// watchcond.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "watchcond.h"

@ -1,7 +1,7 @@
// watchcond.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef WATCHCOND_H
#define WATCHCOND_H

@ -1,7 +1,7 @@
// watchdialog.h
// watchdogdialog.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include "watchdogdialog.h"

@ -1,7 +1,7 @@
// watchdogdialog.cpp
// watchdogdialog.h
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdeg?rd, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#ifndef WATCHDOGDIALOG_H
#define WATCHDOGDIALOG_H

@ -1,7 +1,7 @@
// wchan.C
// wchan.cpp
//
// This program is free software. See the file COPYING for details.
// Author: Mattias Engdegård, 1997-1999
// Author: Mattias Engdegård, 1997-1999
#include <stdio.h>
#include <string.h>

Loading…
Cancel
Save