[SCM] qtcreator packaging branch, master, updated. debian/3.2.1+dfsg-7-5-ge885d18

[Adam Majer]

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

The following commit has been merged in the master branch:
commit e885d186c540cc12a875640ca3d719d88d6ff1aa
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 6 13:43:58 2015 -0600

    Use qbs-dev instead of bundled QBS. And switch to new homepage
---
 debian/changelog | 8 ++++++--
 debian/control   | 3 ++-
 debian/rules     | 4 +---
 debian/watch     | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef256c6..e8a1ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-qtcreator (3.3.0+dfsg-1) UNRELEASED; urgency=medium
+qtcreator (3.3.0+dfsg-1) experimental; urgency=medium
 
   * New upstream release
     + Replace minified jquery instances in upstream tarball with editing
     friendly version from Debian.
+  * Use debian packaged qbs instead of bundled version (closes: #763388)
+  * Update uscan to reference qt.io instead of qt-project.org
+  * Switch homepage to qt.io
+  * Look for documentation in the correct directory (closes: #740126)
 
- -- Adam Majer <adamm at zombino.com>  Thu, 25 Dec 2014 01:25:13 -0600
+ -- Adam Majer <adamm at zombino.com>  Thu, 01 Jan 2015 18:59:21 -0600
 
 qtcreator (3.2.1+dfsg-7) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c1207bc..4176cb3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9),
                libx11-dev,
                libxext-dev,
                pkg-config,
+               qbs-dev (>= 1.3.3+dfsg-1),
                qml-module-qtquick2 (>= 5.3.2~),
                qtbase5-dev (>= 5.3.2+dfsg~),
                qtbase5-private-dev (>= 5.3.2+dfsg~),
@@ -31,7 +32,7 @@ Build-Depends: debhelper (>= 9),
                qttools5-private-dev (>= 5.3.2~),
                qtxmlpatterns5-dev-tools (>= 5.3.2~)
 Standards-Version: 3.9.6
-Homepage: http://qt-project.org/wiki/Category:Tools::QtCreator
+Homepage: http://doc.qt.io/qt-5/topics-app-development.html
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtcreator.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtcreator.git
 
diff --git a/debian/rules b/debian/rules
index 9ae40f2..b4bf708 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ override_dh_auto_configure:
 		QMAKE_LFLAGS_RELEASE="$(QMAKE_LFLAGS_RELEASE)" \
 		QMAKE_LFLAGS_DEBUG="$(QMAKE_LFLAGS_DEBUG)" \
 		QMAKE_STRIP=: \
+		QBS_INSTALL_DIR=/usr \
 		PREFIX=/usr/ \
 		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
@@ -59,9 +60,6 @@ endif
 	# Do not install the file, we better symlink it.
 	rm -vf debian/tmp/usr/share/qtcreator/debugger/LICENSE.LGPL
 
-	# Fix wrong permissions
-	chmod -v 664 debian/tmp/usr/share/qtcreator/qbs/share/qbs/modules/nsis/*.qbs
-
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/html lib/qmldesigner lib/qtcreator/plugins share/doc
diff --git a/debian/watch b/debian/watch
index fd75b27..5cd9bac 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+dfsg// \
-http://download.qt-project.org/official_releases/qtcreator/([\d\.]*)/([\d\.]*)/qt-creator-opensource-src-([^-]*)\.tar\.gz
+http://download.qt.io/official_releases/qtcreator/([\d\.]*)/([\d\.]*)/qt-creator-opensource-src-([^-]*)\.tar\.gz

-- 
qtcreator packaging