diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs index c395de89f..62e887ce2 100644 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs @@ -1 +1 @@ -opt/trinity/share/sip/trinity +opt/trinity/share/sip-tqt/trinity diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install index f7d970bcb..17b8480ab 100644 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install @@ -1,2 +1,2 @@ -sip/* opt/trinity/share/sip/trinity +sip/* opt/trinity/share/sip-tqt/trinity contrib/tdepyuic opt/trinity/bin/ diff --git a/debian/_base/libraries/python-trinity/debian/rules b/debian/_base/libraries/python-trinity/debian/rules index ddbb6b15f..532c74f7f 100755 --- a/debian/_base/libraries/python-trinity/debian/rules +++ b/debian/_base/libraries/python-trinity/debian/rules @@ -56,7 +56,7 @@ build-%/configure-stamp: cd build-$* && python$* ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip/trinity -j $(SPLIT) + -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -65,7 +65,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip/trinity -j $(SPLIT) + -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp) diff --git a/debian/_base/libraries/python-trinity/debian/watch b/debian/_base/libraries/python-trinity/debian/watch deleted file mode 100644 index 8b3afcac0..000000000 --- a/debian/_base/libraries/python-trinity/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2 diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs index c395de89f..62e887ce2 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs @@ -1 +1 @@ -opt/trinity/share/sip/trinity +opt/trinity/share/sip-tqt/trinity diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install index f7d970bcb..17b8480ab 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install @@ -1,2 +1,2 @@ -sip/* opt/trinity/share/sip/trinity +sip/* opt/trinity/share/sip-tqt/trinity contrib/tdepyuic opt/trinity/bin/ diff --git a/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/python-trinity/debian/rules index ddbb6b15f..532c74f7f 100755 --- a/ubuntu/_base/libraries/python-trinity/debian/rules +++ b/ubuntu/_base/libraries/python-trinity/debian/rules @@ -56,7 +56,7 @@ build-%/configure-stamp: cd build-$* && python$* ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip/trinity -j $(SPLIT) + -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -65,7 +65,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip/trinity -j $(SPLIT) + -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp) diff --git a/ubuntu/_base/libraries/python-trinity/debian/watch b/ubuntu/_base/libraries/python-trinity/debian/watch deleted file mode 100644 index 8b3afcac0..000000000 --- a/ubuntu/_base/libraries/python-trinity/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2