[Python-modules-commits] [python-qt4] 01/01: Stop building and installing the WebKit module (closes: #784513).

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch master
in repository python-qt4.

commit 8e856abb36969d46492fd36ed24cf4829f32283e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 9 10:04:30 2016 +0300

    Stop building and installing the WebKit module (closes: #784513).
---
 debian/changelog             | 1 +
 debian/control               | 3 ---
 debian/python-qt4-doc.links  | 1 -
 debian/python-qt4.install    | 1 -
 debian/python3-pyqt4.install | 1 -
 debian/rules                 | 2 +-
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40f5dc3..612c53c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-qt4 (4.11.4+dfsg-2) UNRELEASED; urgency=medium
 
   * Add explicit build-dependency on dh-python.
   * Build with Sphinx 1.3.
+  * Stop building and installing the WebKit module (closes: #784513).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 20 Aug 2015 13:01:12 +0300
 
diff --git a/debian/control b/debian/control
index 3c4cd77..9193287 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 7),
                libqt4-dev (>= 4:4.8.0-1~),
                libqt4-opengl-dev,
                libqtassistantclient-dev,
-               libqtwebkit-dev,
                python-all-dbg,
                python-all-dev (>= 2.7.5-1~),
                python3-all-dbg,
@@ -68,7 +67,6 @@ Description: Python bindings for Qt4
   * QtSvg
   * QtTest
   * QtAssistant
-  * QtWebKit
   * QtOpenGL (in python-qt4-gl)
   * QtSql (in python-qt4-sql)
   * phonon (in python-qt4-phonon)
@@ -89,7 +87,6 @@ Description: Python3 bindings for Qt4
   * QtSvg
   * QtTest
   * QtAssistant
-  * QtWebKit
   * QtOpenGL (in python3-pyqt4.qtopengl)
   * QtSql (in python3-pyqt4.qtsql)
   * phonon (in python3-pyqt4.phonon)
diff --git a/debian/python-qt4-doc.links b/debian/python-qt4-doc.links
deleted file mode 100644
index 55ede97..0000000
--- a/debian/python-qt4-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-qt4-doc/examples/webkit/fancybrowser/jquery.min.js
diff --git a/debian/python-qt4.install b/debian/python-qt4.install
index f51eec7..d23414b 100644
--- a/debian/python-qt4.install
+++ b/debian/python-qt4.install
@@ -11,7 +11,6 @@ usr/lib/python2*/*-packages/PyQt4/QtScript.so
 usr/lib/python2*/*-packages/PyQt4/QtScriptTools.so
 usr/lib/python2*/*-packages/PyQt4/QtSvg.so
 usr/lib/python2*/*-packages/PyQt4/QtTest.so
-usr/lib/python2*/*-packages/PyQt4/QtWebKit.so
 usr/lib/python2*/*-packages/PyQt4/QtXml.so
 usr/lib/python2*/*-packages/PyQt4/QtXmlPatterns.so
 usr/lib/python2*/*-packages/PyQt4/__init__.py
diff --git a/debian/python3-pyqt4.install b/debian/python3-pyqt4.install
index b6590a5..158f7b1 100644
--- a/debian/python3-pyqt4.install
+++ b/debian/python3-pyqt4.install
@@ -11,7 +11,6 @@ usr/lib/python3*/*-packages/PyQt4/QtScript.so
 usr/lib/python3*/*-packages/PyQt4/QtScriptTools.so
 usr/lib/python3*/*-packages/PyQt4/QtSvg.so
 usr/lib/python3*/*-packages/PyQt4/QtTest.so
-usr/lib/python3*/*-packages/PyQt4/QtWebKit.so
 usr/lib/python3*/*-packages/PyQt4/QtXml.so
 usr/lib/python3*/*-packages/PyQt4/QtXmlPatterns.so
 usr/lib/python3*/*-packages/PyQt4/__init__.py
diff --git a/debian/rules b/debian/rules
index 2d0952b..039a0dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ install-indep: build-indep
 	dh_install -i
 	dh_installexamples -Xactiveqt -i
 	cd $(CURDIR)/debian/python-qt4-doc/usr/share/doc/python-qt4-doc/examples/; \
-		cp /usr/share/javascript/jquery/jquery.min.js webkit/fancybrowser/; \
+		rm -rf webkit/; \
 		find . -name '*.qrc' | sed 's/\.qrc//g' | xargs -I {} \
 			$(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc4 -py2 {}.qrc -o {}_rc2.py; \
 		find . -name '*.qrc' | sed 's/\.qrc//g' | xargs -I {} \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-qt4.git