diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:13:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:13:47 -0600 |
| commit | f331af031a2fc2f01599db5712ba9171ab5f5d7c (patch) | |
| tree | e0bd4ab52faab5a0ee0e26b3846c4f3f5fcd8170 /systemsettings | |
| parent | 63c7b752146a799925d8e2669aa3ee40a04754c8 (diff) | |
| download | tde-systemsettings-f331af031a2fc2f01599db5712ba9171ab5f5d7c.tar.gz tde-systemsettings-f331af031a2fc2f01599db5712ba9171ab5f5d7c.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'systemsettings')
| -rw-r--r-- | systemsettings/Makefile.am | 2 | ||||
| -rw-r--r-- | systemsettings/menu/system-settings.menu | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/systemsettings/Makefile.am b/systemsettings/Makefile.am index c1c58ca..e112e0a 100644 --- a/systemsettings/Makefile.am +++ b/systemsettings/Makefile.am @@ -28,7 +28,7 @@ systemsettings_SOURCES = tdecmodulemenu.cpp kcmsearch.cpp kcmultiwidget.cpp main EXTRA_DIST = tdecmodulemenu.h kcmultiwidget.h moduleiconitem.h version.h kcmsearch.h mainwindow.h modulesview.h kcscrollview.h systemsettings_LDADD = $(LIB_TDEUI) $(LIB_KUTILS) -systemsettings_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +systemsettings_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor appdata_DATA = systemsettingsui.rc appdatadir = $(kde_datadir)/systemsettings diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu index 16f55b2..d2f3089 100644 --- a/systemsettings/menu/system-settings.menu +++ b/systemsettings/menu/system-settings.menu @@ -293,7 +293,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability <Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename> <Filename>tde-proxy.desktop</Filename> <Filename>tde-netpref.desktop</Filename> - <Filename>tde-kcm_kdnssd.desktop</Filename> + <Filename>tde-kcm_tdednssd.desktop</Filename> <Merge type="files" /> </Layout> @@ -301,7 +301,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability <Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename> <Filename>tde-proxy.desktop</Filename> <Filename>tde-netpref.desktop</Filename> - <Filename>tde-kcm_kdnssd.desktop</Filename> + <Filename>tde-kcm_tdednssd.desktop</Filename> <Category>X-TDE-systemsettings-network-networksettings</Category> </Include> </Menu> @@ -366,7 +366,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability <Layout> <Filename>tde-audioencoding.desktop</Filename> - <Filename>tde-kresources.desktop</Filename> + <Filename>tde-tderesources.desktop</Filename> <Filename>tde-kcmkded.desktop</Filename> <Filename>tde-kcmsmserver.desktop</Filename> <Merge type="files" /> @@ -374,7 +374,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability <Include> <Filename>tde-audioencoding.desktop</Filename> - <Filename>tde-kresources.desktop</Filename> + <Filename>tde-tderesources.desktop</Filename> <Filename>tde-kcmkded.desktop</Filename> <Filename>tde-kcmsmserver.desktop</Filename> <Category>X-TDE-systemsettings-advancedusersettings</Category> |