diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:20:03 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:20:03 +0100 |
| commit | 90a360553626ac757a29708ba76c764b1b7b900c (patch) | |
| tree | 92bc276e9ec5e15e41da7ed4c752d4d3d5c44c2c /ubuntu/raring/dependencies | |
| parent | f6243173ae57c3dca99ea2f7fd6af0a837c8c6bb (diff) | |
| parent | a2030eb3a57cde9db1ab019f4c135e229b8b332e (diff) | |
| download | tde-packaging-90a360553626ac757a29708ba76c764b1b7b900c.tar.gz tde-packaging-90a360553626ac757a29708ba76c764b1b7b900c.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/dependencies')
4 files changed, 8 insertions, 14 deletions
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 |