From 4289bc2c2634f7c618108cd08f92cdcc38b4eb34 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 1 Sep 2019 23:14:19 +0900 Subject: [PATCH] Fixed FTBFS caused by previous commit (lsm files removal). Signed-off-by: Michele Calgaro --- cervisia/ChangeLog | 4 ++-- kapptemplate/appframework/CMakeLists.txt | 2 +- kapptemplate/appframework/Makefile.am | 2 +- kbugbuster/Makefile.am | 2 +- scripts/cvs2dist | 2 -- scripts/svn2dist | 2 -- tdecachegrind/CMakeLists.txt | 1 - tdecachegrind/Makefile.am | 2 +- tdecachegrind/configure.in.in | 1 - tdecachegrind/tdecachegrind.lsm.in | 11 ----------- 10 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 tdecachegrind/tdecachegrind.lsm.in diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog index e1af7530..374301f1 100644 --- a/cervisia/ChangeLog +++ b/cervisia/ChangeLog @@ -844,7 +844,7 @@ cd cervisia cvs add -kb *.png cvs add Makefile.am README TODO .cvsignore ChangeLog LICENSE.QPL \ - cervisia.lsm *.cpp *.h *.rc + *.cpp *.h *.rc ======================================== @@ -853,7 +853,7 @@ * Added support for KDE/Qt 3. At the moment I've just made the minimum set of changes required to make it compile. Qt 2.x is still supported of course. - * Moved README, TODO, ChangeLog, cervisia.lsm and LICENSE.QPL to + * Moved README, TODO, ChangeLog and LICENSE.QPL to the main source directory. * Moved version string from configure.in.in to version.h * Updated version string diff --git a/kapptemplate/appframework/CMakeLists.txt b/kapptemplate/appframework/CMakeLists.txt index fc7a9d1f..f9d980f1 100644 --- a/kapptemplate/appframework/CMakeLists.txt +++ b/kapptemplate/appframework/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( no-exe ) install( FILES - AUTHORS INSTALL COPYING NEWS app.lsm app.spec configure.in.in.in + AUTHORS INSTALL COPYING NEWS app.spec configure.in.in.in README base-Makefile.am ChangeLog VERSION base-Makefile.cvs po-Makefile.am DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/appframework ) diff --git a/kapptemplate/appframework/Makefile.am b/kapptemplate/appframework/Makefile.am index 25ad4464..b3ec2795 100644 --- a/kapptemplate/appframework/Makefile.am +++ b/kapptemplate/appframework/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=no-exe frameworkdir = $(kde_datadir)/kapptemplate/appframework -framework_DATA = AUTHORS INSTALL COPYING NEWS app.lsm \ +framework_DATA = AUTHORS INSTALL COPYING NEWS \ app.spec configure.in.in.in README base-Makefile.am \ ChangeLog VERSION base-Makefile.cvs po-Makefile.am diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 3ff67e3a..cfb35294 100644 --- a/kbugbuster/Makefile.am +++ b/kbugbuster/Makefile.am @@ -20,7 +20,7 @@ KDE_ICON = kbugbuster METASOURCES = AUTO -EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO kbugbuster.lsm +EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO messages: rc.cpp $(EXTRACTRC) */*.kcfg >> rc.cpp diff --git a/scripts/cvs2dist b/scripts/cvs2dist index 3ba17e85..e804ca3b 100755 --- a/scripts/cvs2dist +++ b/scripts/cvs2dist @@ -320,8 +320,6 @@ modulename=`echo $modulename | sed -e 's#/$##'` # get the last part modulename=`echo $modulename | sed -e 's#^.*/##'` -remove="$remove $modulename.lsm" - # we check out tde-i18n/subdirs in temp_dir/tde-i18n.. if [ $doi18n = "yes" ]; then pushd $temp_dir diff --git a/scripts/svn2dist b/scripts/svn2dist index 7dacbf99..f8674f85 100755 --- a/scripts/svn2dist +++ b/scripts/svn2dist @@ -329,8 +329,6 @@ modulename=`echo $modulename | sed -e 's#/$##'` # get the last part modulename=`echo $modulename | sed -e 's#^.*/##'` -remove="$remove $modulename.lsm" - # we check out tde-i18n/subdirs in temp_dir/tde-i18n.. if [ $doi18n = "yes" ]; then pushd $temp_dir diff --git a/tdecachegrind/CMakeLists.txt b/tdecachegrind/CMakeLists.txt index 1197869f..afa2d31f 100644 --- a/tdecachegrind/CMakeLists.txt +++ b/tdecachegrind/CMakeLists.txt @@ -14,7 +14,6 @@ include( ConfigureChecks.cmake ) set( TDECACHEGRIND_VERSION "0.4.6kde" ) configure_file( version.h.in version.h @ONLY ) configure_file( tdecachegrind.spec.in tdecachegrind.spec @ONLY ) -configure_file( tdecachegrind.lsm.in tdecachegrind.lsm @ONLY ) add_subdirectory( tdecachegrind ) add_subdirectory( pics ) diff --git a/tdecachegrind/Makefile.am b/tdecachegrind/Makefile.am index e93f6afc..c2ed2d26 100644 --- a/tdecachegrind/Makefile.am +++ b/tdecachegrind/Makefile.am @@ -2,5 +2,5 @@ SUBDIRS = tdecachegrind pics converters EXTRA_DIST = \ AUTHORS COPYING NEWS ChangeLog INSTALL README TODO \ - tdecachegrind.lsm tdecachegrind.spec version.h + tdecachegrind.spec version.h diff --git a/tdecachegrind/configure.in.in b/tdecachegrind/configure.in.in index dfc85085..8cda89d2 100644 --- a/tdecachegrind/configure.in.in +++ b/tdecachegrind/configure.in.in @@ -5,4 +5,3 @@ AC_FUNC_MMAP dnl AC_OUTPUT( tdecachegrind/version.h ) dnl AC_OUTPUT( tdecachegrind/tdecachegrind.spec ) -dnl AC_OUTPUT( tdecachegrind/tdecachegrind.lsm ) diff --git a/tdecachegrind/tdecachegrind.lsm.in b/tdecachegrind/tdecachegrind.lsm.in deleted file mode 100644 index fab7ceda..00000000 --- a/tdecachegrind/tdecachegrind.lsm.in +++ /dev/null @@ -1,11 +0,0 @@ -Begin3 -Title: tdecachegrind -Version: @TDECACHEGRIND_VERSION@ -Description: KDE Profiling Visualisation Tool -Keywords: Profiling, Performance Analysis, Visualisation, Development -Author: Josef Weidendorfer -Maintained-by: Josef Weidendorfer -Home-page: http://tdecachegrind.sourceforge.net -Platforms: Linux and other Unices -Copying-policy: GNU Public License -End