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
2016-07-22 18:48:13 +02:00 · 2016-07-22 18:48:13 +02:00 · 366a191d66
commit 366a191d66
parent bc7d180d99
54 changed files with 91 additions and 98 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -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})
--- a/0
+++ b/0
--- a/cmake/LXQtTranslateDesktop.cmake
+++ b/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 -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()
--- a/debian/changelog
+++ b/debian/changelog
@ -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
--- a/debian/control
+++ b/debian/control
@ -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
--- a/debian/copyright
+++ b/debian/copyright
@ -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

--- a/debian/patches/fix-grep-behaviour.patch
+++ b/debian/patches/fix-grep-behaviour.patch
@ -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()
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1 +0,0 @@
-fix-grep-behaviour.patch
--- a/debian/rules
+++ b/debian/rules
@ -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
--- a/src/checkboxdelegate.cpp
+++ b/src/checkboxdelegate.cpp
@ -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"

--- a/src/checkboxdelegate.h
+++ b/src/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
--- a/src/command.cpp
+++ b/src/command.cpp
@ -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>
--- a/src/command.h
+++ b/src/command.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
--- a/src/commanddialog.cpp
+++ b/src/commanddialog.cpp
@ -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"

--- a/src/commanddialog.h
+++ b/src/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
--- a/src/commandmodel.cpp
+++ b/src/commandmodel.cpp
@ -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"

--- a/src/commandmodel.h
+++ b/src/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
--- a/src/commandutils.cpp
+++ b/src/commandutils.cpp
@ -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"

--- a/src/commandutils.h
+++ b/src/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
--- a/src/details.cpp
+++ b/src/details.cpp
@ -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
--- a/src/details.h
+++ b/src/details.h
@ -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
--- a/src/dialogs.cpp
+++ b/src/dialogs.cpp
@ -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
--- a/src/dialogs.h
+++ b/src/dialogs.h
@ -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
--- a/src/execwindow.cpp
+++ b/src/execwindow.cpp
@ -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"

--- a/src/execwindow.h
+++ b/src/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 
--- a/src/fieldsel.h
+++ b/src/fieldsel.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
--- a/src/htable.cpp
+++ b/src/htable.cpp
@ -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
--- a/src/htable.h
+++ b/src/htable.h
@ -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.
--- a/src/infobar.cpp
+++ b/src/infobar.cpp
@ -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>
--- a/src/infobar.h
+++ b/src/infobar.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
--- a/src/listmodel.cpp
+++ b/src/listmodel.cpp
@ -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"

--- a/src/listmodel.h
+++ b/src/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
--- a/src/lookup.cpp
+++ b/src/lookup.cpp
@ -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.

--- a/src/lookup.h
+++ b/src/lookup.h
@ -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
--- a/src/prefs.cpp
+++ b/src/prefs.cpp
@ -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"
--- a/src/prefs.h
+++ b/src/prefs.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
--- a/src/proc.cpp
+++ b/src/proc.cpp
@ -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

 /*
--- a/src/proc.h
+++ b/src/proc.h
@ -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
--- a/src/proc_linux.cpp
+++ b/src/proc_linux.cpp
@ -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

 /*
--- a/src/proc_mosix.cpp
+++ b/src/proc_mosix.cpp
@ -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
--- a/src/pstable.cpp
+++ b/src/pstable.cpp
@ -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)
--- a/src/pstable.h
+++ b/src/pstable.h
@ -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
--- a/src/qps.cpp
+++ b/src/qps.cpp
@ -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-

--- a/src/qps.h
+++ b/src/qps.h
@ -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
--- a/src/qpsapp.cpp
+++ b/src/qpsapp.cpp
@ -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-

--- a/src/qpsapp.h
+++ b/src/qpsapp.h
@ -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-

--- a/src/svec.cpp
+++ b/src/svec.cpp
@ -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
--- a/src/tablefield.h
+++ b/src/tablefield.h
@ -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
--- a/src/ttystr.cpp
+++ b/src/ttystr.cpp
@ -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>
--- a/src/watchcond.cpp
+++ b/src/watchcond.cpp
@ -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"

--- a/src/watchcond.h
+++ b/src/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
--- a/src/watchdogdialog.cpp
+++ b/src/watchdogdialog.cpp
@ -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"

--- a/src/watchdogdialog.h
+++ b/src/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
--- a/src/wchan.cpp
+++ b/src/wchan.cpp
@ -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>