From kdevelop-bugs Thu Dec 23 01:29:47 2004 From: kdevelop-bugs-admin () barney ! cs ! uni-potsdam ! de Date: Thu, 23 Dec 2004 01:29:47 +0000 To: kdevelop-bugs Subject: [Bug 94074] Applet template not conforming to recommendations (?) Message-Id: <20041223012947.25917.qmail () ktown ! kde ! org> X-MARC-Message: https://marc.info/?l=kdevelop-bugs&m=118306933206084 ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. http://bugs.kde.org/show_bug.cgi?id=94074 jens.dagerbo swipnet se changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Additional Comments From jens.dagerbo swipnet se 2004-12-23 02:29 ------- CVS commit by dagerbo: Fix Kicker applet template. BUG: 94074 M +2 -1 applet.desktop 1.26 M +9 -14 kicker.kdevtemplate 1.6 M +4 -5 src-Makefile.am 1.4 --- kdevelop/languages/cpp/app_templates/kicker/applet.desktop #1.25:1.26 @ -29,3 +29,4 @ Name=%{APPNAMELC} Name[xx]=xx%{APPNAMELC}xx -X-KDE-Library=lib%{APPNAMELC} +X-KDE-Library=%{APPNAMELC}_panelapplet +X-KDE-UniqueApplet = false \ No newline at end of file --- kdevelop/languages/cpp/app_templates/kicker/kicker.kdevtemplate #1.5:1.6 @ -55,9 +55,4 @ [FILE5] Type=install -Source=%{kdevelop}/template-common/kde-app.desktop -Dest=%{dest}/src/%{APPNAMELC}.desktop - -[FILE6] -Type=install Source=%{kdevelop}/template-common/kde-app.lsm Dest=%{dest}/src/%{APPNAMELC}.lsm @ -67,45 +62,45 @ Dir=%{dest}/po -[FILE7] +[FILE6] Type=install Source=%{kdevelop}/template-common/kde-po-Makefile.am Dest=%{dest}/po/Makefile.am -[FILE8] +[FILE7] Type=install Source=%{kdevelop}/template-common/kde-Makefile.am Dest=%{dest}/Makefile.am -[FILE9] +[FILE8] Type=install Source=%{kdevelop}/template-common/kde-Makefile.cvs Dest=%{dest}/Makefile.cvs -[FILE10] +[FILE9] Type=install Source=%{kdevelop}/template-common/kde-configure.in.in Dest=%{dest}/configure.in.in -[FILE11] +[FILE10] Type=install Source=%{src}/subdirs Dest=%{dest}/subdirs -[FILE12] +[FILE11] Type=install Source=%{src}/src-Makefile.am Dest=%{dest}/src/Makefile.am -[FILE13] +[FILE12] Type=install Source=%{src}/applet.cpp Dest=%{dest}/src/%{APPNAMELC}.cpp -[FILE14] +[FILE13] Type=install Source=%{src}/applet.h Dest=%{dest}/src/%{APPNAMELC}.h -[FILE15] +[FILE14] Type=install Source=%{src}/applet.desktop --- kdevelop/languages/cpp/app_templates/kicker/src-Makefile.am #1.3:1.4 @ -2,9 +2,9 @ METASOURCES = AUTO -lib_LTLIBRARIES = lib%{APPNAMELC}.la +lib_LTLIBRARIES = %{APPNAMELC}_panelapplet.la -lib%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp -lib%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) -lib%{APPNAMELC}_la_LIBADD = $(LIB_KDEUI) +%{APPNAMELC}_panelapplet_la_SOURCES = %{APPNAMELC}.cpp +%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) +%{APPNAMELC}_panelapplet_la_LIBADD = $(LIB_KDEUI) %{APPNAMELC}_DATA = %{APPNAMELC}.desktop @ -12,4 +12,3 @ messages: rc.cpp -· $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot