| 2e47bf86 | 2015-12-16 20:30:54 | Slávek Banko |
Move libtqassistant into libtqtinterface-dev on Debian and Ubuntu Signed-off-by: Slávek Banko <slavek.banko@...> |
||
|
M debian/lenny/dependencies/tqtinterface/debian/control M debian/lenny/dependencies/tqtinterface/debian/libtqtinterface-dev.install M debian/lenny/dependencies/tqtinterface/debian/libtqtinterface.install M debian/squeeze/dependencies/tqtinterface/debian/control M debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface-dev.install M debian/squeeze/dependencies/tqtinterface/debian/libtqtinterface.install M ubuntu/maverick/dependencies/tqtinterface/debian/control M ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface-dev.install M ubuntu/maverick/dependencies/tqtinterface/debian/libtqtinterface.install |
||
diff --git a/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index 0a49e3e..bc71119 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -18,6 +18,7 @@
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 8b19fb6..fc1624c 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 f9610d9..9753301 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 195a716..b28725b 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/squeeze/dependencies/tqtinterface/debian/control
@@ -18,6 +18,7 @@
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 8b19fb6..fc1624c 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 f9610d9..9753301 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 17d54ad..5456df7 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control
@@ -21,7 +21,7 @@
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 8b19fb6..fc1624c 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 f9610d9..9753301 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
|
||
| 168e8ba7 | 2015-12-16 20:37:53 | Slávek Banko |
Fix syntax error in tqtinterface control file on Debian and Ubuntu Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit a0a7c9b50941a51682bfa08164e23b52a9cf9ca0) |
||
|
M debian/lenny/dependencies/tqtinterface/debian/control M debian/squeeze/dependencies/tqtinterface/debian/control M ubuntu/maverick/dependencies/tqtinterface/debian/control |
||
diff --git a/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control
index bc71119..c771780 100644
--- a/debian/lenny/dependencies/tqtinterface/debian/control
+++ b/debian/lenny/dependencies/tqtinterface/debian/control
@@ -19,7 +19,7 @@
Architecture: any
Section: libs
Breaks: libtqtinterface (<< 4:3.5.13.3~)
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-apps-dev
+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
This allows the Trinity code to rapidly port from one version of Qt to another.
@@ -29,7 +29,7 @@
Package: libtqtinterface-doc
Architecture: any
Section: libs
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-doc
+Depends: ${shlibs:Depends}, libtqtinterface (>= ${Source-Version}), qt3-doc
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
@@ -39,7 +39,7 @@
Package: libtqtinterface-dbg
Architecture: any
Section: libs
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt-x11-free-dbg
+Depends: ${shlibs:Depends}, libtqtinterface (>= ${Source-Version}), qt-x11-free-dbg
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
diff --git a/debian/squeeze/dependencies/tqtinterface/debian/control b/debian/squeeze/dependencies/tqtinterface/debian/control
index b28725b..312dc7e 100644
--- a/debian/squeeze/dependencies/tqtinterface/debian/control
+++ b/debian/squeeze/dependencies/tqtinterface/debian/control
@@ -19,7 +19,7 @@
Architecture: any
Section: libs
Breaks: libtqtinterface (<< 4:3.5.13.3~)
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-apps-dev
+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
This allows the Trinity code to rapidly port from one version of Qt to another.
@@ -29,7 +29,7 @@
Package: libtqtinterface-doc
Architecture: any
Section: libs
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-doc
+Depends: ${shlibs:Depends}, libtqtinterface (>= ${Source-Version}), qt3-doc
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
@@ -39,7 +39,7 @@
Package: libtqtinterface-dbg
Architecture: any
Section: libs
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt-x11-free-dbg
+Depends: ${shlibs:Depends}, libtqtinterface (>= ${Source-Version}), qt-x11-free-dbg
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/control b/ubuntu/maverick/dependencies/tqtinterface/debian/control
index 5456df7..7519530 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/control
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/control
@@ -22,7 +22,7 @@
Section: libs
Replaces: 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
+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
This allows the Trinity code to rapidly port from one version of Qt to another.
@@ -34,7 +34,7 @@
Section: libs
Replaces: libtqtinterface-doc (<< 4:3.5.13)
Breaks: libtqtinterface-doc (<< 4:3.5.13)
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt3-doc
+Depends: ${shlibs:Depends}, libtqtinterface (>= ${Source-Version}), qt3-doc
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
@@ -46,7 +46,7 @@
Section: libs
Replaces: libtqtinterface-dbg (<< 4:3.5.13)
Breaks: libtqtinterface-dbg (<< 4:3.5.13)
-Depends: ${shlibs:Depends} libtqtinterface (>= ${Source-Version}), qt-x11-free-dbg
+Depends: ${shlibs:Depends}, libtqtinterface (>= ${Source-Version}), qt-x11-free-dbg
Description: The Trinity Qt Interface Libraries (Debug Files)
The Trinity Qt Interface is a library that abstracts Qt from Trinity
This allows the Trinity code to rapidly port from one version of Qt to another.
|
||