summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-08-02 10:09:07 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-08-02 10:09:07 +0200
commit0744c441540ca4fcdcdc0a131c71fe8f629547e4 (patch)
tree02ae652b520b155e54aec0ff276bf9406e8d9ba2
parent335c929220a43fbd2d3eaa7ec44085a8f13ee146 (diff)
parentcbeed6d710845de13d6f2beaa065b352be7b7111 (diff)
downloadtde-packaging-0744c441540ca4fcdcdc0a131c71fe8f629547e4.tar.gz
tde-packaging-0744c441540ca4fcdcdc0a131c71fe8f629547e4.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
-rwxr-xr-xdebian/lenny/tdelibs/debian/rules2
-rwxr-xr-xdebian/squeeze/tdelibs/debian/rules2
-rwxr-xr-xdebian/wheezy/tdelibs/debian/rules2
-rwxr-xr-xubuntu/maverick/tdelibs/debian/rules2
-rwxr-xr-xubuntu/precise/tdelibs/debian/rules2
-rwxr-xr-xubuntu/raring/tdelibs/debian/rules2
6 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index b49f70a4b..409bbcae4 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
binary-install/tdelibs-data-trinity::
- install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+ install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
# uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index b49f70a4b..409bbcae4 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
binary-install/tdelibs-data-trinity::
- install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+ install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
# uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
diff --git a/debian/wheezy/tdelibs/debian/rules b/debian/wheezy/tdelibs/debian/rules
index b49f70a4b..409bbcae4 100755
--- a/debian/wheezy/tdelibs/debian/rules
+++ b/debian/wheezy/tdelibs/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
binary-install/tdelibs-data-trinity::
- install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+ install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
# uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 88c6545c0..54515388a 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
binary-install/tdelibs-data-trinity::
- install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+ install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
# uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
diff --git a/ubuntu/precise/tdelibs/debian/rules b/ubuntu/precise/tdelibs/debian/rules
index 88c6545c0..54515388a 100755
--- a/ubuntu/precise/tdelibs/debian/rules
+++ b/ubuntu/precise/tdelibs/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
binary-install/tdelibs-data-trinity::
- install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+ install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
# uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png
diff --git a/ubuntu/raring/tdelibs/debian/rules b/ubuntu/raring/tdelibs/debian/rules
index 88c6545c0..54515388a 100755
--- a/ubuntu/raring/tdelibs/debian/rules
+++ b/ubuntu/raring/tdelibs/debian/rules
@@ -40,7 +40,7 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
binary-install/tdelibs-data-trinity::
- install -p -D -m644 kded/applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/kde-applications.menu
+ install -p -D -m644 kded/tde-applications.menu debian/tdelibs-data-trinity/opt/trinity/etc/xdg/menus/tde-applications.menu
install -p -D -m644 debian/trinitylibs.conf debian/tdelibs-data-trinity/etc/ld.so.conf.d/trinitylibs.conf
# uudecode debian/icons/aboutkde-kubuntu.png.uu -o debian/tdelibs-data-trinity/opt/trinity/share/apps/tdeui/pics/aboutkde.png