19 Oct
2014
19 Oct
'14
10:10 a.m.
On Sunday 19 of October 2014 08:59:51 trinity-git-server(a)pearsoncomputing.net
wrote:
Branch: master
7c94b170 2014-10-19 01:59:23 Michele Calgaro
Fixed tdewebdev FTBFS in Debian/Ubuntu distros.
Signed-off-by: Michele Calgaro <michele.calgaro(a)yahoo.it>
M debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
M debian/squeeze/tdewebdev/debian/kxsldbg-trinity.install
M ubuntu/maverick/tdewebdev/debian/kxsldbg-trinity.install
diff --git a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install index
28d1bba..d6c1b3a 100644
--- a/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
+++ b/debian/lenny/tdewebdev/debian/kxsldbg-trinity.install
@@ -16,18 +16,18 @@
debian/tmp/opt/trinity/share/doc/tde/HTML/en/xsldbg/xsldbghelp.xml
debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/1downarrow.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-log-out.pn
g
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/log-out.pn
g debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/hash.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/mark.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system-run.png
+debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/system/run.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/step.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/xsldbg_*.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/1downarrow.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/configure.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-log-out.pn
g
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/log-out.pn
g debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/next.png
-debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system-run.png
+debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/system/run.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/step.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/actions/xsldbg_*.png
debian/tmp/opt/trinity/share/services/kxsldbg_part.desktop
Michele,
I think you've hit on the problem, which I feared - automake does not install
icons as intended, but automatically adds extra subfolder. If you look at the
rest of the commit e12d7923 see that program refers to the icon 'system-run'.
This will require an adjustment in the common 'admin' module => rebuild
everything again.
--
Slávek