summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-07-09 15:24:00 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-07-09 15:24:00 -0300
commita99c5e61a59ee8d046315d90473535faa22b1ad5 (patch)
treef77af9aed3f2d720538b9468a79eafe2e037eba9
parent44e46e5c8c560af446890565aa1248b362f42b43 (diff)
downloadqtbase-a99c5e61a59ee8d046315d90473535faa22b1ad5.tar.gz
Remove doc packages.
It seems I'm not able to build them anymore. as qdoc is generated lately.
-rw-r--r--debian/README.source8
-rw-r--r--debian/changelog6
-rw-r--r--debian/control24
-rw-r--r--debian/qtbase5-doc-html.install12
-rw-r--r--debian/qtbase5-doc.install13
-rwxr-xr-xdebian/rules8
6 files changed, 7 insertions, 64 deletions
diff --git a/debian/README.source b/debian/README.source
index 37bad39..5101a0a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -13,14 +13,6 @@ tests/auto/network/access/qftp/rfc3252.txt
tests/auto/corelib/tools/qbytearray/rfc3252.txt
tests/auto/corelib/io/qtextstream/rfc3261.txt
-Bootstrapping the documentation
--------------------------------
-
-To build the documentation you need to first bootstrap the packages. This is
-easily done by first building only arch: any packages of qtbase and qttools.
-Using this packages, rebuild the full source, this time including arch: all
-packages.
-
Marking private symbols
-----------------------
diff --git a/debian/changelog b/debian/changelog
index 977b040..fffa9ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,12 @@ qtbase-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
on qtbase-abi-5-1-0.
* Change symbols files and lintian overrides to provide qtbase-abi-5-1-0.
* Minimal improve of README.source with private symbols handling.
+ * Remove doc packages. The build system has changed and I can't build them
+ anymore.
+ - Remove independent build deps.
+ - Remove the doc packages from debian/control.
+ - Remove their asociated install files.
+ - Remove the indep targets in debian/rules.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 27 Jun 2013 14:04:21 -0300
diff --git a/debian/control b/debian/control
index 2f566fb..cd68858 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,6 @@ Build-Depends: debhelper (>= 9),
pkg-kde-tools (>= 0.14.2),
unixodbc-dev,
zlib1g-dev
-Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.1.0~)
Standards-Version: 3.9.4
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git
@@ -418,26 +417,3 @@ Description: Qt 5 development defaults package
using development binaries like qmake. It provides a default
configuration for qtchooser, but does not prevent alternative Qt
installations from being used.
-
-Package: qtbase5-doc
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 base documentation
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the documentation for the Qt 5 base libraries.
-
-Package: qtbase5-doc-html
-Priority: extra
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Qt 5 base HTML documentation
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the HTML documentation for the Qt 5 base
- libraries.
diff --git a/debian/qtbase5-doc-html.install b/debian/qtbase5-doc-html.install
deleted file mode 100644
index 1bb6311..0000000
--- a/debian/qtbase5-doc-html.install
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/share/qt5/doc/qdoc/
-usr/share/qt5/doc/qtconcurrent/
-usr/share/qt5/doc/qtcore/
-usr/share/qt5/doc/qtdbus/
-usr/share/qt5/doc/qtgui/
-usr/share/qt5/doc/qtnetwork/
-usr/share/qt5/doc/qtopengl/
-usr/share/qt5/doc/qtprintsupport/
-usr/share/qt5/doc/qtsql/
-usr/share/qt5/doc/qttestlib/
-usr/share/qt5/doc/qtwidgets/
-usr/share/qt5/doc/qtxml/
diff --git a/debian/qtbase5-doc.install b/debian/qtbase5-doc.install
deleted file mode 100644
index eaa5cac..0000000
--- a/debian/qtbase5-doc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/share/qt5/doc/global/externalsites/qtcreator.qdoc
-usr/share/qt5/doc/qdoc.qch
-usr/share/qt5/doc/qtconcurrent.qch
-usr/share/qt5/doc/qtcore.qch
-usr/share/qt5/doc/qtdbus.qch
-usr/share/qt5/doc/qtgui.qch
-usr/share/qt5/doc/qtnetwork.qch
-usr/share/qt5/doc/qtopengl.qch
-usr/share/qt5/doc/qtprintsupport.qch
-usr/share/qt5/doc/qtsql.qch
-usr/share/qt5/doc/qttestlib.qch
-usr/share/qt5/doc/qtwidgets.qch
-usr/share/qt5/doc/qtxml.qch
diff --git a/debian/rules b/debian/rules
index a74fc1a..6d5c8b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,10 +207,7 @@ ifeq ($(vendor),Ubuntu)
rm -rf po
endif
-override_dh_auto_build-indep:
- dh_auto_build -Smakefile -- docs
-
-override_dh_auto_install-arch:
+override_dh_auto_install:
dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
# Fix wrong path in pkgconfig files
@@ -246,9 +243,6 @@ override_dh_auto_install-arch:
-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
-exec chmod a-x {} \;
-override_dh_auto_install-indep:
- make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
-
override_dh_install:
# Now flush all the .install-* files as .install files.
set -e; for pkg in $(pkgs_with_common); do \