[SCM] qbs packaging branch, master, updated. debian/1.5.1+dfsg-1-4-gffaeffb

Mon Aug 1 18:28:18 UTC 2016

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

The following commit has been merged in the master branch:
commit ffaeffb644c5b5b95445745551dc0db72d612aee
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 1 21:26:57 2016 +0300

    Avoid using the Qt Build Suite term, following upstream.
    
    Also avoid using the QBS capitalization (use Qbs instead).
---
 debian/changelog             |  1 +
 debian/control               | 34 +++++++++++++++++-----------------
 debian/copyright             |  2 +-
 debian/qbs-doc-html.doc-base | 10 +++++-----
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3d4a53..2912be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qbs (1.5.2+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Drop kfreebsd.diff, a similar patch was applied upstream.
+  * Avoid using the Qt Build Suite term, following upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 22:39:33 +0200
 
diff --git a/debian/control b/debian/control
index b40fbbc..b0c9a1f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9.20160114~),
                qttools5-dev-tools
 Build-Depends-Indep: libqt5sql5-sqlite
 Standards-Version: 3.9.8
-Homepage: http://wiki.qt.io/Qt_Build_Suite
+Homepage: https://wiki.qt.io/Qbs
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qbs.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qbs.git
 
@@ -23,44 +23,44 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: qbs-common, ${misc:Depends}, ${shlibs:Depends}
 Breaks: qtcreator (<< 3.2.1+dfsg-8~)
 Replaces: qtcreator (<< 3.2.1+dfsg-8~)
-Description: Qt Build Suite
+Description: Qbs build tool
  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 Qt Build Suite, a cross-platform build tool.
+ This package contains Qbs, a cross-platform build tool.
 
 Package: qbs-common
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: qbs (<< 1.4.3+dfsg-2~)
 Replaces: qbs (<< 1.4.3+dfsg-2~)
-Description: Qt Build Suite static files
+Description: Qbs static files
  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 Qt Build Suite shared static files.
+ This package contains Qbs shared static files.
 
 Package: libqbscore1
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt Build Suite core library
+Description: Qbs core library
  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 Qt Build Suite core shared library.
+ This package contains Qbs core shared library.
 
 Package: libqbsqtprofilesetup1
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt Build Suite profile setup library
+Description: Qbs profile setup library
  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 Qt Build Suite profile setup shared library.
+ This package contains Qbs profile setup shared library.
 
 Package: qbs-dev
 Architecture: any
@@ -69,38 +69,38 @@ Depends: libqbscore1 (= ${binary:Version}),
          libqbsqtprofilesetup1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: Qt Build Suite development files
+Description: Qbs development files
  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 headers and development files for Qt Build Suite.
+ This package contains headers and development files for Qbs.
 
 Package: qbs-examples
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Qt Build Suite examples
+Description: Qbs examples
  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 example source projects for the Qt Build Suite.
+ This package contains the example source projects for Qbs.
 
 Package: qbs-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Qt Build Suite documentation
+Description: Qbs 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 Build Suite.
+ This package contains the documentation for Qbs.
 
 Package: qbs-doc-html
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Qt Build Suite HTML documentation
+Description: Qbs 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 Build Suite.
+ This package contains the HTML documentation for Qbs.
diff --git a/debian/copyright b/debian/copyright
index 8e69f22..e4ac60b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: QBS
+Upstream-Name: Qbs
 Source: https://download.qt.io/official_releases/qbs/
 Files-Excluded: doc/templates/scripts/jquery.js
 
diff --git a/debian/qbs-doc-html.doc-base b/debian/qbs-doc-html.doc-base
index c0aca98..a0f44c0 100644
--- a/debian/qbs-doc-html.doc-base
+++ b/debian/qbs-doc-html.doc-base
@@ -1,10 +1,10 @@
 Document: qbs-doc-html
-Title: QBS Documentation
+Title: Qbs Documentation
 Author: The Qt Company Ltd.
-Abstract: Documentation of the Qt Build Suite
- Qt Build Suite (QBS) is a tool that helps simplify the build process for
- developing projects across multiple platforms. QBS can be used for any
- software project, whether it is written in Qt or not.
+Abstract: Documentation of Qbs
+ Qbs is a tool that helps simplify the build process for developing projects
+ across multiple platforms. Qbs can be used for any software project, regardless
+ of programming language, toolkit, or libraries used.
 Section: Programming
 
 Format: HTML

-- 
qbs packaging

