diff --git a/CMakeLists.txt b/CMakeLists.txt index d8e22e8..4f7a5d8 100644 --- 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}) diff --git a/LICENSE b/COPYING similarity index 100% rename from LICENSE rename to COPYING diff --git a/cmake/LXQtTranslateDesktop.cmake b/cmake/LXQtTranslateDesktop.cmake index a984d71..63b0ea5 100644 --- 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() diff --git a/debian/changelog b/debian/changelog index 301e123..b7a598a 100644 --- 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 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 diff --git a/debian/control b/debian/control index 31820c2..f50404d 100644 --- a/debian/control +++ b/debian/control @@ -5,15 +5,15 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) 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 diff --git a/debian/copyright b/debian/copyright index 83ae11e..d165a24 100644 --- 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 diff --git a/debian/patches/fix-grep-behaviour.patch b/debian/patches/fix-grep-behaviour.patch deleted file mode 100644 index 0b0fb76..0000000 --- a/debian/patches/fix-grep-behaviour.patch +++ /dev/null @@ -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 - ---- 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() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index daed377..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-grep-behaviour.patch diff --git a/debian/rules b/debian/rules index a49e602..5574231 100755 --- 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 diff --git a/src/checkboxdelegate.cpp b/src/checkboxdelegate.cpp index 82dd4f3..2479941 100644 --- 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" diff --git a/src/checkboxdelegate.h b/src/checkboxdelegate.h index a73d2d2..66b8650 100644 --- 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 diff --git a/src/command.cpp b/src/command.cpp index bb46237..22bde6c 100644 --- 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 #include diff --git a/src/command.h b/src/command.h index 9cde651..8f4824c 100644 --- 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�rd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 #ifndef COMMAND_H #define COMMAND_H diff --git a/src/commanddialog.cpp b/src/commanddialog.cpp index 3aaf029..68cf22b 100644 --- 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" diff --git a/src/commanddialog.h b/src/commanddialog.h index e3e8c9e..6979da0 100644 --- 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 diff --git a/src/commandmodel.cpp b/src/commandmodel.cpp index 0fed974..d9e0a12 100644 --- 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" diff --git a/src/commandmodel.h b/src/commandmodel.h index 64fd598..5c8f7f3 100644 --- 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 diff --git a/src/commandutils.cpp b/src/commandutils.cpp index 4525264..53ae849 100644 --- 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" diff --git a/src/commandutils.h b/src/commandutils.h index 5249069..64b7637 100644 --- 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 diff --git a/src/details.cpp b/src/details.cpp index f9c4cb8..4ca8002 100644 --- 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 Engdegrd, 1997-1999 diff --git a/src/details.h b/src/details.h index 28d1ae8..445e2a7 100644 --- 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 Engdegrd, 1997-1999 diff --git a/src/dialogs.cpp b/src/dialogs.cpp index 522b560..54b0100 100644 --- 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 Engdegrd, 1997-1999 diff --git a/src/dialogs.h b/src/dialogs.h index d70296a..d57682b 100644 --- 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 Engdegrd, 1997-1999 diff --git a/src/execwindow.cpp b/src/execwindow.cpp index 90707ac..40c457a 100644 --- 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" diff --git a/src/execwindow.h b/src/execwindow.h index f081e27..933a988 100644 --- 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 diff --git a/src/fieldsel.h b/src/fieldsel.h index e9dc952..0e3b266 100644 --- 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 Engdegrd, 1997-1999 diff --git a/src/htable.cpp b/src/htable.cpp index 67cea83..b1b8377 100644 --- 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 diff --git a/src/htable.h b/src/htable.h index bb9231f..e3ed662 100644 --- 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. diff --git a/src/infobar.cpp b/src/infobar.cpp index ebfe1f4..0ff1cf2 100644 --- 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 diff --git a/src/infobar.h b/src/infobar.h index 63c0c6c..5090294 100644 --- 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 diff --git a/src/listmodel.cpp b/src/listmodel.cpp index 87119e8..3b73325 100644 --- 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" diff --git a/src/listmodel.h b/src/listmodel.h index 9f76e49..9be3901 100644 --- 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 diff --git a/src/lookup.cpp b/src/lookup.cpp index 3ce5d73..3a2e28a 100644 --- 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 Engdegrd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 // This module implements asynchronous address->hostname lookup. diff --git a/src/lookup.h b/src/lookup.h index 572329f..58c57e1 100644 --- 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 Engdegrd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 #ifndef LOOKUP_H #define LOOKUP_H diff --git a/src/prefs.cpp b/src/prefs.cpp index 189ba9e..757d5aa 100644 --- 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" diff --git a/src/prefs.h b/src/prefs.h index 5c6324c..205cc6a 100644 --- 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 Engdegrd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 #ifndef PREFS_H #define PREFS_H diff --git a/src/proc.cpp b/src/proc.cpp index 8f8cd8e..e79fff2 100644 --- 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 /* diff --git a/src/proc.h b/src/proc.h index efa7c75..d97825f 100644 --- 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 diff --git a/src/proc_linux.cpp b/src/proc_linux.cpp index 8f8cd8e..e79fff2 100644 --- 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 /* diff --git a/src/proc_mosix.cpp b/src/proc_mosix.cpp index 39eac20..348e64d 100644 --- 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 diff --git a/src/pstable.cpp b/src/pstable.cpp index 55a6d60..e6daaf8 100644 --- 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) diff --git a/src/pstable.h b/src/pstable.h index 6d69dc0..1f88a1e 100644 --- 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 Engdegrd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 #ifndef PSTABLE_H #define PSTABLE_H diff --git a/src/qps.cpp b/src/qps.cpp index 2d07b46..9cf4611 100644 --- 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- diff --git a/src/qps.h b/src/qps.h index 91f1c7d..e488bdf 100644 --- 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 diff --git a/src/qpsapp.cpp b/src/qpsapp.cpp index 7118bb8..479ca93 100644 --- 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- diff --git a/src/qpsapp.h b/src/qpsapp.h index 2ed536c..e19ef75 100644 --- 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- diff --git a/src/svec.cpp b/src/svec.cpp index d738cc6..e859d05 100644 --- 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 Engdegrd, 1997-1999 diff --git a/src/tablefield.h b/src/tablefield.h index c8c4f18..742d6f9 100644 --- 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 diff --git a/src/ttystr.cpp b/src/ttystr.cpp index ae86919..cc080d5 100644 --- 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 Engdegrd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 #include #include diff --git a/src/watchcond.cpp b/src/watchcond.cpp index 9fd5623..4cd11ea 100644 --- 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" diff --git a/src/watchcond.h b/src/watchcond.h index d4d02c0..6b4bbee 100644 --- 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 diff --git a/src/watchdogdialog.cpp b/src/watchdogdialog.cpp index a47e548..49fbb89 100644 --- 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" diff --git a/src/watchdogdialog.h b/src/watchdogdialog.h index 50af4b8..7b19254 100644 --- 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 diff --git a/src/wchan.cpp b/src/wchan.cpp index ae7d227..73472eb 100644 --- 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 Engdegrd, 1997-1999 +// Author: Mattias Engdegård, 1997-1999 #include #include