From ca57a59e95c71d37c8f7ddf8024c64c8bcae0890 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 15 Feb 2020 13:48:45 +0900 Subject: Renamed release_notes to tde_release_notes. Signed-off-by: Michele Calgaro --- CMakeLists.txt | 6 ++--- Makefile.am.in | 2 +- doc/releasenotes/CMakeLists.txt | 2 +- doc/releasenotes/Makefile.am | 2 +- doc/releasenotes/release_notes.desktop | 9 -------- doc/releasenotes/tde_release_notes.desktop | 9 ++++++++ release_notes | 35 ------------------------------ tde_release_notes | 35 ++++++++++++++++++++++++++++++ 8 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 doc/releasenotes/release_notes.desktop create mode 100644 doc/releasenotes/tde_release_notes.desktop delete mode 100644 release_notes create mode 100644 tde_release_notes diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e47a6d15..51dfa2cfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,6 +218,7 @@ check_type_size( "long long" LONG_LONG ) ##### tdebase directories ####################### add_subdirectory( tdmlib ) +add_subdirectory( kcontrol ) tde_conditional_add_subdirectory( BUILD_TDEINIT tdeinit ) tde_conditional_add_subdirectory( BUILD_L10N l10n ) @@ -226,7 +227,6 @@ tde_conditional_add_subdirectory( BUILD_APPLNK applnk ) tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq ) tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit ) -add_subdirectory( kcontrol ) tde_conditional_add_subdirectory( BUILD_TWIN twin ) tde_conditional_add_subdirectory( BUILD_KATE kate ) tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror ) @@ -271,8 +271,8 @@ tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration ) ##### install starttde & related stuff ########## if( BUILD_STARTTDE ) - install( PROGRAMS starttde DESTINATION ${BIN_INSTALL_DIR} ) - install( PROGRAMS migratekde3 r14-xdg-update release_notes DESTINATION ${BIN_INSTALL_DIR} ) + install( PROGRAMS starttde migratekde3 r14-xdg-update tde_release_notes + DESTINATION ${BIN_INSTALL_DIR} ) endif() diff --git a/Makefile.am.in b/Makefile.am.in index e32d5632f..793c08688 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -9,7 +9,7 @@ COMPILE_AFTER_kcontrol = tdm kdesktop AUTOMAKE_OPTIONS = foreign 1.6.1 -bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update release_notes +bin_SCRIPTS = starttde migratekde3 r14-xdg-update tde_release_notes EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv diff --git a/doc/releasenotes/CMakeLists.txt b/doc/releasenotes/CMakeLists.txt index d4dcd347b..4392e53e4 100644 --- a/doc/releasenotes/CMakeLists.txt +++ b/doc/releasenotes/CMakeLists.txt @@ -8,4 +8,4 @@ tde_create_handbook( DESTINATION khelpcenter/releasenotes ) -install( FILES release_notes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) +install( FILES tde_release_notes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) diff --git a/doc/releasenotes/Makefile.am b/doc/releasenotes/Makefile.am index 1778da0ca..b6849ee28 100644 --- a/doc/releasenotes/Makefile.am +++ b/doc/releasenotes/Makefile.am @@ -1,6 +1,6 @@ KDE_LANG = en KDE_DOCS = khelpcenter/releasenotes -autostart_DATA = release_notes.desktop +autostart_DATA = tde_release_notes.desktop autostartdir = $(datadir)/autostart diff --git a/doc/releasenotes/release_notes.desktop b/doc/releasenotes/release_notes.desktop deleted file mode 100644 index 64a324853..000000000 --- a/doc/releasenotes/release_notes.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=release_notes -Exec=release_notes -Type=Application -X-TDE-autostart-phase=2 -X-TDE-StartupNotify=false -X-TDE-UniqueApplet=true -Categories=System; diff --git a/doc/releasenotes/tde_release_notes.desktop b/doc/releasenotes/tde_release_notes.desktop new file mode 100644 index 000000000..eb82e1dea --- /dev/null +++ b/doc/releasenotes/tde_release_notes.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=tde_release_notes +Exec=tde_release_notes +Type=Application +X-TDE-autostart-phase=2 +X-TDE-StartupNotify=false +X-TDE-UniqueApplet=true +Categories=System; diff --git a/release_notes b/release_notes deleted file mode 100644 index bffb9f453..000000000 --- a/release_notes +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# A script to open/autostart the release notes in the help -# handbook, but only once. - -# Run this script from the global autostart directory. - -# When the release version increments, this script will detect the -# difference through tde-config and a respective key in kdeglobals. -# This script then will open the release notes for that next release. -# The only file to update is: tdebase/doc/releasenotes/release_notes.docbook. - -# As this script is run as a global TDE autostart app, all -# environment variables should already be set. - -if [ "$TDEDIR" = "" ] || [ "$TDEHOME" = "" ]; then - exit 1 -fi - -RELEASE_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: ||p' )" -RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )" - -if [ "$RELEASE_NOTES" = "" ] || [ "$RELEASE_NOTES" != "true" ]; then - echo "[release_notes] Release version: $RELEASE_VERSION" - echo "[release_notes] Release notes: $RELEASE_NOTES" - if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes ; then - ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" --type bool "true" - fi - RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )" - echo "[release_notes] Release notes: $RELEASE_NOTES" -fi - -unset RELEASE_NOTES RELEASE_VERSION -exit 0 - diff --git a/tde_release_notes b/tde_release_notes new file mode 100644 index 000000000..bd4e27e0d --- /dev/null +++ b/tde_release_notes @@ -0,0 +1,35 @@ +#!/bin/sh +# +# A script to open/autostart the release notes in the help +# handbook, but only once. + +# Run this script from the global autostart directory. + +# When the release version increments, this script will detect the +# difference through tde-config and a respective key in kdeglobals. +# This script then will open the release notes for that next release. +# The only file to update is: tdebase/doc/releasenotes/index.docbook. + +# As this script is run as a global TDE autostart app, all +# environment variables should already be set. + +if [ "$TDEDIR" = "" ] || [ "$TDEHOME" = "" ]; then + exit 1 +fi + +RELEASE_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: ||p' )" +RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )" + +if [ "$RELEASE_NOTES" = "" ] || [ "$RELEASE_NOTES" != "true" ]; then + echo "[release_notes] Release version: $RELEASE_VERSION" + echo "[release_notes] Release notes: $RELEASE_NOTES" + if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes ; then + ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" --type bool "true" + fi + RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )" + echo "[release_notes] Release notes: $RELEASE_NOTES" +fi + +unset RELEASE_NOTES RELEASE_VERSION +exit 0 + -- cgit v1.2.1