DEB tdedocker:

1) removed man file (now part of main application)
2) added Debian menu file
3) added support for cmake WITH_ALL_OPTIONS

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 11 insertions, 72 deletions

diff --git a/ubuntu/_base/applications/tdedocker/debian/rules b/ubuntu/_base/applications/tdedocker/debian/rules
index eb2a2e4b5..18aa16b96 100755
--- a/ubuntu/_base/applications/tdedocker/debian/rules
+++ b/ubuntu/_base/applications/tdedocker/debian/rules
@@ -4,6 +4,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
  -DCONFIG_INSTALL_DIR="/etc/trinity" \
@@ -12,7 +15,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
- -DBUILD_ALL="ON"
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/tdedocker/debian/tdedocker-trinity.menu b/ubuntu/_base/applications/tdedocker/debian/tdedocker-trinity.menu
new file mode 100644
index 000000000..a448b7725
--- /dev/null
+++ b/ubuntu/_base/applications/tdedocker/debian/tdedocker-trinity.menu
@@ -0,0 +1,6 @@
+?package(tdedocker-trinity):needs="X11"\
+ section="Applications/System/Monitoring"\
+ title="TDEDocker"\
+ command="/opt/trinity/bin/tdedocker"\
+ hints="TDE"\
+ icon="/opt/trinity/share/apps/tdedocker/icons/tdedocker.xpm"
diff --git a/ubuntu/_base/applications/tdedocker/debian/tdedocker.1 b/ubuntu/_base/applications/tdedocker/debian/tdedocker.1
deleted file mode 100644
index 989963e39..000000000
--- a/ubuntu/_base/applications/tdedocker/debian/tdedocker.1
+++ /dev/null
@@ -1,68 +0,0 @@
-.TH KDOCKER 1 
-.SH NAME
-tdedocker \- puts everything to traybar
-.SH SYNOPSIS
-.B tdedocker
-.RI [ options ]
-.br
-.SH DESCRIPTION
-This manual page documents briefly the
-.B tdedocker
-command.
-.PP
-\fBtdedocker\fP is a program that puts every application to the system tray.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-a
-Show author information. Yup, about me.
-.TP
-.B \-b
-Suppress the warning dialog when docking non-normal windows (blind mode)
-.TP
-.B \-d
-Disable session management. TDEDocker will not attempt to redock this application when you relogin.
-.TP
-.B \-e 
-Enable session management. TDEDocker will attempt to redock this application when you relogin. .B[default]
-.TP
-.B \-f
-Dock window that has the focus(active window).
-.TP
-.B \-i "icon"
-Custom dock icon.
-.TP
-.B \-h
-Show summary of options.
-.TP
-.B \-l
-Launch on startup
-.TP
-.B \-m
-Keep application window mapped (dont hide on dock)
-.TP
-.B \-o
-Dock when obscured
-.TP
-.B \-p "secs"
-By default, when the title of the application changes, it is  ballooned from the system tray for 4 seconds. Works excellently with xmms
-.TP
-.B \-q
-Disable ballooning title changes (quiet)
-.TP
-.B \-t
-Remove this application from the task bar
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-w "wid"
-Window id of the application to dock
-.br
-.SH AUTHOR
-tdedocker was written by Girish Ramakrishnan ([email protected]).
-.PP
-This manual page was written by Lorenzo Villani <[email protected]>,
-for the Ubuntu project (but may be used by others).