From kde-commits Sun Feb 29 23:13:16 2004 From: David Faure Date: Sun, 29 Feb 2004 23:13:16 +0000 To: kde-commits Subject: KDE_3_2_BRANCH: kdesdk/kapptemplate Message-Id: <20040229231316.98299995A () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=107809641104199 CVS commit by faure: impler solution to the "translations break kapptemplate" problem: rename the 'source' files so that they're not named *.desktop (they don't have to be). A existing/app-desktop 1.1.2.1 A kapp/app-desktop 1.1.2.1 A kpartapp/app-desktop 1.1.2.1 A kpartapp/app_part-desktop 1.1.2.1 M +1 -1 existing/Makefile.am 1.1.6.1 M +1 -1 kapp/Makefile.am 1.1.6.1 M +2 -2 kpartapp/Makefile.am 1.2.2.1 R existing/app.desktop 1.21 R kapp/app.desktop 1.88.2.4 R kpartapp/app.desktop 1.93.2.3 R kpartapp/app_part.desktop 1.45.2.2 --- kdesdk/kapptemplate/existing/Makefile.am #1.1:1.1.6.1 @@ -1,2 +1,2 @@ existingdir = $(kde_datadir)/kapptemplate/existing -existing_DATA = app-Makefile.am app.desktop +existing_DATA = app-Makefile.am app-desktop --- kdesdk/kapptemplate/kapp/Makefile.am #1.1:1.1.6.1 @@ -6,4 +6,4 @@ app-configure.in.in apppref.cpp doc-app-Makefile.am \ lo32-app-app.png app.cpp apppref.h hi16-app-app.png main.cpp \ - app.desktop appui.rc hi32-app-app.png app.h appview.cpp \ + app-desktop appui.rc hi32-app-app.png app.h appview.cpp \ hi48-app-app.png pics-Makefile.am --- kdesdk/kapptemplate/kpartapp/Makefile.am #1.2:1.2.2.1 @@ -4,7 +4,7 @@ kpartapp_DATA = app_part.cpp doc-app-Makefile.am \ lo32-app-app.png \ - app-Makefile.am app_part.desktop hi16-app-app.png main.cpp \ + app-Makefile.am app_part-desktop hi16-app-app.png main.cpp \ app-configure.in.in app_part.h hi32-app-app.png \ app.cpp app_part.rc hi48-app-app.png \ - app.desktop app_shell.rc index.docbook \ + app-desktop app_shell.rc index.docbook \ app.h doc-Makefile.am lo16-app-app.png