summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-09-13 19:47:40 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-09-13 19:47:40 +0200
commitfb1176fa5dd2120d92cbc41ecb077046102d0908 (patch)
treeed851b8f3522c3d7d34f6062c542def47b48eddf /debian
parent4cc8eb75be25c49d0869b2f73df9298105baa742 (diff)
downloadtde-packaging-fb1176fa5dd2120d92cbc41ecb077046102d0908.tar.gz
tde-packaging-fb1176fa5dd2120d92cbc41ecb077046102d0908.zip
Fix install directories for kmyfirewall on Debian and Ubuntu
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/debiandirs16
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/dirs4
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/install4
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/kmyfirewall.desktop2
-rwxr-xr-xdebian/lenny/applications/kmyfirewall/debian/rules5
-rw-r--r--debian/squeeze/applications/kmyfirewall/debian/debiandirs16
-rw-r--r--debian/squeeze/applications/kmyfirewall/debian/dirs4
-rw-r--r--debian/squeeze/applications/kmyfirewall/debian/install4
-rw-r--r--debian/squeeze/applications/kmyfirewall/debian/kmyfirewall.desktop2
-rwxr-xr-xdebian/squeeze/applications/kmyfirewall/debian/rules5
-rw-r--r--debian/wheezy/applications/kmyfirewall/debian/debiandirs16
-rw-r--r--debian/wheezy/applications/kmyfirewall/debian/dirs4
-rw-r--r--debian/wheezy/applications/kmyfirewall/debian/install4
-rw-r--r--debian/wheezy/applications/kmyfirewall/debian/kmyfirewall.desktop2
-rwxr-xr-xdebian/wheezy/applications/kmyfirewall/debian/rules5
15 files changed, 45 insertions, 48 deletions
diff --git a/debian/lenny/applications/kmyfirewall/debian/debiandirs b/debian/lenny/applications/kmyfirewall/debian/debiandirs
index 289b430dc..90247b9a0 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/tde
-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/tde
+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 d7b3c5848..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/tde
-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 cedd87cc0..57f12ad9c 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;TDE;System;
Name=KMyFirewall
diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index a8d1312d8..8fa664c8a 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 289b430dc..90247b9a0 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/tde
-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/tde
+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 d7b3c5848..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/tde
-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 cedd87cc0..57f12ad9c 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;TDE;System;
Name=KMyFirewall
diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules
index a8d1312d8..8fa664c8a 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/debian/wheezy/applications/kmyfirewall/debian/debiandirs b/debian/wheezy/applications/kmyfirewall/debian/debiandirs
index 289b430dc..90247b9a0 100644
--- a/debian/wheezy/applications/kmyfirewall/debian/debiandirs
+++ b/debian/wheezy/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/tde
-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/tde
+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/wheezy/applications/kmyfirewall/debian/dirs b/debian/wheezy/applications/kmyfirewall/debian/dirs
index 48362f5e4..f0312285e 100644
--- a/debian/wheezy/applications/kmyfirewall/debian/dirs
+++ b/debian/wheezy/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/wheezy/applications/kmyfirewall/debian/install b/debian/wheezy/applications/kmyfirewall/debian/install
index d7b3c5848..3a28b6931 100644
--- a/debian/wheezy/applications/kmyfirewall/debian/install
+++ b/debian/wheezy/applications/kmyfirewall/debian/install
@@ -1,3 +1 @@
-debian/kmfinstallerplugin.desktop usr/share/servicetypes
-debian/kmyfirewall.desktop usr/share/applications/tde
-debian/kmyfirewall.xpm usr/share/pixmaps
+debian/kmyfirewall.xpm opt/trinity/share/pixmaps
diff --git a/debian/wheezy/applications/kmyfirewall/debian/kmyfirewall.desktop b/debian/wheezy/applications/kmyfirewall/debian/kmyfirewall.desktop
index cedd87cc0..57f12ad9c 100644
--- a/debian/wheezy/applications/kmyfirewall/debian/kmyfirewall.desktop
+++ b/debian/wheezy/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;TDE;System;
Name=KMyFirewall
diff --git a/debian/wheezy/applications/kmyfirewall/debian/rules b/debian/wheezy/applications/kmyfirewall/debian/rules
index a8d1312d8..8fa664c8a 100755
--- a/debian/wheezy/applications/kmyfirewall/debian/rules
+++ b/debian/wheezy/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