summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-03-26 14:30:23 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-03-26 14:30:40 +0100
commit8ff84fe08f7d230657d630328a45f71b360b77ec (patch)
tree46d788ed1dde0f5657ea98b1bff7c70af941b8fd
parentec802814deb100ebe14a87c0f87d97abdde523ce (diff)
downloadtde-packaging-8ff84fe08f7d230657d630328a45f71b360b77ec.tar.gz
tde-packaging-8ff84fe08f7d230657d630328a45f71b360b77ec.zip
Fix ksquirrel dependencies on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit d7bbcd53ce2c4ec3cfd134764f5e9fcb7b3474e3)
-rw-r--r--debian/lenny/applications/ksquirrel/debian/control2
-rwxr-xr-xdebian/lenny/applications/ksquirrel/debian/rules3
-rw-r--r--debian/squeeze/applications/ksquirrel/debian/control2
-rwxr-xr-xdebian/squeeze/applications/ksquirrel/debian/rules3
-rw-r--r--ubuntu/maverick/applications/ksquirrel/debian/control2
-rwxr-xr-xubuntu/maverick/applications/ksquirrel/debian/rules3
6 files changed, 9 insertions, 6 deletions
diff --git a/debian/lenny/applications/ksquirrel/debian/control b/debian/lenny/applications/ksquirrel/debian/control
index 2827d2dd1..643257e11 100644
--- a/debian/lenny/applications/ksquirrel/debian/control
+++ b/debian/lenny/applications/ksquirrel/debian/control
@@ -15,7 +15,7 @@ Standards-Version: 3.8.4
Package: ksquirrel-trinity
Architecture: any
-Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ksquirrel-trinity (<< 4:14.0.0~)
Breaks: ksquirrel-trinity (<< 4:14.0.0~)
Description: Powerful Trinity image viewer
diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules
index 910ff24b6..6cec2f6af 100755
--- a/debian/lenny/applications/ksquirrel/debian/rules
+++ b/debian/lenny/applications/ksquirrel/debian/rules
@@ -105,8 +105,9 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
+ dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
diff --git a/debian/squeeze/applications/ksquirrel/debian/control b/debian/squeeze/applications/ksquirrel/debian/control
index 6fdee4ecb..95dfa884c 100644
--- a/debian/squeeze/applications/ksquirrel/debian/control
+++ b/debian/squeeze/applications/ksquirrel/debian/control
@@ -15,7 +15,7 @@ Standards-Version: 3.8.4
Package: ksquirrel-trinity
Architecture: any
-Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ksquirrel-trinity (<< 4:14.0.0~)
Breaks: ksquirrel-trinity (<< 4:14.0.0~)
Description: Powerful Trinity image viewer
diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules
index 910ff24b6..6cec2f6af 100755
--- a/debian/squeeze/applications/ksquirrel/debian/rules
+++ b/debian/squeeze/applications/ksquirrel/debian/rules
@@ -105,8 +105,9 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
+ dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/control b/ubuntu/maverick/applications/ksquirrel/debian/control
index 4f9cc518c..b581c762d 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/control
+++ b/ubuntu/maverick/applications/ksquirrel/debian/control
@@ -15,7 +15,7 @@ Standards-Version: 3.8.4
Package: ksquirrel-trinity
Architecture: any
-Depends: libksquirrel0-trinity, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ksquirrel-kde3 (<< 4:14.0.0~), ksquirrel-trinity (<< 4:14.0.0~)
Breaks: ksquirrel-kde3 (<< 4:14.0.0~), ksquirrel-trinity (<< 4:14.0.0~)
Description: Powerful Trinity image viewer
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules
index 910ff24b6..6cec2f6af 100755
--- a/ubuntu/maverick/applications/ksquirrel/debian/rules
+++ b/ubuntu/maverick/applications/ksquirrel/debian/rules
@@ -105,8 +105,9 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
+ dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb $(DEB_DH_BUILDDEB_ARGS)