[neon/qt/qbs/Neon/release] debian: Drop old changelog patch, add new changelog patch.

[Dmitry Shachnev]

Git commit 503a1894a172ddbea6ffc546bae0aa1af1a3e049 by Dmitry Shachnev.
Committed on 22/06/2021 at 12:56.
Pushed by jriddell into branch 'Neon/release'.

Drop old changelog patch, add new changelog patch.

M  +1    -0    debian/changelog
D  +0    -72   debian/patches/add_1.19.0_changelog.diff
A  +19   -0    debian/patches/add_1.19.1_changelog.diff
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/qt/qbs/commit/503a1894a172ddbea6ffc546bae0aa1af1a3e049

diff --git a/debian/changelog b/debian/changelog
index 6d26403..c4312b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.19.1-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop old changelog patch, add new changelog patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Jun 2021 15:51:03 +0300
 
diff --git a/debian/patches/add_1.19.0_changelog.diff b/debian/patches/add_1.19.0_changelog.diff
deleted file mode 100644
index d4a7aff..0000000
--- a/debian/patches/add_1.19.0_changelog.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: add changelog for the 1.19.0 release
-Origin: upstream, https://code.qt.io/cgit/qbs/qbs.git/commit/?id=1d6a3fa6f5339a1e
-Last-Update: 2021-05-12
-
---- /dev/null
-+++ b/changelogs/changes-1.19.0.md
-@@ -0,0 +1,65 @@
-+# General
-+
-+* New codesign module was added to implement code signing for Apple, Android and Windows
-+  platforms (QBS-899, QBS-1546).
-+* It is now possible to build Qbs with Qt 6.
-+* Project files update API depending on the Qt.gui module was removed. This allows to enable
-+  project files update API unconditionally when building Qbs.
-+* Convenience items such as Application, DynamicLibrary and StaticLibrary now properly install
-+  artifacts when multiplexing.
-+
-+# C/C++ Support
-+
-+* Qbs now supports multiple MSVC compiler versions installed in one Visual Studio installation
-+  (QBS-1498). Also, multiple compiler versions are properly detected by qbs setup-toolchains.
-+* It is now possible to specify Windows SDK version for the MSVC and clang-cl toolchains via the
-+  new cpp.windowsSdkVersion property.
-+* baremetal: Fix generation of compiler listing files with custom extension for the SDCC compiler.
-+* baremetal: Fix generation of compiler listing files for the ARMCC compiler.
-+* baremetal: Fix detection for Keil toolchains.
-+* baremetal: Add support for HCS08 architectures to SDCC and IAR toolchains (QBS-1631, QBS-1629).
-+* baremetal: Add support for HCS12 architectures to GCC and IAR toolchains (QBS-1630, QBS-1550).
-+
-+# Qt Support
-+
-+* Fix possible command line length issue with qmlimportscanner (QBS-1633).
-+* Fix accessing binaries from libexec for Qt 6.1 and above (QBS-1636).
-+
-+# Android Support
-+
-+* Added a workaround for the Qt.Network module dependencies for 5.15.0 < Qt < 5.15.3 (QTBUG-87288)
-+* Fix aapt command invocation on Windows.
-+* Added support for ndk 22.1.7171670.
-+
-+# Documentation
-+
-+* Added How-To about codesigning on Apple platforms.
-+* Cocoa Touch Application example is brought up-to date to use modern Apple practices.
-+* Added example how to use the cpp.linkerVariant property.
-+* Added missing documentation for the cpp.toolchainInstallPath property.
-+* Added missing documentation for the supported 'bare-metal' architectures.
-+
-+# Important Bug Fixes
-+
-+* Added support for Xcode 12.5 (QBS-1644).
-+* Fix support for Python 3.9 for building Apple DMG images (QBS-1642).
-+
-+# Infrastructure
-+
-+* Ubuntu Focal image was updated to use Qt 5.15.2 and Qbs 1.17.1.
-+* Added automated tests for Qt 6 for macOS, Linux and Windows.
-+* Added a self-hosted runner to run 'bare-metal' tests on Windows.
-+
-+# Contributors
-+
-+* Andrey Filipenkov
-+* Denis Shienkov
-+* Christian Kandeler
-+* Jan Blackquill
-+* Jake Petroules
-+* Ivan Komissarov
-+* Max Bespalov
-+* Mitch Curtis
-+* Orgad Shaneh
-+* Raphaël Cotty
-+* Richard Weickelt
diff --git a/debian/patches/add_1.19.1_changelog.diff b/debian/patches/add_1.19.1_changelog.diff
new file mode 100644
index 0000000..e021a88
--- /dev/null
+++ b/debian/patches/add_1.19.1_changelog.diff
@@ -0,0 +1,19 @@
+Description: add changelog for the 1.19.1 release
+Origin: upstream, https://code.qt.io/cgit/qbs/qbs.git/commit/?id=5b4ce6f52b70e801
+Last-Update: 2021-06-22
+
+--- /dev/null
++++ b/changelogs/changes-1.19.1.md
+@@ -0,0 +1,12 @@
++# C/C++ Support
++
++* Fix system include support with MSVC >= 19.29.30037
++
++# Qt Support
++
++* Fix possible command line length issue with qmlimportscanner when cross-compiling (QBS-1633).
++
++# Apple platforms
++
++* Fix stripping debug symbols in multiplexed products when cpp.separateDebugInformation
++  is false (QBS-1647)
diff --git a/debian/patches/series b/debian/patches/series
index 98c22c9..edfdf98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@ processlauncher_destdir.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
-add_1.19.0_changelog.diff
+add_1.19.1_changelog.diff