Fix install directories for kmyfirewall on Debian and Ubuntu

(cherry picked from commit fb1176fa5dd2120d92cbc41ecb077046102d0908)

15 files changed, 45 insertions, 48 deletions

diff --git a/debian/lenny/applications/kmyfirewall/debian/debiandirs b/debian/lenny/applications/kmyfirewall/debian/debiandirs
index 836af4987..be68a9592 100644
--- a/debian/lenny/applications/kmyfirewall/debian/debiandirs
+++ b/debian/lenny/applications/kmyfirewall/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/trinity/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
-configkde=--disable-debug --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
+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/kmyfirewall/debian/dirs b/debian/lenny/applications/kmyfirewall/debian/dirs
index 48362f5e4..f0312285e 100644
--- a/debian/lenny/applications/kmyfirewall/debian/dirs
+++ b/debian/lenny/applications/kmyfirewall/debian/dirs
@@ -1,2 +1,2 @@
-usr/trinity/bin
-usr/share/doc/tde/HTML/en
+opt/trinity/bin
+opt/trinity/share/doc/tde/HTML/en
diff --git a/debian/lenny/applications/kmyfirewall/debian/install b/debian/lenny/applications/kmyfirewall/debian/install
index 02500414f..3a28b6931 100644
--- a/debian/lenny/applications/kmyfirewall/debian/install
+++ b/debian/lenny/applications/kmyfirewall/debian/install
@@ -1,3 +1 @@
-debian/kmfinstallerplugin.desktop usr/share/servicetypes
-debian/kmyfirewall.desktop usr/share/applications/kde
-debian/kmyfirewall.xpm usr/share/pixmaps
+debian/kmyfirewall.xpm opt/trinity/share/pixmaps
diff --git a/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop
index a0a63ecf9..379235132 100644
--- a/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop
@@ -2,7 +2,7 @@
 Type=Application
 MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet;
 Icon=kmyfirewall
-Exec=/usr/trinity/bin/kmyfirewall %u
+Exec=/opt/trinity/bin/kmyfirewall %u
 Terminal=false
 Categories=Qt;KDE;System;
 Name=KMyFirewall
diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index 1993e3bfe..a600a1db1 100755
--- a/debian/lenny/applications/kmyfirewall/debian/rules
+++ b/debian/lenny/applications/kmyfirewall/debian/rules
@@ -33,8 +33,8 @@ endif
 -include debian/debiandirs
 
 # To be used with kde-style admin subdirectories if desired.
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
+#debian/debiandirs: admin/debianrules
+#	perl -w admin/debianrules echodirs > debian/debiandirs
 
 
 config.status: configure
@@ -116,6 +116,7 @@ binary-arch: build install
 	dh_desktop
 	dh_installmenu
 	dh_installman
+	mv debian/kmyfirewall-trinity/usr/share/man debian/kmyfirewall-trinity/opt/trinity/share/
 	dh_link
 	dh_strip
 	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
diff --git a/debian/squeeze/applications/kmyfirewall/debian/debiandirs b/debian/squeeze/applications/kmyfirewall/debian/debiandirs
index 836af4987..be68a9592 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/debiandirs
+++ b/debian/squeeze/applications/kmyfirewall/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/trinity/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
-configkde=--disable-debug --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
+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/kmyfirewall/debian/dirs b/debian/squeeze/applications/kmyfirewall/debian/dirs
index 48362f5e4..f0312285e 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/dirs
+++ b/debian/squeeze/applications/kmyfirewall/debian/dirs
@@ -1,2 +1,2 @@
-usr/trinity/bin
-usr/share/doc/tde/HTML/en
+opt/trinity/bin
+opt/trinity/share/doc/tde/HTML/en
diff --git a/debian/squeeze/applications/kmyfirewall/debian/install b/debian/squeeze/applications/kmyfirewall/debian/install
index 02500414f..3a28b6931 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/install
+++ b/debian/squeeze/applications/kmyfirewall/debian/install
@@ -1,3 +1 @@
-debian/kmfinstallerplugin.desktop usr/share/servicetypes
-debian/kmyfirewall.desktop usr/share/applications/kde
-debian/kmyfirewall.xpm usr/share/pixmaps
+debian/kmyfirewall.xpm opt/trinity/share/pixmaps
diff --git a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop
index a0a63ecf9..379235132 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop
@@ -2,7 +2,7 @@
 Type=Application
 MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet;
 Icon=kmyfirewall
-Exec=/usr/trinity/bin/kmyfirewall %u
+Exec=/opt/trinity/bin/kmyfirewall %u
 Terminal=false
 Categories=Qt;KDE;System;
 Name=KMyFirewall
diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules
index 1993e3bfe..a600a1db1 100755
--- a/debian/squeeze/applications/kmyfirewall/debian/rules
+++ b/debian/squeeze/applications/kmyfirewall/debian/rules
@@ -33,8 +33,8 @@ endif
 -include debian/debiandirs
 
 # To be used with kde-style admin subdirectories if desired.
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
+#debian/debiandirs: admin/debianrules
+#	perl -w admin/debianrules echodirs > debian/debiandirs
 
 
 config.status: configure
@@ -116,6 +116,7 @@ binary-arch: build install
 	dh_desktop
 	dh_installmenu
 	dh_installman
+	mv debian/kmyfirewall-trinity/usr/share/man debian/kmyfirewall-trinity/opt/trinity/share/
 	dh_link
 	dh_strip
 	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
index 836af4987..be68a9592 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
+++ b/ubuntu/maverick/applications/kmyfirewall/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/trinity/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
-configkde=--disable-debug --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
+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/kmyfirewall/debian/dirs b/ubuntu/maverick/applications/kmyfirewall/debian/dirs
index 48362f5e4..f0312285e 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/dirs
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/dirs
@@ -1,2 +1,2 @@
-usr/trinity/bin
-usr/share/doc/tde/HTML/en
+opt/trinity/bin
+opt/trinity/share/doc/tde/HTML/en
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/install b/ubuntu/maverick/applications/kmyfirewall/debian/install
index 02500414f..3a28b6931 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/install
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/install
@@ -1,3 +1 @@
-debian/kmfinstallerplugin.desktop usr/share/servicetypes
-debian/kmyfirewall.desktop usr/share/applications/kde
-debian/kmyfirewall.xpm usr/share/pixmaps
+debian/kmyfirewall.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.desktop
index a0a63ecf9..379235132 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/kmyfirewall.desktop
@@ -2,7 +2,7 @@
 Type=Application
 MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet;
 Icon=kmyfirewall
-Exec=/usr/trinity/bin/kmyfirewall %u
+Exec=/opt/trinity/bin/kmyfirewall %u
 Terminal=false
 Categories=Qt;KDE;System;
 Name=KMyFirewall
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/rules b/ubuntu/maverick/applications/kmyfirewall/debian/rules
index 1993e3bfe..a600a1db1 100755
--- a/ubuntu/maverick/applications/kmyfirewall/debian/rules
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/rules
@@ -33,8 +33,8 @@ endif
 -include debian/debiandirs
 
 # To be used with kde-style admin subdirectories if desired.
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
+#debian/debiandirs: admin/debianrules
+#	perl -w admin/debianrules echodirs > debian/debiandirs
 
 
 config.status: configure
@@ -116,6 +116,7 @@ binary-arch: build install
 	dh_desktop
 	dh_installmenu
 	dh_installman
+	mv debian/kmyfirewall-trinity/usr/share/man debian/kmyfirewall-trinity/opt/trinity/share/
 	dh_link
 	dh_strip
 	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag