diff options
Diffstat (limited to 'debian')
5 files changed, 15 insertions, 20 deletions
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs index ae635cbcd..735874a93 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs @@ -1 +1 @@ -usr/share/sip/tqt +usr/share/sip-tqt/tqt diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install index 7b6aca191..0f144be95 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install +++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install @@ -1,2 +1 @@ -sip/* usr/share/sip/tqt - +sip/* usr/share/sip-tqt/tqt diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides index 36e6c1349..bd57734b2 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides +++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides @@ -1,15 +1,14 @@ # lintian test overriden as the files tripping this error are put into the source # of the generated package. This is a false-positive -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip - +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip +python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules index 8a27587cc..9f597b2eb 100755 --- a/debian/_base/dependencies/python-tqt/debian/rules +++ b/debian/_base/dependencies/python-tqt/debian/rules @@ -63,7 +63,7 @@ build-%/configure-stamp: -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$* \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config \ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP="" touch $@ @@ -78,7 +78,7 @@ dbg-build-%/configure-stamp: -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$*_d \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config_d \ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" touch $@ diff --git a/debian/_base/dependencies/python-tqt/debian/watch b/debian/_base/dependencies/python-tqt/debian/watch deleted file mode 100644 index 506321d38..000000000 --- a/debian/_base/dependencies/python-tqt/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.riverbankcomputing.com/software/pyqt/download3 \ - /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz |