From 956ebb628b57efe28f2d33f35f3fa26c4e5c9414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 2 Sep 2018 02:26:31 +0200 Subject: DEB knetload: Switch to cmake The man page has been moved to the main tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/applications/knetload/debian/control | 2 +- .../knetload/debian/knetload-trinity.manpages | 1 - .../lenny/applications/knetload/debian/knetload.1 | 56 ---------------------- debian/lenny/applications/knetload/debian/rules | 13 ++++- .../squeeze/applications/knetload/debian/control | 2 +- .../knetload/debian/knetload-trinity.manpages | 1 - .../applications/knetload/debian/knetload.1 | 56 ---------------------- debian/squeeze/applications/knetload/debian/rules | 13 ++++- .../maverick/applications/knetload/debian/control | 2 +- .../knetload/debian/knetload-trinity.manpages | 1 - .../applications/knetload/debian/knetload.1 | 56 ---------------------- ubuntu/maverick/applications/knetload/debian/rules | 13 ++++- 12 files changed, 36 insertions(+), 180 deletions(-) delete mode 100644 debian/lenny/applications/knetload/debian/knetload-trinity.manpages delete mode 100644 debian/lenny/applications/knetload/debian/knetload.1 delete mode 100644 debian/squeeze/applications/knetload/debian/knetload-trinity.manpages delete mode 100644 debian/squeeze/applications/knetload/debian/knetload.1 delete mode 100644 ubuntu/maverick/applications/knetload/debian/knetload-trinity.manpages delete mode 100644 ubuntu/maverick/applications/knetload/debian/knetload.1 diff --git a/debian/lenny/applications/knetload/debian/control b/debian/lenny/applications/knetload/debian/control index 10d4ca81f..906895d1c 100644 --- a/debian/lenny/applications/knetload/debian/control +++ b/debian/lenny/applications/knetload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Helen Faulkner -Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/debian/lenny/applications/knetload/debian/knetload-trinity.manpages b/debian/lenny/applications/knetload/debian/knetload-trinity.manpages deleted file mode 100644 index 23359fce1..000000000 --- a/debian/lenny/applications/knetload/debian/knetload-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/knetload.1 diff --git a/debian/lenny/applications/knetload/debian/knetload.1 b/debian/lenny/applications/knetload/debian/knetload.1 deleted file mode 100644 index ba26dcda1..000000000 --- a/debian/lenny/applications/knetload/debian/knetload.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KNETLOAD 1 "January 14, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -knetload \- a network meter for Kicker -.SH SYNOPSIS -.B knetload -.RI "[ " generic-options " ]" -.SH DESCRIPTION -\fBKNetLoad\fP is a small program for Kicker (the TDE panel). It -shows a recent history of network usage in the form of two -configurable diagrams in the system tray, one for incoming and one -for outgoing data. -These diagrams have settings for colors and various different styles. -.PP -Left click on a diagram to bring up a small information box which -will show the exact input and output rates in text form as well as -the total amount incoming and outgoing data. -.PP -Note that before KNetLoad can be useful you must select which -network device it should monitor and select an appropriate scaling -value that reflects the speed of this network device. -.PP -KNetLoad can monitor almost any network device; if your device is -not in the predefined list of devices (such as eth0, ppp0 and -ippp0) then you can type in your own device. -.SH OPTIONS -For a full summary of options, run \fIknetload \-\-help\fP. -.SH SEE ALSO -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/knetload/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/knetload/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can -read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/knetload/\fP. -.SH AUTHOR -KNetLoad was written by Flameeyes , -Markus Gustavsson and Ben Burton . diff --git a/debian/lenny/applications/knetload/debian/rules b/debian/lenny/applications/knetload/debian/rules index 2e9187a31..ca60faf9f 100755 --- a/debian/lenny/applications/knetload/debian/rules +++ b/debian/lenny/applications/knetload/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk @@ -13,5 +14,13 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -binary-install/knetload-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/debian/squeeze/applications/knetload/debian/control b/debian/squeeze/applications/knetload/debian/control index 10d4ca81f..906895d1c 100644 --- a/debian/squeeze/applications/knetload/debian/control +++ b/debian/squeeze/applications/knetload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Helen Faulkner -Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/debian/squeeze/applications/knetload/debian/knetload-trinity.manpages b/debian/squeeze/applications/knetload/debian/knetload-trinity.manpages deleted file mode 100644 index 23359fce1..000000000 --- a/debian/squeeze/applications/knetload/debian/knetload-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/knetload.1 diff --git a/debian/squeeze/applications/knetload/debian/knetload.1 b/debian/squeeze/applications/knetload/debian/knetload.1 deleted file mode 100644 index ba26dcda1..000000000 --- a/debian/squeeze/applications/knetload/debian/knetload.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KNETLOAD 1 "January 14, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -knetload \- a network meter for Kicker -.SH SYNOPSIS -.B knetload -.RI "[ " generic-options " ]" -.SH DESCRIPTION -\fBKNetLoad\fP is a small program for Kicker (the TDE panel). It -shows a recent history of network usage in the form of two -configurable diagrams in the system tray, one for incoming and one -for outgoing data. -These diagrams have settings for colors and various different styles. -.PP -Left click on a diagram to bring up a small information box which -will show the exact input and output rates in text form as well as -the total amount incoming and outgoing data. -.PP -Note that before KNetLoad can be useful you must select which -network device it should monitor and select an appropriate scaling -value that reflects the speed of this network device. -.PP -KNetLoad can monitor almost any network device; if your device is -not in the predefined list of devices (such as eth0, ppp0 and -ippp0) then you can type in your own device. -.SH OPTIONS -For a full summary of options, run \fIknetload \-\-help\fP. -.SH SEE ALSO -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/knetload/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/knetload/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can -read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/knetload/\fP. -.SH AUTHOR -KNetLoad was written by Flameeyes , -Markus Gustavsson and Ben Burton . diff --git a/debian/squeeze/applications/knetload/debian/rules b/debian/squeeze/applications/knetload/debian/rules index da5805782..e039e1a72 100755 --- a/debian/squeeze/applications/knetload/debian/rules +++ b/debian/squeeze/applications/knetload/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk @@ -13,5 +14,13 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -binary-install/knetload-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/maverick/applications/knetload/debian/control b/ubuntu/maverick/applications/knetload/debian/control index 60c84d00a..20ffdb6bc 100644 --- a/ubuntu/maverick/applications/knetload/debian/control +++ b/ubuntu/maverick/applications/knetload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Helen Faulkner -Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, tdelibs14-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/ubuntu/maverick/applications/knetload/debian/knetload-trinity.manpages b/ubuntu/maverick/applications/knetload/debian/knetload-trinity.manpages deleted file mode 100644 index 23359fce1..000000000 --- a/ubuntu/maverick/applications/knetload/debian/knetload-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/knetload.1 diff --git a/ubuntu/maverick/applications/knetload/debian/knetload.1 b/ubuntu/maverick/applications/knetload/debian/knetload.1 deleted file mode 100644 index ba26dcda1..000000000 --- a/ubuntu/maverick/applications/knetload/debian/knetload.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KNETLOAD 1 "January 14, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -knetload \- a network meter for Kicker -.SH SYNOPSIS -.B knetload -.RI "[ " generic-options " ]" -.SH DESCRIPTION -\fBKNetLoad\fP is a small program for Kicker (the TDE panel). It -shows a recent history of network usage in the form of two -configurable diagrams in the system tray, one for incoming and one -for outgoing data. -These diagrams have settings for colors and various different styles. -.PP -Left click on a diagram to bring up a small information box which -will show the exact input and output rates in text form as well as -the total amount incoming and outgoing data. -.PP -Note that before KNetLoad can be useful you must select which -network device it should monitor and select an appropriate scaling -value that reflects the speed of this network device. -.PP -KNetLoad can monitor almost any network device; if your device is -not in the predefined list of devices (such as eth0, ppp0 and -ippp0) then you can type in your own device. -.SH OPTIONS -For a full summary of options, run \fIknetload \-\-help\fP. -.SH SEE ALSO -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/knetload/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/knetload/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can -read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/knetload/\fP. -.SH AUTHOR -KNetLoad was written by Flameeyes , -Markus Gustavsson and Ben Burton . diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules index da5805782..e039e1a72 100755 --- a/ubuntu/maverick/applications/knetload/debian/rules +++ b/ubuntu/maverick/applications/knetload/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-qt-kde.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk @@ -13,5 +14,13 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -binary-install/knetload-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" -- cgit v1.2.1