Move libtqassistant into libtqtinterface-dev on Debian and Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

9 files changed, 9 insertions, 4 deletions

diff --git a/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index 0a49e3e9e..bc71119dc 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -18,6 +18,7 @@ Description: The Trinity Qt Interface Libraries
 Package: libtqtinterface-dev
 Architecture: any
 Section: libs
+Breaks: libtqtinterface (<< 4:3.5.13.3~)
 Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-apps-dev
 Description: The Trinity Qt Interface Libraries (Development Files)
  The Trinity Qt Interface is a library that abstracts Qt from Trinity
diff --git a/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface-dev.install
index 8b19fb624..fc1624cb1 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface-dev.install
+++ b/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface-dev.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/include /usr
 debian/tmp/usr/bin /usr
+debian/tmp/usr/lib/libtqassistant* /usr/lib
diff --git a/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface.install b/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface.install
index f9610d9a2..97533015e 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface.install
+++ b/debian/lenny/dependencies/tqtinterface/debian/libtqtinterface.install
@@ -1 +1 @@
-debian/tmp/usr/lib /usr
+debian/tmp/usr/lib/libtqt* /usr/lib
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/control b/debian/squeeze/dependencies/tqtinterface/debian/control
index 195a7163f..b28725bf8 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/squeeze/dependencies/tqtinterface/debian/control
@@ -18,6 +18,7 @@ Description: The Trinity Qt Interface Libraries
 Package: libtqtinterface-dev
 Architecture: any
 Section: libs
+Breaks: libtqtinterface (<< 4:3.5.13.3~)
 Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-apps-dev
 Description: The Trinity Qt Interface Libraries (Development Files)
  The Trinity Qt Interface is a library that abstracts Qt from Trinity
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install
index 8b19fb624..fc1624cb1 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install
+++ b/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/include /usr
 debian/tmp/usr/bin /usr
+debian/tmp/usr/lib/libtqassistant* /usr/lib
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install b/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install
index f9610d9a2..97533015e 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install
+++ b/debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install
@@ -1 +1 @@
-debian/tmp/usr/lib /usr
+debian/tmp/usr/lib/libtqt* /usr/lib
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/maverick/dependencies/tqtinterface/debian/control
index 17d54adf0..5456df766 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control
@@ -21,7 +21,7 @@ Package: libtqtinterface-dev
 Architecture: any
 Section: libs
 Replaces: libtqtinterface-dev (<< 4:3.5.13)
-Breaks: libtqtinterface-dev (<< 4:3.5.13)
+Breaks: libtqtinterface-dev (<< 4:3.5.13), libtqtinterface (<< 4:3.5.13.3~)
 Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-apps-dev
 Description: The Trinity Qt Interface Libraries (Development Files)
  The Trinity Qt Interface is a library that abstracts Qt from Trinity
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install b/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install
index 8b19fb624..fc1624cb1 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/include /usr
 debian/tmp/usr/bin /usr
+debian/tmp/usr/lib/libtqassistant* /usr/lib
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install b/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install
index f9610d9a2..97533015e 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install
@@ -1 +1 @@
-debian/tmp/usr/lib /usr
+debian/tmp/usr/lib/libtqt* /usr/lib