Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: qtcreator

qtcreator (4.8.2-1ubuntu2) eoan; urgency=medium * No-change rebuild against Qt 5.12.4. -- Dmitry Shachnev <mitya57@ubuntu.com> Mon, 08 Jul 2019 11:35:22 +0300 qtcreator (4.8.2-1ubuntu1) eoan; urgency=medium * Backport upstream patch to adapt to qbs 1.13 API changes. * Bump qbs-dev build-dependency to 1.13. -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 13 Jun 2019 23:03:53 +0300

Modifications :
  1. Download patch debian/control

    --- 4.8.2-1/debian/control 2019-03-01 15:28:05.000000000 +0000 +++ 4.8.2-1ubuntu2/debian/control 2019-06-13 20:03:53.000000000 +0000 @@ -1,7 +1,8 @@ Source: qtcreator Section: devel Priority: optional -Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adam Majer <adamm@zombino.com>, Jeremy Lainé <jeremy.laine@m4x.org>, Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>, @@ -18,7 +19,7 @@ Build-Depends: debhelper (>= 11), libqt5x11extras5-dev (>= 5.6.2~), llvm-7-dev, pkg-config, - qbs-dev (>= 1.12~), + qbs-dev (>= 1.13~), qml-module-qtquick-controls (>= 5.6.2~), qml-module-qtquick2 (>= 5.6.2~), qtbase5-dev (>= 5.6.2~),
  2. Download patch debian/patches/qbs_1.13.patch

    --- 4.8.2-1/debian/patches/qbs_1.13.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.8.2-1ubuntu2/debian/patches/qbs_1.13.patch 2019-06-13 20:03:51.000000000 +0000 @@ -0,0 +1,120 @@ +Description: adapt to qbs 1.13 API changes +Origin: upstream, https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=0b6a36df7e7d9e5c +Last-Update: 2019-06-13 + +--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp ++++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +@@ -46,7 +46,6 @@ + #include <QVariantMap> + + #include <qbs.h> +-#include <qtprofilesetup.h> + + const QChar sep = QLatin1Char('.'); + +@@ -166,45 +165,9 @@ void QbsManager::addProfile(const QStrin + + void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k) + { +- const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k); +- if (!qt) +- return; +- +- qbs::QtEnvironment qtEnv; +- const QList<ProjectExplorer::Abi> abi = qt->qtAbis(); +- if (!abi.empty()) { +- qtEnv.architecture = ProjectExplorer::Abi::toString(abi.first().architecture()); +- if (abi.first().wordWidth() == 64) +- qtEnv.architecture.append(QLatin1String("_64")); +- } +- qtEnv.binaryPath = qt->binPath().toString(); +- qtEnv.documentationPath = qt->docsPath().toString(); +- qtEnv.includePath = qt->headerPath().toString(); +- qtEnv.libraryPath = qt->libraryPath().toString(); +- qtEnv.pluginPath = qt->pluginPath().toString(); +- qtEnv.mkspecBasePath = qt->mkspecsPath().toString(); +- qtEnv.mkspecName = qt->mkspec().toString(); +- qtEnv.mkspecPath = qt->mkspecPath().toString(); +- qtEnv.qtNameSpace = qt->qtNamespace(); +- qtEnv.qtLibInfix = qt->qtLibInfix(); +- qtEnv.qtVersion = qt->qtVersionString(); +- qtEnv.qtMajorVersion = qt->qtVersion().majorVersion; +- qtEnv.qtMinorVersion = qt->qtVersion().minorVersion; +- qtEnv.qtPatchVersion = qt->qtVersion().patchVersion; +- qtEnv.frameworkBuild = qt->isFrameworkBuild(); +- qtEnv.configItems = qt->configValues(); +- qtEnv.qtConfigItems = qt->qtConfigValues(); +- foreach (const QString &buildVariant, +- QStringList() << QLatin1String("debug") << QLatin1String("release")) { +- if (qtEnv.qtConfigItems.contains(buildVariant)) +- qtEnv.buildVariant << buildVariant; +- } +- qtEnv.qmlPath = qt->qmlPath().toString(); +- qtEnv.qmlImportPath = qt->qmakeProperty("QT_INSTALL_IMPORTS"); +- const qbs::ErrorInfo errorInfo = qbs::setupQtProfile(profileName, settings(), qtEnv); +- if (errorInfo.hasError()) { +- Core::MessageManager::write(tr("Failed to set up kit for Qbs: %1") +- .arg(errorInfo.toString()), Core::MessageManager::ModeSwitch); ++ if (const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k)) { ++ qbs::Profile(profileName, settings()).setValue("moduleProviders.Qt.qmakeFilePaths", ++ qt->qmakeCommand().toString()); + } + } + +--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro ++++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro +@@ -5,11 +5,9 @@ isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DI + isEmpty(QBS_INSTALL_DIR) { + QBS_SOURCE_DIR = $$PWD/../../shared/qbs + include($$QBS_SOURCE_DIR/src/lib/corelib/use_corelib.pri) +- include($$QBS_SOURCE_DIR/src/lib/qtprofilesetup/use_qtprofilesetup.pri) + osx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../Frameworks # OS X: fix rpath for qbscore soname + } else { + include($${QBS_INSTALL_DIR}/include/qbs/use_installed_corelib.pri) +- include($${QBS_INSTALL_DIR}/include/qbs/use_installed_qtprofilesetup.pri) + } + QBS_INSTALL_DIR_FWD_SLASHES = $$replace(QBS_INSTALL_DIR, \\\\, /) + DEFINES += QBS_INSTALL_DIR=\\\"$$QBS_INSTALL_DIR_FWD_SLASHES\\\" +--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs ++++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +@@ -20,7 +20,7 @@ QtcPlugin { + if (qbs.enableDebugCode) + suffix = "d"; + } +- libs.push("qbscore" + suffix, "qbsqtprofilesetup" + suffix); ++ libs.push("qbscore" + suffix); + return libs + } + +@@ -33,10 +33,6 @@ QtcPlugin { + name: "qbscore" + condition: product.useInternalQbsProducts + } +- Depends { +- name: "qbsqtprofilesetup" +- condition: product.useInternalQbsProducts +- } + Depends { name: "QmlJS" } + Depends { name: "Utils" } + +--- a/src/src.pro ++++ b/src/src.pro +@@ -5,17 +5,14 @@ CONFIG += ordered + + QBS_DIRS = \ + qbscorelib \ +- qbsqtprofilesetup \ + qbsapps \ + qbslibexec \ + qbsplugins \ + qbsstatic + + qbscorelib.subdir = shared/qbs/src/lib/corelib +-qbsqtprofilesetup.subdir = shared/qbs/src/lib/qtprofilesetup +-qbsqtprofilesetup.depends = qbscorelib + qbsapps.subdir = shared/qbs/src/app +-qbsapps.depends = qbsqtprofilesetup ++qbsapps.depends = qbscorelib + qbslibexec.subdir = shared/qbs/src/libexec + qbslibexec.depends = qbscorelib + qbsplugins.subdir = shared/qbs/src/plugins
  3. Download patch debian/patches/series

    --- 4.8.2-1/debian/patches/series 2019-03-01 15:28:05.000000000 +0000 +++ 4.8.2-1ubuntu2/debian/patches/series 2019-06-13 17:36:02.000000000 +0000 @@ -6,3 +6,4 @@ remove_libexec.diff fix_documentation_path.diff load_clanglazy.patch clazy_plugin_name.patch +qbs_1.13.patch
  1. qtcreator