[kiosktool][master,r14.0.x] 68a51737,81c91f82

.gitmodules

diff --git a/.gitmodules b/.gitmodules

index 4fce771..5b98c56 100644

--- a/.gitmodules

+++ b/.gitmodules

@@ -1,6 +1,3 @@

-[submodule "admin"]

-	path = admin

-	url = http://system@.../scm/git/tde-common-admin

 [submodule "cmake"]

 	path = cmake

 	url = http://system@.../scm/git/tde-common-cmake

INSTALL

diff --git a/INSTALL b/INSTALL

new file mode 100644

index 0000000..08770a3

--- /dev/null

+++ b/INSTALL

@@ -0,0 +1,16 @@

+Basic Installation

+==================

+Kiosktool relies on cmake to build.

+Here are suggested default options:

+ -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"

Makefile.am

diff --git a/Makefile.am b/Makefile.am

deleted file mode 100644

index a91f4b2..0000000

--- a/Makefile.am

+++ /dev/null

@@ -1,8 +0,0 @@

-AUTOMAKE_OPTIONS = foreign 1.5

-include admin/deps.am

-include admin/Doxyfile.am

-$(top_srcdir)/acinclude.m4:

-SUBDIRS=$(TOPSUBDIRS)

Makefile.am.in

diff --git a/Makefile.am.in b/Makefile.am.in

deleted file mode 100644

index 99d46d8..0000000

--- a/Makefile.am.in

+++ /dev/null

@@ -1,7 +0,0 @@

-AUTOMAKE_OPTIONS = foreign 1.5

-include admin/deps.am

-include admin/Doxyfile.am

