summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2019-05-05 02:42:38 +0200
committerSlávek Banko <[email protected]>2019-05-05 02:43:14 +0200
commit57d58eb0ab774d2e1689d98bcff2fc35e0940606 (patch)
treec7aa6c10798b1fc73fd54e65de6580941824ff78
parent17012e1505323967184a98a28da8bbe8b1a8762a (diff)
downloadtde-packaging-57d58eb0ab774d2e1689d98bcff2fc35e0940606.tar.gz
tde-packaging-57d58eb0ab774d2e1689d98bcff2fc35e0940606.zip
DEB kshowmail: Switch to cmake.
Add basic package documentation. The man page has been moved to the main tree. Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit ded8dc0c76e59ed36c14f7a8705aa02b4d33ee0c)
-rw-r--r--debian/_base/applications/kshowmail/debian/control2
-rw-r--r--debian/_base/applications/kshowmail/debian/docs2
-rw-r--r--debian/_base/applications/kshowmail/debian/kshowmail.162
-rw-r--r--debian/_base/applications/kshowmail/debian/manpages1
-rwxr-xr-xdebian/_base/applications/kshowmail/debian/rules46
-rw-r--r--debian/_base/applications/kshowmail/debian/watch3
-rw-r--r--ubuntu/_base/applications/kshowmail/debian/control2
-rw-r--r--ubuntu/_base/applications/kshowmail/debian/docs2
-rw-r--r--ubuntu/_base/applications/kshowmail/debian/kshowmail.162
-rw-r--r--ubuntu/_base/applications/kshowmail/debian/manpages1
-rwxr-xr-xubuntu/_base/applications/kshowmail/debian/rules46
-rw-r--r--ubuntu/_base/applications/kshowmail/debian/watch3
12 files changed, 28 insertions, 204 deletions
diff --git a/debian/_base/applications/kshowmail/debian/control b/debian/_base/applications/kshowmail/debian/control
index 86e963b17..e13d408dd 100644
--- a/debian/_base/applications/kshowmail/debian/control
+++ b/debian/_base/applications/kshowmail/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: extra
Maintainer: Timothy Pearson <[email protected]>
XSBC-Original-Maintainer: Lionel Le Folgoc <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), tdelibs14-trinity-dev, automake, libtool, libmimelib1-trinity-dev, libtqt3-compat-headers
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libmimelib1-trinity-dev
Standards-Version: 3.7.2
Package: kshowmail-trinity
diff --git a/debian/_base/applications/kshowmail/debian/docs b/debian/_base/applications/kshowmail/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/debian/_base/applications/kshowmail/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/_base/applications/kshowmail/debian/kshowmail.1 b/debian/_base/applications/kshowmail/debian/kshowmail.1
deleted file mode 100644
index 6903cf457..000000000
--- a/debian/_base/applications/kshowmail/debian/kshowmail.1
+++ /dev/null
@@ -1,62 +0,0 @@
-.TH QT: "1" "April 2007" "Qt: 3.3.7" "User Commands"
-.SH NAME
-kshowmail \- A powerful pop3 mail checker
-.SH SYNOPSIS
-.B kshowmail
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIaccount\fR]
-.SH DESCRIPTION
-KShowmail can be used to show mails on a POP3 server without actually
-downloading them. The headers or the complete mails can be viewed, and
-unwanted mails can be deleted. An initial and an interval timer can be set to
-check the mails periodical. KShowmail supports multiple accounts.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-r\fR, \fB\-\-refresh\fR
-Refresh messages now
-.TP
-\fB\-c\fR, \fB\-\-config\fR
-Launch configure dialog
-.SS "Arguments:"
-.TP
-account
-Select account
-.PP
-KDE: 3.5.6
-KShowmail: 3.1.2
-.SH "SEE ALSO"
-The full documentation for
-.B Qt:
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B Qt:
-programs are properly installed at your site, the command
-.IP
-.B info Qt:
-.PP
-should give you access to the complete manual.
diff --git a/debian/_base/applications/kshowmail/debian/manpages b/debian/_base/applications/kshowmail/debian/manpages
deleted file mode 100644
index c0449925d..000000000
--- a/debian/_base/applications/kshowmail/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kshowmail.1
diff --git a/debian/_base/applications/kshowmail/debian/rules b/debian/_base/applications/kshowmail/debian/rules
index 4d2e210a8..0f312cb4c 100755
--- a/debian/_base/applications/kshowmail/debian/rules
+++ b/debian/_base/applications/kshowmail/debian/rules
@@ -1,40 +1,16 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
- dh_testdir
-
- # Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- autoreconf --install && automake -f && \
- $(MAKE) -f admin/Makefile.common && \
- touch debian/stamp-bootstrap
-
-binary-install/kshowmail-trinity::
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
- dh_testdir
- rm -f debian/stamp-bootstrap
+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/_base/applications/kshowmail/debian/watch b/debian/_base/applications/kshowmail/debian/watch
deleted file mode 100644
index 317ab71ce..000000000
--- a/debian/_base/applications/kshowmail/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://sf.net/kshowmail/kshowmail-(.*)\.tar\.gz
diff --git a/ubuntu/_base/applications/kshowmail/debian/control b/ubuntu/_base/applications/kshowmail/debian/control
index 86e963b17..e13d408dd 100644
--- a/ubuntu/_base/applications/kshowmail/debian/control
+++ b/ubuntu/_base/applications/kshowmail/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: extra
Maintainer: Timothy Pearson <[email protected]>
XSBC-Original-Maintainer: Lionel Le Folgoc <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), tdelibs14-trinity-dev, automake, libtool, libmimelib1-trinity-dev, libtqt3-compat-headers
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libmimelib1-trinity-dev
Standards-Version: 3.7.2
Package: kshowmail-trinity
diff --git a/ubuntu/_base/applications/kshowmail/debian/docs b/ubuntu/_base/applications/kshowmail/debian/docs
new file mode 100644
index 000000000..6f12db508
--- /dev/null
+++ b/ubuntu/_base/applications/kshowmail/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/ubuntu/_base/applications/kshowmail/debian/kshowmail.1 b/ubuntu/_base/applications/kshowmail/debian/kshowmail.1
deleted file mode 100644
index 6903cf457..000000000
--- a/ubuntu/_base/applications/kshowmail/debian/kshowmail.1
+++ /dev/null
@@ -1,62 +0,0 @@
-.TH QT: "1" "April 2007" "Qt: 3.3.7" "User Commands"
-.SH NAME
-kshowmail \- A powerful pop3 mail checker
-.SH SYNOPSIS
-.B kshowmail
-[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIaccount\fR]
-.SH DESCRIPTION
-KShowmail can be used to show mails on a POP3 server without actually
-downloading them. The headers or the complete mails can be viewed, and
-unwanted mails can be deleted. An initial and an interval timer can be set to
-check the mails periodical. KShowmail supports multiple accounts.
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options
-.SH OPTIONS
-.TP
-\fB\-r\fR, \fB\-\-refresh\fR
-Refresh messages now
-.TP
-\fB\-c\fR, \fB\-\-config\fR
-Launch configure dialog
-.SS "Arguments:"
-.TP
-account
-Select account
-.PP
-KDE: 3.5.6
-KShowmail: 3.1.2
-.SH "SEE ALSO"
-The full documentation for
-.B Qt:
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B Qt:
-programs are properly installed at your site, the command
-.IP
-.B info Qt:
-.PP
-should give you access to the complete manual.
diff --git a/ubuntu/_base/applications/kshowmail/debian/manpages b/ubuntu/_base/applications/kshowmail/debian/manpages
deleted file mode 100644
index c0449925d..000000000
--- a/ubuntu/_base/applications/kshowmail/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kshowmail.1
diff --git a/ubuntu/_base/applications/kshowmail/debian/rules b/ubuntu/_base/applications/kshowmail/debian/rules
index 4d2e210a8..0f312cb4c 100755
--- a/ubuntu/_base/applications/kshowmail/debian/rules
+++ b/ubuntu/_base/applications/kshowmail/debian/rules
@@ -1,40 +1,16 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
- dh_testdir
-
- # Regenerate build system
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- autoreconf --install && automake -f && \
- $(MAKE) -f admin/Makefile.common && \
- touch debian/stamp-bootstrap
-
-binary-install/kshowmail-trinity::
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
- dh_testdir
- rm -f debian/stamp-bootstrap
+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/_base/applications/kshowmail/debian/watch b/ubuntu/_base/applications/kshowmail/debian/watch
deleted file mode 100644
index 317ab71ce..000000000
--- a/ubuntu/_base/applications/kshowmail/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://sf.net/kshowmail/kshowmail-(.*)\.tar\.gz