From 5834fb37c9de2918159aca4bdf6ae73c66aaaff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 14 Sep 2012 01:35:44 +0200 Subject: [PATCH] Fix install directories for knights on Debian and Ubuntu (cherry picked from commit 95cbed5730e3e48f5636732c17a877b793b74acf) --- .../lenny/applications/knights/debian/debiandirs | 14 +++++++------- debian/lenny/applications/knights/debian/menu | 4 ++-- debian/lenny/applications/knights/debian/rules | 1 + .../squeeze/applications/knights/debian/debiandirs | 14 +++++++------- debian/squeeze/applications/knights/debian/menu | 4 ++-- debian/squeeze/applications/knights/debian/rules | 1 + .../applications/knights/debian/debiandirs | 14 +++++++------- ubuntu/maverick/applications/knights/debian/menu | 4 ++-- ubuntu/maverick/applications/knights/debian/rules | 1 + 9 files changed, 30 insertions(+), 27 deletions(-) diff --git a/debian/lenny/applications/knights/debian/debiandirs b/debian/lenny/applications/knights/debian/debiandirs index fd6a0e9d6..be68a9592 100644 --- a/debian/lenny/applications/knights/debian/debiandirs +++ b/debian/lenny/applications/knights/debian/debiandirs @@ -1,10 +1,10 @@ -export kde_prefix=/usr +export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/usr/include/kde -export infodir=/usr/share/info -export mandir=/usr/share/man -export qtdir=/usr/share/qt3 -export kde_cgidir=/usr/lib/cgi-bin +export kde_includedir=/opt/trinity/include/kde +export infodir=/opt/trinity/share/info +export mandir=/opt/trinity/share/man +export qtdir=/opt/trinity/share/qt3 +export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_confdir=/etc/trinity -export kde_htmldir=/usr/share/doc/tde/HTML +export kde_htmldir=/opt/trinity/share/doc/tde/HTML configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/debian/lenny/applications/knights/debian/menu b/debian/lenny/applications/knights/debian/menu index bfd8e2f01..f2f72ca74 100644 --- a/debian/lenny/applications/knights/debian/menu +++ b/debian/lenny/applications/knights/debian/menu @@ -2,5 +2,5 @@ needs="X11"\ section="Games/Board"\ title="Knights"\ -command="/usr/bin/knights"\ -icon="/usr/share/pixmaps/knights.xpm" +command="/opt/trinity/bin/knights"\ +icon="/opt/trinity/share/pixmaps/knights.xpm" diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules index 85ac2af45..4527456f6 100755 --- a/debian/lenny/applications/knights/debian/rules +++ b/debian/lenny/applications/knights/debian/rules @@ -98,6 +98,7 @@ binary-arch: build install dh_installmenu dh_icons dh_installman debian/knights.1 + mv debian/knights-trinity/usr/share/man debian/knights-trinity/opt/trinity/share/ dh_link dh_strip dh_compress -X.docbook diff --git a/debian/squeeze/applications/knights/debian/debiandirs b/debian/squeeze/applications/knights/debian/debiandirs index fd6a0e9d6..be68a9592 100644 --- a/debian/squeeze/applications/knights/debian/debiandirs +++ b/debian/squeeze/applications/knights/debian/debiandirs @@ -1,10 +1,10 @@ -export kde_prefix=/usr +export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/usr/include/kde -export infodir=/usr/share/info -export mandir=/usr/share/man -export qtdir=/usr/share/qt3 -export kde_cgidir=/usr/lib/cgi-bin +export kde_includedir=/opt/trinity/include/kde +export infodir=/opt/trinity/share/info +export mandir=/opt/trinity/share/man +export qtdir=/opt/trinity/share/qt3 +export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_confdir=/etc/trinity -export kde_htmldir=/usr/share/doc/tde/HTML +export kde_htmldir=/opt/trinity/share/doc/tde/HTML configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/debian/squeeze/applications/knights/debian/menu b/debian/squeeze/applications/knights/debian/menu index bfd8e2f01..f2f72ca74 100644 --- a/debian/squeeze/applications/knights/debian/menu +++ b/debian/squeeze/applications/knights/debian/menu @@ -2,5 +2,5 @@ needs="X11"\ section="Games/Board"\ title="Knights"\ -command="/usr/bin/knights"\ -icon="/usr/share/pixmaps/knights.xpm" +command="/opt/trinity/bin/knights"\ +icon="/opt/trinity/share/pixmaps/knights.xpm" diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules index 85ac2af45..4527456f6 100755 --- a/debian/squeeze/applications/knights/debian/rules +++ b/debian/squeeze/applications/knights/debian/rules @@ -98,6 +98,7 @@ binary-arch: build install dh_installmenu dh_icons dh_installman debian/knights.1 + mv debian/knights-trinity/usr/share/man debian/knights-trinity/opt/trinity/share/ dh_link dh_strip dh_compress -X.docbook diff --git a/ubuntu/maverick/applications/knights/debian/debiandirs b/ubuntu/maverick/applications/knights/debian/debiandirs index fd6a0e9d6..be68a9592 100644 --- a/ubuntu/maverick/applications/knights/debian/debiandirs +++ b/ubuntu/maverick/applications/knights/debian/debiandirs @@ -1,10 +1,10 @@ -export kde_prefix=/usr +export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/usr/include/kde -export infodir=/usr/share/info -export mandir=/usr/share/man -export qtdir=/usr/share/qt3 -export kde_cgidir=/usr/lib/cgi-bin +export kde_includedir=/opt/trinity/include/kde +export infodir=/opt/trinity/share/info +export mandir=/opt/trinity/share/man +export qtdir=/opt/trinity/share/qt3 +export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_confdir=/etc/trinity -export kde_htmldir=/usr/share/doc/tde/HTML +export kde_htmldir=/opt/trinity/share/doc/tde/HTML configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/ubuntu/maverick/applications/knights/debian/menu b/ubuntu/maverick/applications/knights/debian/menu index bfd8e2f01..f2f72ca74 100644 --- a/ubuntu/maverick/applications/knights/debian/menu +++ b/ubuntu/maverick/applications/knights/debian/menu @@ -2,5 +2,5 @@ needs="X11"\ section="Games/Board"\ title="Knights"\ -command="/usr/bin/knights"\ -icon="/usr/share/pixmaps/knights.xpm" +command="/opt/trinity/bin/knights"\ +icon="/opt/trinity/share/pixmaps/knights.xpm" diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index 85ac2af45..4527456f6 100755 --- a/ubuntu/maverick/applications/knights/debian/rules +++ b/ubuntu/maverick/applications/knights/debian/rules @@ -98,6 +98,7 @@ binary-arch: build install dh_installmenu dh_icons dh_installman debian/knights.1 + mv debian/knights-trinity/usr/share/man debian/knights-trinity/opt/trinity/share/ dh_link dh_strip dh_compress -X.docbook