Allow to build TQt3/Qt3 with all libs as a shared on Debian on Ubuntu

24 files changed, 48 insertions, 84 deletions

diff --git a/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install b/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install
index 6912b6472..ad98c3165 100644
--- a/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libeditor.prl
-usr/lib/libeditor.a
-usr/lib/libdesignercore.prl
-usr/lib/libdesignercore.a
-usr/lib/libqassistantclient.prl
-usr/lib/libqassistantclient.a
+usr/lib/libeditor.*
+usr/lib/libdesignercore.*
+usr/lib/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules
index d4e5f00cf..668dfdfd5 100755
--- a/debian/lenny/dependencies/qt3/debian/rules
+++ b/debian/lenny/dependencies/qt3/debian/rules
@@ -146,7 +146,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/debian/lenny/dependencies/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules
index 780247eff..4f8f5f70c 100755
--- a/debian/lenny/dependencies/tqt3/debian/rules
+++ b/debian/lenny/dependencies/tqt3/debian/rules
@@ -150,7 +150,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install
index fe4f0fefb..97e2de476 100644
--- a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libtqteditor.prl
-usr/lib/libtqteditor.a
-usr/lib/libtqtdesignercore.prl
-usr/lib/libtqtdesignercore.a
-usr/lib/libtqassistantclient.prl
-usr/lib/libtqassistantclient.a
+usr/lib/libtqteditor.*
+usr/lib/libtqtdesignercore.*
+usr/lib/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install b/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install
index 6912b6472..ad98c3165 100644
--- a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libeditor.prl
-usr/lib/libeditor.a
-usr/lib/libdesignercore.prl
-usr/lib/libdesignercore.a
-usr/lib/libqassistantclient.prl
-usr/lib/libqassistantclient.a
+usr/lib/libeditor.*
+usr/lib/libdesignercore.*
+usr/lib/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules
index 51edaa5dc..20c12d13f 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/debian/squeeze/dependencies/qt3/debian/rules
@@ -146,7 +146,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/debian/squeeze/dependencies/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules
index fcb84445a..d3ad5100f 100755
--- a/debian/squeeze/dependencies/tqt3/debian/rules
+++ b/debian/squeeze/dependencies/tqt3/debian/rules
@@ -150,7 +150,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install
index fe4f0fefb..97e2de476 100644
--- a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libtqteditor.prl
-usr/lib/libtqteditor.a
-usr/lib/libtqtdesignercore.prl
-usr/lib/libtqtdesignercore.a
-usr/lib/libtqassistantclient.prl
-usr/lib/libtqassistantclient.a
+usr/lib/libtqteditor.*
+usr/lib/libtqtdesignercore.*
+usr/lib/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/debian/wheezy/dependencies/qt3/debian/qt3-apps-dev.install b/debian/wheezy/dependencies/qt3/debian/qt3-apps-dev.install
index 6912b6472..ad98c3165 100644
--- a/debian/wheezy/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/debian/wheezy/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libeditor.prl
-usr/lib/libeditor.a
-usr/lib/libdesignercore.prl
-usr/lib/libdesignercore.a
-usr/lib/libqassistantclient.prl
-usr/lib/libqassistantclient.a
+usr/lib/libeditor.*
+usr/lib/libdesignercore.*
+usr/lib/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/debian/wheezy/dependencies/qt3/debian/rules b/debian/wheezy/dependencies/qt3/debian/rules
index 51edaa5dc..20c12d13f 100755
--- a/debian/wheezy/dependencies/qt3/debian/rules
+++ b/debian/wheezy/dependencies/qt3/debian/rules
@@ -146,7 +146,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/debian/wheezy/dependencies/tqt3/debian/rules b/debian/wheezy/dependencies/tqt3/debian/rules
index fcb84445a..d3ad5100f 100755
--- a/debian/wheezy/dependencies/tqt3/debian/rules
+++ b/debian/wheezy/dependencies/tqt3/debian/rules
@@ -150,7 +150,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install
index fe4f0fefb..97e2de476 100644
--- a/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libtqteditor.prl
-usr/lib/libtqteditor.a
-usr/lib/libtqtdesignercore.prl
-usr/lib/libtqtdesignercore.a
-usr/lib/libtqassistantclient.prl
-usr/lib/libtqassistantclient.a
+usr/lib/libtqteditor.*
+usr/lib/libtqtdesignercore.*
+usr/lib/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
index 6912b6472..ad98c3165 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libeditor.prl
-usr/lib/libeditor.a
-usr/lib/libdesignercore.prl
-usr/lib/libdesignercore.a
-usr/lib/libqassistantclient.prl
-usr/lib/libqassistantclient.a
+usr/lib/libeditor.*
+usr/lib/libdesignercore.*
+usr/lib/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 51edaa5dc..20c12d13f 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/maverick/dependencies/qt3/debian/rules
@@ -146,7 +146,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules
index fcb84445a..d3ad5100f 100755
--- a/ubuntu/maverick/dependencies/tqt3/debian/rules
+++ b/ubuntu/maverick/dependencies/tqt3/debian/rules
@@ -150,7 +150,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
index fe4f0fefb..97e2de476 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libtqteditor.prl
-usr/lib/libtqteditor.a
-usr/lib/libtqtdesignercore.prl
-usr/lib/libtqtdesignercore.a
-usr/lib/libtqassistantclient.prl
-usr/lib/libtqassistantclient.a
+usr/lib/libtqteditor.*
+usr/lib/libtqtdesignercore.*
+usr/lib/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/ubuntu/precise/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/precise/dependencies/qt3/debian/qt3-apps-dev.install
index 6912b6472..ad98c3165 100644
--- a/ubuntu/precise/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/ubuntu/precise/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libeditor.prl
-usr/lib/libeditor.a
-usr/lib/libdesignercore.prl
-usr/lib/libdesignercore.a
-usr/lib/libqassistantclient.prl
-usr/lib/libqassistantclient.a
+usr/lib/libeditor.*
+usr/lib/libdesignercore.*
+usr/lib/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/ubuntu/precise/dependencies/qt3/debian/rules b/ubuntu/precise/dependencies/qt3/debian/rules
index 51edaa5dc..20c12d13f 100755
--- a/ubuntu/precise/dependencies/qt3/debian/rules
+++ b/ubuntu/precise/dependencies/qt3/debian/rules
@@ -146,7 +146,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/ubuntu/precise/dependencies/tqt3/debian/rules b/ubuntu/precise/dependencies/tqt3/debian/rules
index fcb84445a..d3ad5100f 100755
--- a/ubuntu/precise/dependencies/tqt3/debian/rules
+++ b/ubuntu/precise/dependencies/tqt3/debian/rules
@@ -150,7 +150,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/ubuntu/precise/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/precise/dependencies/tqt3/debian/tqt3-apps-dev.install
index fe4f0fefb..97e2de476 100644
--- a/ubuntu/precise/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/precise/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libtqteditor.prl
-usr/lib/libtqteditor.a
-usr/lib/libtqtdesignercore.prl
-usr/lib/libtqtdesignercore.a
-usr/lib/libtqassistantclient.prl
-usr/lib/libtqassistantclient.a
+usr/lib/libtqteditor.*
+usr/lib/libtqtdesignercore.*
+usr/lib/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h
diff --git a/ubuntu/raring/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/raring/dependencies/qt3/debian/qt3-apps-dev.install
index 6912b6472..ad98c3165 100644
--- a/ubuntu/raring/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/ubuntu/raring/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libeditor.prl
-usr/lib/libeditor.a
-usr/lib/libdesignercore.prl
-usr/lib/libdesignercore.a
-usr/lib/libqassistantclient.prl
-usr/lib/libqassistantclient.a
+usr/lib/libeditor.*
+usr/lib/libdesignercore.*
+usr/lib/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/ubuntu/raring/dependencies/qt3/debian/rules b/ubuntu/raring/dependencies/qt3/debian/rules
index 51edaa5dc..20c12d13f 100755
--- a/ubuntu/raring/dependencies/qt3/debian/rules
+++ b/ubuntu/raring/dependencies/qt3/debian/rules
@@ -146,7 +146,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/ubuntu/raring/dependencies/tqt3/debian/rules b/ubuntu/raring/dependencies/tqt3/debian/rules
index fcb84445a..d3ad5100f 100755
--- a/ubuntu/raring/dependencies/tqt3/debian/rules
+++ b/ubuntu/raring/dependencies/tqt3/debian/rules
@@ -150,7 +150,7 @@ libqt-thread-stamp: post-patches
 	$(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
 
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
-	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
+	-cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/tqt20fix $(TMP_INSTALL)/usr/bin/
diff --git a/ubuntu/raring/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/raring/dependencies/tqt3/debian/tqt3-apps-dev.install
index fe4f0fefb..97e2de476 100644
--- a/ubuntu/raring/dependencies/tqt3/debian/tqt3-apps-dev.install
+++ b/ubuntu/raring/dependencies/tqt3/debian/tqt3-apps-dev.install
@@ -1,7 +1,4 @@
-usr/lib/libtqteditor.prl
-usr/lib/libtqteditor.a
-usr/lib/libtqtdesignercore.prl
-usr/lib/libtqtdesignercore.a
-usr/lib/libtqassistantclient.prl
-usr/lib/libtqassistantclient.a
+usr/lib/libtqteditor.*
+usr/lib/libtqtdesignercore.*
+usr/lib/libtqassistantclient.*
 usr/include/tqt3/ntqassistantclient.h