[SCM] qtcreator packaging branch, master, updated. 4c7feaa6fe30b496ae3ef589fe82cfb012b3919c

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=4c7feaa

The following commit has been merged in the master branch:
commit 4c7feaa6fe30b496ae3ef589fe82cfb012b3919c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 27 11:46:33 2013 -0300

    Switch back to Qt4.
    
    qtchooser breaks+replaces qtcreator <=2.6.0. As we do not have Qt5
    in unstable yet, we ship qtcreator built against Qt4.
---
 debian/changelog |    7 +------
 debian/control   |   20 ++++++++++----------
 debian/rules     |    2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bdf84c..0fe338e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,12 +19,7 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
         Fix_revno_detection_in_bzr_log.patch: merged upstream.
   * Remove posix_rt_nonlinux.diff. It applies against 3rd party botan, but we
     are now using the system botan.
-  * Start using Qt5 to compile. Adapt B-Ds:
-    - Use qtdeclarative5-private-dev, as described in the README.
-    - Use libqt5webkit5-dev, as we need the Qt5 version.
-    - B-Ds that have now been splitted in Qt5:
-      - qtscript5-dev
-  * Export CFLAGS, CXXFLAGS, LDFLAGS for hardening and QT_SELECT to choose qt5.
+  * Export CFLAGS, CXXFLAGS, LDFLAGS for hardening and QT_SELECT to choose qt4.
   * Change Depends and Recommends of packages qtcreator and qtcreator-doc.
   * Update 02_use_x-terminal-emulator.diff. The changes seems to come from
     Ubuntu, but I don't know who did it.
diff --git a/debian/control b/debian/control
index e76764d..97ec722 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Uploaders: Adam Majer <adamm at zombino.com>,
 Build-Depends: debhelper (>= 9),
                libbotan1.10-dev,
                libicu-dev,
-               libqt5webkit5-dev,
+               libqt4-dev (>=4:4.8.4~),
+               libqt4-private-dev (>= 4:4.8.4~),
+               libqtwebkit-dev (>= 2.1.0~2011week13-2),
                pkg-config,
-               qtbase5-dev (>= 5.0.2~),
-               qtdeclarative5-private-dev,
-               qtscript5-dev (>= 5.0.2~)
+               qt4-dev-tools (>= 4:4.8.4~)
 Standards-Version: 3.9.3
 Homepage: http://qt.digia.com/Product/Developer-Tools/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtcreator.git
@@ -21,15 +21,16 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtcreator.git
 
 Package: qtcreator
 Architecture: any
-Depends: libqt5help5, libqt5sql5-sqlite, ${misc:Depends}, ${shlibs:Depends}
+Depends: libqt4-help, libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
 Recommends: gdb,
             make,
-            qttools5-dev-tools,
+            qt4-demos,
+            qt4-dev-tools,
+            qt4-doc,
+            qt4-qmlviewer,
             qtcreator-doc,
-            qmlscene
             xterm | x-terminal-emulator,
             qtchooser
-# Missing stuff due to Qt4 to Qt5 transition: qt5 demos, doc.
 Suggests: cmake, g++, git, kdelibs5-data, subversion
 Description: lightweight integrated development environment (IDE) for Qt
  Qt Creator is a new, lightweight, cross-platform integrated development
@@ -61,8 +62,7 @@ Package: qtcreator-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: qtbase5-dev-tools
-# Missing because os Qt4 to Qt5 transition: qt5 doc.
+Suggests: qt4-dev-tools, qt4-doc
 Description: documentation for Qt Creator IDE
  Qt Creator is a new, lightweight, cross-platform integrated development
  environment (IDE) designed to make development with the Qt application
diff --git a/debian/rules b/debian/rules
index d895946..b5060ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-export QT_SELECT := qt5
+export QT_SELECT := qt4
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)

-- 
qtcreator packaging