-$(top_srcdir)/acinclude.m4: $(top_srcdir)/*/*.m4

README

diff --git a/README b/README

index 7293179..d60d313 100644

--- a/README

+++ b/README

@@ -1,13 +1,14 @@

-KIOSK Admin Tool is a graphical tool for system administrators to manage on

-a system wide level KDE usage restrictions (KIOSK features) and default

-settings.

+Kiosktool - a graphical KIOSK Admin Tool for TDE.

-Please report bugs via http://bugs.kde.org under "kiosktool" component.

-For question you can use the kde-kiosk@... mailinglist.

-See https://mail.kde.org/mailman/listinfo/kde-kiosk for subscription info.

+KIOSK Admin Tool is a graphical tool for system administrators to manage

+on a system wide level TDE usage restrictions (KIOSK features) and

+default settings.

-Enjoy,

+It offers system administrators an easy way to predefine desktop

+configurations, lock down settings or otherwise restrict features of the

+TDE desktop environment.

-Waldo Bastian

-bastian@...

+It is centered around "profiles", a profile is a collection of default

+settings and restrictions that can be applied to users or groups of

+users.

VERSION

diff --git a/VERSION b/VERSION

deleted file mode 100644

index 42d4f68..0000000

--- a/VERSION

+++ /dev/null

@@ -1 +0,0 @@

-kiosktool version 1.0

acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4

deleted file mode 100644

index 13c397c..0000000

--- a/acinclude.m4

+++ /dev/null

@@ -1,11365 +0,0 @@

-##   -*- autoconf -*-

-dnl    This file is part of the KDE libraries/packages

-dnl    Copyright (C) 1997 Janos Farkas (chexum@...)

-dnl              (C) 1997,98,99 Stephan Kulow (coolo@...)

-dnl    This file is free software; you can redistribute it and/or

-dnl    modify it under the terms of the GNU Library General Public

-dnl    License as published by the Free Software Foundation; either

-dnl    version 2 of the License, or (at your option) any later version.

-dnl    This library is distributed in the hope that it will be useful,

-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of

-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-dnl    Library General Public License for more details.

-dnl    You should have received a copy of the GNU Library General Public License

-dnl    along with this library; see the file COPYING.LIB.  If not, write to

-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-dnl    Boston, MA 02111-1307, USA.

-dnl IMPORTANT NOTE:

-dnl Please do not modify this file unless you expect your modifications to be

-dnl carried into every other module in the repository.

-dnl

-dnl Single-module modifications are best placed in configure.in for tdelibs

-dnl and tdebase or configure.in.in if present.

-# KDE_PATH_X_DIRECT

-dnl Internal subroutine of AC_PATH_X.

-dnl Set ac_x_includes and/or ac_x_libraries.

-AC_DEFUN([KDE_PATH_X_DIRECT],

-[

-AC_REQUIRE([KDE_CHECK_LIB64])

-if test "$ac_x_includes" = NO; then

-  # Guess where to find include files, by looking for this one X11 .h file.

-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h

-  # First, try using that file with no special directory specified.

-AC_TRY_CPP([#include <$x_direct_test_include>],

-[# We can compile using X headers with no special include directory.

-ac_x_includes=],

-[# Look for the header file in a standard set of common directories.

-# Check X11 before X11Rn because it is often a symlink to the current release.

-  for ac_dir in               \

-    /usr/X11/include          \

-    /usr/X11R6/include        \

-    /usr/X11R5/include        \

-    /usr/X11R4/include        \

-                              \

-    /usr/include/X11          \

-    /usr/include/X11R6        \

-    /usr/include/X11R5        \

-    /usr/include/X11R4        \

-                              \

-    /usr/local/X11/include    \

-    /usr/local/X11R6/include  \

-    /usr/local/X11R5/include  \

-    /usr/local/X11R4/include  \

-                              \

-    /usr/local/include/X11    \

-    /usr/local/include/X11R6  \

-    /usr/local/include/X11R5  \

-    /usr/local/include/X11R4  \

-                              \

-    /usr/X386/include         \

-    /usr/x386/include         \

-    /usr/XFree86/include/X11  \

-                              \

-    /usr/include              \

-    /usr/local/include        \

-    /usr/unsupported/include  \

-    /usr/athena/include       \

-    /usr/local/x11r5/include  \

-    /usr/lpp/Xamples/include  \

-                              \

-    /usr/openwin/include      \

-    /usr/openwin/share/include \

-    ; \

-  do

-    if test -r "$ac_dir/$x_direct_test_include"; then

-      ac_x_includes=$ac_dir

-      break

-    fi

-  done])

-fi # $ac_x_includes = NO

-if test "$ac_x_libraries" = NO; then

-  # Check for the libraries.

-  test -z "$x_direct_test_library" && x_direct_test_library=Xt

-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc

-  # See if we find them without any special options.

-  # Don't add to $LIBS permanently.

-  ac_save_LIBS="$LIBS"

-  LIBS="-l$x_direct_test_library $LIBS"

-AC_TRY_LINK(, [${x_direct_test_function}()],

-[LIBS="$ac_save_LIBS"

-# We can link X programs with no special library path.

-ac_x_libraries=],

-[LIBS="$ac_save_LIBS"

-# First see if replacing the include by lib works.

-# Check X11 before X11Rn because it is often a symlink to the current release.

-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \

-    /usr/X11/lib${tdelibsuff}           \

-    /usr/X11R6/lib${tdelibsuff}         \

-    /usr/X11R5/lib${tdelibsuff}         \

-    /usr/X11R4/lib${tdelibsuff}         \

-                                        \

-    /usr/lib${tdelibsuff}/X11           \

-    /usr/lib${tdelibsuff}/X11R6         \

-    /usr/lib${tdelibsuff}/X11R5         \

-    /usr/lib${tdelibsuff}/X11R4         \

-                                        \

-    /usr/local/X11/lib${tdelibsuff}     \

-    /usr/local/X11R6/lib${tdelibsuff}   \

-    /usr/local/X11R5/lib${tdelibsuff}   \

-    /usr/local/X11R4/lib${tdelibsuff}   \

-                                        \

-    /usr/local/lib${tdelibsuff}/X11     \

-    /usr/local/lib${tdelibsuff}/X11R6   \

-    /usr/local/lib${tdelibsuff}/X11R5   \

-    /usr/local/lib${tdelibsuff}/X11R4   \

-                                        \

-    /usr/X386/lib${tdelibsuff}          \

-    /usr/x386/lib${tdelibsuff}          \

-    /usr/XFree86/lib${tdelibsuff}/X11   \

-                                        \

-    /usr/lib${tdelibsuff}               \

-    /usr/local/lib${tdelibsuff}         \

-    /usr/unsupported/lib${tdelibsuff}   \

-    /usr/athena/lib${tdelibsuff}        \

-    /usr/local/x11r5/lib${tdelibsuff}   \

-    /usr/lpp/Xamples/lib${tdelibsuff}   \

-    /lib/usr/lib${tdelibsuff}/X11       \

-                                        \

-    /usr/openwin/lib${tdelibsuff}       \

-    /usr/openwin/share/lib${tdelibsuff} \

-    ; \

-do

-dnl Don't even attempt the hair of trying to link an X program!

-  for ac_extension in a so sl; do

-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then

-      ac_x_libraries=$ac_dir

-      break 2

-    fi

-  done

** Diff limit reached (max: 250 lines) **

68a51737	2019-10-16 09:20:30	gregory guy
Drop automake build support. Add basic cmake build instructions in an INSTALL file. Complete the description in README. Deleted file: VERSION Signed-off-by: gregory guy <gregory-tde@...>
A INSTALL M .gitmodules M README R Makefile.am R Makefile.am.in R VERSION R acinclude.m4 R aclocal.m4 R admin R config.h.in R configure.files R configure.in R configure.in.in R doc/Makefile.am R doc/da/Makefile.am R doc/it/Makefile.am R doc/kiosktool/Makefile.am R doc/nl/Makefile.am R doc/pt/Makefile.am R doc/sv/Makefile.am R kiosktool/Makefile.am R kiosktool/configure.in.in R kiosktool/kcms/Makefile.am R kiosktool/kcms/autostart/Makefile.am R po/Makefile.am R po/bg/Makefile.am R po/br/Makefile.am R po/ca/Makefile.am R po/cs/Makefile.am R po/cy/Makefile.am R po/da/Makefile.am R po/de/Makefile.am R po/en_GB/Makefile.am R po/es/Makefile.am R po/et/Makefile.am R po/fr/Makefile.am R po/ga/Makefile.am R po/is/Makefile.am R po/it/Makefile.am R po/lt/Makefile.am R po/mt/Makefile.am R po/nl/Makefile.am R po/pt/Makefile.am R po/pt_BR/Makefile.am R po/ro/Makefile.am R po/ru/Makefile.am R po/sr/Makefile.am R po/sr@Latn/Makefile.am R po/sv/Makefile.am R po/ta/Makefile.am R po/tr/Makefile.am R stamp-h.in R subdirs
.gitmodules diff --git a/.gitmodules b/.gitmodules index 4fce771..5b98c56 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "admin"] - path = admin - url = http://system@.../scm/git/tde-common-admin [submodule "cmake"] path = cmake url = http://system@.../scm/git/tde-common-cmake INSTALL diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..08770a3 --- /dev/null +++ b/INSTALL @@ -0,0 +1,16 @@ +Basic Installation +================== + +Kiosktool relies on cmake to build. + +Here are suggested default options: + + -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" Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index a91f4b2..0000000 --- a/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.5 - -include admin/deps.am -include admin/Doxyfile.am - - -$(top_srcdir)/acinclude.m4: -SUBDIRS=$(TOPSUBDIRS) Makefile.am.in diff --git a/Makefile.am.in b/Makefile.am.in deleted file mode 100644 index 99d46d8..0000000 --- a/Makefile.am.in +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS = foreign 1.5 - -include admin/deps.am -include admin/Doxyfile.am - -$(top_srcdir)/acinclude.m4: $(top_srcdir)//.m4 - README diff --git a/README b/README index 7293179..d60d313 100644 --- a/README +++ b/README @@ -1,13 +1,14 @@ -KIOSK Admin Tool is a graphical tool for system administrators to manage on -a system wide level KDE usage restrictions (KIOSK features) and default -settings. +Kiosktool - a graphical KIOSK Admin Tool for TDE. -Please report bugs via http://bugs.kde.org under "kiosktool" component. -For question you can use the kde-kiosk@... mailinglist. -See https://mail.kde.org/mailman/listinfo/kde-kiosk for subscription info. +KIOSK Admin Tool is a graphical tool for system administrators to manage +on a system wide level TDE usage restrictions (KIOSK features) and +default settings. -Enjoy, +It offers system administrators an easy way to predefine desktop +configurations, lock down settings or otherwise restrict features of the +TDE desktop environment. -Waldo Bastian -bastian@... +It is centered around "profiles", a profile is a collection of default +settings and restrictions that can be applied to users or groups of +users. VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index 42d4f68..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -kiosktool version 1.0 acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 13c397c..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,11365 +0,0 @@ -## -- autoconf -- - -dnl This file is part of the KDE libraries/packages -dnl Copyright (C) 1997 Janos Farkas (chexum@...) -dnl (C) 1997,98,99 Stephan Kulow (coolo@...) - -dnl This file is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Library General Public -dnl License as published by the Free Software Foundation; either -dnl version 2 of the License, or (at your option) any later version. - -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Library General Public License for more details. - -dnl You should have received a copy of the GNU Library General Public License -dnl along with this library; see the file COPYING.LIB. If not, write to -dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -dnl Boston, MA 02111-1307, USA. - -dnl IMPORTANT NOTE: -dnl Please do not modify this file unless you expect your modifications to be -dnl carried into every other module in the repository. -dnl -dnl Single-module modifications are best placed in configure.in for tdelibs -dnl and tdebase or configure.in.in if present. - -# KDE_PATH_X_DIRECT -dnl Internal subroutine of AC_PATH_X. -dnl Set ac_x_includes and/or ac_x_libraries. -AC_DEFUN([KDE_PATH_X_DIRECT], -[ -AC_REQUIRE([KDE_CHECK_LIB64]) - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -AC_TRY_CPP([#include <$x_direct_test_include>], -[# We can compile using X headers with no special include directory. -ac_x_includes=], -[# Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done]) -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -AC_TRY_LINK(, [${x_direct_test_function}()], -[LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries=], -[LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" \| sed s/include/lib${tdelibsuff}/` \ - /usr/X11/lib${tdelibsuff} \ - /usr/X11R6/lib${tdelibsuff} \ - /usr/X11R5/lib${tdelibsuff} \ - /usr/X11R4/lib${tdelibsuff} \ - \ - /usr/lib${tdelibsuff}/X11 \ - /usr/lib${tdelibsuff}/X11R6 \ - /usr/lib${tdelibsuff}/X11R5 \ - /usr/lib${tdelibsuff}/X11R4 \ - \ - /usr/local/X11/lib${tdelibsuff} \ - /usr/local/X11R6/lib${tdelibsuff} \ - /usr/local/X11R5/lib${tdelibsuff} \ - /usr/local/X11R4/lib${tdelibsuff} \ - \ - /usr/local/lib${tdelibsuff}/X11 \ - /usr/local/lib${tdelibsuff}/X11R6 \ - /usr/local/lib${tdelibsuff}/X11R5 \ - /usr/local/lib${tdelibsuff}/X11R4 \ - \ - /usr/X386/lib${tdelibsuff} \ - /usr/x386/lib${tdelibsuff} \ - /usr/XFree86/lib${tdelibsuff}/X11 \ - \ - /usr/lib${tdelibsuff} \ - /usr/local/lib${tdelibsuff} \ - /usr/unsupported/lib${tdelibsuff} \ - /usr/athena/lib${tdelibsuff} \ - /usr/local/x11r5/lib${tdelibsuff} \ - /usr/lpp/Xamples/lib${tdelibsuff} \ - /lib/usr/lib${tdelibsuff}/X11 \ - \ - /usr/openwin/lib${tdelibsuff} \ - /usr/openwin/share/lib${tdelibsuff} \ - ; \ -do -dnl Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done Diff limit reached (max: 250 lines)

Branch: master

.gitmodules

INSTALL

Makefile.am

Makefile.am.in

README

VERSION

acinclude.m4