diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-02 10:09:07 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-02 10:09:07 +0200 |
| commit | 0744c441540ca4fcdcdc0a131c71fe8f629547e4 (patch) | |
| tree | 02ae652b520b155e54aec0ff276bf9406e8d9ba2 /ubuntu | |
| parent | 335c929220a43fbd2d3eaa7ec44085a8f13ee146 (diff) | |
| parent | cbeed6d710845de13d6f2beaa065b352be7b7111 (diff) | |
| download | tde-packaging-0744c441540ca4fcdcdc0a131c71fe8f629547e4.tar.gz tde-packaging-0744c441540ca4fcdcdc0a131c71fe8f629547e4.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu')
| -rwxr-xr-x | ubuntu/maverick/tdelibs/debian/rules | 2 | ||||
| -rwxr-xr-x | ubuntu/precise/tdelibs/debian/rules | 2 | ||||
| -rwxr-xr-x | ubuntu/raring/tdelibs/debian/rules | 2 |
3 files changed, 3 insertions, 3 deletions
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 |