diff options
24 files changed, 69 insertions, 975 deletions
diff --git a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/kiosktool/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -111,6 +114,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk b/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk +++ b/debian/lenny/applications/kiosktool/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/lenny/applications/kiosktool/debian/control b/debian/lenny/applications/kiosktool/debian/control index 7ad2ca2ad..1f7d50230 100644 --- a/debian/lenny/applications/kiosktool/debian/control +++ b/debian/lenny/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/debian/lenny/applications/kiosktool/debian/docs b/debian/lenny/applications/kiosktool/debian/docs new file mode 100644 index 000000000..724e08449 --- /dev/null +++ b/debian/lenny/applications/kiosktool/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 deleted file mode 100644 index 40cc5a987..000000000 --- a/debian/lenny/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 +++ /dev/null @@ -1,146 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "Trinity Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." -.SH NAME -kiosktool\-tdedirs -\- A tool to set $TDEDIRS according to the current user profile. -.SH SYNOPSIS -kiosktool\-tdedirs [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION - -.SH OPTIONS -.SS Options: -.TP -.B \-\-check -Output currently active prefixes -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kiosktool\-tdedirs/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-tdedirs/'" -from the command\-line. -.br -.SH AUTHORS -.nf - diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1 deleted file mode 100644 index ef684635d..000000000 --- a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.1 +++ /dev/null @@ -1,150 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL 1 "Ago 2004" "Trinity Desktop Environment" "KIOSK Admin Tool" -.SH NAME -kiosktool -\- KIOSK Admin Tool -.SH SYNOPSIS -kiosktool [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION -With this application we can lock the access to some parts of Trinity desktop -and its applications. - -.SH OPTIONS -.SS Options: -.TP -.B \-\-tderc <file> -tderc file to save settings to [/etc/tderc] -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kiosktool/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool/'" -from the command\-line. -.br -.SH AUTHORS -.nf -Waldo Bastian <bastian@kde.org> -.br - diff --git a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages deleted file mode 100644 index 43bd4d1b8..000000000 --- a/debian/lenny/applications/kiosktool/debian/kiosktool-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/kiosktool-trinity.1 -debian/kiosktool-tdedirs-trinity.1 diff --git a/debian/lenny/applications/kiosktool/debian/rules b/debian/lenny/applications/kiosktool/debian/rules index f47a41614..d8d772064 100755 --- a/debian/lenny/applications/kiosktool/debian/rules +++ b/debian/lenny/applications/kiosktool/debian/rules @@ -1,32 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include debian/cdbs/kde.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -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 - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -111,6 +114,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/kde.mk b/debian/squeeze/applications/kiosktool/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/debian/squeeze/applications/kiosktool/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/kiosktool/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/debian/squeeze/applications/kiosktool/debian/control b/debian/squeeze/applications/kiosktool/debian/control index 7ad2ca2ad..1f7d50230 100644 --- a/debian/squeeze/applications/kiosktool/debian/control +++ b/debian/squeeze/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/debian/squeeze/applications/kiosktool/debian/docs b/debian/squeeze/applications/kiosktool/debian/docs new file mode 100644 index 000000000..724e08449 --- /dev/null +++ b/debian/squeeze/applications/kiosktool/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/debian/squeeze/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 deleted file mode 100644 index 40cc5a987..000000000 --- a/debian/squeeze/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 +++ /dev/null @@ -1,146 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "Trinity Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." -.SH NAME -kiosktool\-tdedirs -\- A tool to set $TDEDIRS according to the current user profile. -.SH SYNOPSIS -kiosktool\-tdedirs [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION - -.SH OPTIONS -.SS Options: -.TP -.B \-\-check -Output currently active prefixes -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kiosktool\-tdedirs/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-tdedirs/'" -from the command\-line. -.br -.SH AUTHORS -.nf - diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 deleted file mode 100644 index ef684635d..000000000 --- a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.1 +++ /dev/null @@ -1,150 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL 1 "Ago 2004" "Trinity Desktop Environment" "KIOSK Admin Tool" -.SH NAME -kiosktool -\- KIOSK Admin Tool -.SH SYNOPSIS -kiosktool [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION -With this application we can lock the access to some parts of Trinity desktop -and its applications. - -.SH OPTIONS -.SS Options: -.TP -.B \-\-tderc <file> -tderc file to save settings to [/etc/tderc] -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kiosktool/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool/'" -from the command\-line. -.br -.SH AUTHORS -.nf -Waldo Bastian <bastian@kde.org> -.br - diff --git a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages b/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages deleted file mode 100644 index 43bd4d1b8..000000000 --- a/debian/squeeze/applications/kiosktool/debian/kiosktool-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/kiosktool-trinity.1 -debian/kiosktool-tdedirs-trinity.1 diff --git a/debian/squeeze/applications/kiosktool/debian/rules b/debian/squeeze/applications/kiosktool/debian/rules index 37ab84978..18b1c07e2 100755 --- a/debian/squeeze/applications/kiosktool/debian/rules +++ b/debian/squeeze/applications/kiosktool/debian/rules @@ -1,32 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include debian/cdbs/kde.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -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 - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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/kiosktool/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk index 9920696ce..32ba4acfb 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/kiosktool/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: +ifndef _cdbs_class_cmake cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh @@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh endif $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches @@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: +ifndef _cdbs_class_cmake if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ cd $(DEB_SRCDIR); \ find . -name Makefile.in -print | \ @@ -111,6 +114,7 @@ clean:: configure configure.files configure.in stamp-h.in \ subdirs; \ fi +endif rm -f debian/stamp-cvs-make endif diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk index 765560c89..023886fc8 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk @@ -35,7 +35,9 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif +ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +61,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kiosktool/debian/control b/ubuntu/maverick/applications/kiosktool/debian/control index 7ad2ca2ad..1f7d50230 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/control +++ b/ubuntu/maverick/applications/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/ubuntu/maverick/applications/kiosktool/debian/docs b/ubuntu/maverick/applications/kiosktool/debian/docs new file mode 100644 index 000000000..724e08449 --- /dev/null +++ b/ubuntu/maverick/applications/kiosktool/debian/docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 deleted file mode 100644 index 40cc5a987..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-tdedirs-trinity.1 +++ /dev/null @@ -1,146 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL\-TDEDIRS 1 "Ago 2004" "Trinity Desktop Environment" "A tool to set $TDEDIRS according to the current user profile." -.SH NAME -kiosktool\-tdedirs -\- A tool to set $TDEDIRS according to the current user profile. -.SH SYNOPSIS -kiosktool\-tdedirs [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION - -.SH OPTIONS -.SS Options: -.TP -.B \-\-check -Output currently active prefixes -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kiosktool\-tdedirs/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool\-tdedirs/'" -from the command\-line. -.br -.SH AUTHORS -.nf - diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 deleted file mode 100644 index ef684635d..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.1 +++ /dev/null @@ -1,150 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KIOSKTOOL 1 "Ago 2004" "Trinity Desktop Environment" "KIOSK Admin Tool" -.SH NAME -kiosktool -\- KIOSK Admin Tool -.SH SYNOPSIS -kiosktool [Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION -With this application we can lock the access to some parts of Trinity desktop -and its applications. - -.SH OPTIONS -.SS Options: -.TP -.B \-\-tderc <file> -tderc file to save settings to [/etc/tderc] -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar. -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon. -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar. -.TP -.B \-\-config <filename> -Use alternative configuration file. -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server'. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.B \-\-style <style> -sets the application GUI style. -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget. -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname'. -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId'. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display. -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification. -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard. -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font. -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color. -.TP -.B \-\-btn, \-\-button <color> -sets the default button color. -.TP -.B \-\-name <name> -sets the application name. -.TP -.B \-\-title <title> -sets the application title (caption). -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display. -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root. -.TP -.B \-\-im <XIM server> -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kiosktool/ -directly into konqueror or you can run -.BR "`khelpcenter help:/kiosktool/'" -from the command\-line. -.br -.SH AUTHORS -.nf -Waldo Bastian <bastian@kde.org> -.br - diff --git a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages b/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages deleted file mode 100644 index 43bd4d1b8..000000000 --- a/ubuntu/maverick/applications/kiosktool/debian/kiosktool-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/kiosktool-trinity.1 -debian/kiosktool-tdedirs-trinity.1 diff --git a/ubuntu/maverick/applications/kiosktool/debian/rules b/ubuntu/maverick/applications/kiosktool/debian/rules index 37ab84978..18b1c07e2 100755 --- a/ubuntu/maverick/applications/kiosktool/debian/rules +++ b/ubuntu/maverick/applications/kiosktool/debian/rules @@ -1,32 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk #include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include debian/cdbs/kde.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) +include debian/cdbs/debian-qt-kde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -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 - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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" |