Prepare new upload (5.5.33-2)

diff --git a/debian/changelog b/debian/changelog
index e3f65c23b6f1074f3ec16af80f93d6bf15fb8edb..b44ca50fd8123bb9e07db306d8e224c5f15b7ed1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dtkcore (5.5.33-2) unstable; urgency=medium
+
+  * debian/patches: Drop explicit cxx11 from tests. (Closes: #1038703)
+  * debian/control:
+    + Bump Standards Version to 4.6.2.
+    + Update my Uploaders email to debian.org email.
+  * debian/upstream/metadata: Fix Repository URL.
+
+ -- Arun Kumar Pariyar <arun@debian.org>  Wed, 21 Jun 2023 00:09:53 +0545
+
 dtkcore (5.5.33-1) unstable; urgency=medium
 
   * New upstream version 5.5.33.

diff --git a/debian/control b/debian/control
index 69bbc34ecb51ad6e9e6a39ae3894f3a17f568f71..ef72a24523fa8f40eff567d7ab8fcbd60e4ffc89 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Deepin Packaging Team <pkg-deepin-devel@lists.alioth.debian.o
 Uploaders:
  Boyuan Yang <byang@debian.org>,
  Yanhao Mo <yanhaocs@gmail.com>,
- Arun Kumar Pariyar <openarungeek@gmail.com>,
+ Arun Kumar Pariyar <arun@debian.org>,
  Tu Qinggang <tuqinggang@uniontech.com>,
  Clay Stan <claystan97@gmail.com>,
  Hu Feng <hufeng@uniontech.com>,
@@ -19,7 +19,7 @@ Build-Depends:
  libgtest-dev,
  libdtkcommon-dev,
 Rules-Requires-Root: no
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Homepage: https://github.com/linuxdeepin/dtkcore
 Vcs-Git: https://salsa.debian.org/pkg-deepin-team/dtkcore.git
 Vcs-Browser: https://salsa.debian.org/pkg-deepin-team/dtkcore

diff --git a/debian/patches/001-fix-ftbfs-remove-explicit-cxx11.patch b/debian/patches/001-fix-ftbfs-remove-explicit-cxx11.patch
new file mode 100644 (file)
index 0000000..88b97f5
--- /dev/null
+++ b/debian/patches/001-fix-ftbfs-remove-explicit-cxx11.patch
@@ -0,0 +1,86 @@
+Description: Fix FTBFS by removing explicit cxx11 in tests.
+Author: Arun Kumar Pariyar <arun@debian.org>
+Bug-Debian: https://bugs.debian.org/1038703
+Last-Update: 2023-06-20
+---
+
+--- dtkcore-5.5.33.orig/examples/dasync-example/dasync-example.pro
++++ dtkcore-5.5.33/examples/dasync-example/dasync-example.pro
+@@ -7,7 +7,6 @@ TARGET = thread_util
+ INCLUDEPATH += .
+ QT+= core widgets testlib
+
+-CONFIG += c++11
+ # The following define makes your compiler warn you if you use any
+ # feature of Qt which has been marked as deprecated (the exact warnings
+ # depend on your compiler). Please consult the documentation of the
+--- dtkcore-5.5.33.orig/tests/ddesktopentry/ddesktopentry.pro
++++ dtkcore-5.5.33/tests/ddesktopentry/ddesktopentry.pro
+@@ -3,7 +3,6 @@ QT -= gui
+
+ TARGET = tst_ddesktopentrytest
+ TEMPLATE = app
+-CONFIG += c++11
+ CONFIG -= app_bundle
+
+ !isEmpty(DTK_STATIC_LIB){
+--- dtkcore-5.5.33.orig/tests/dthreadutils/dthreadutils.pro
++++ dtkcore-5.5.33/tests/dthreadutils/dthreadutils.pro
+@@ -2,7 +2,6 @@ QT += testlib concurrent
+ QT -= gui
+
+ TEMPLATE = app
+-CONFIG += c++11
+
+ !isEmpty(DTK_STATIC_LIB){
+     DEFINES += DTK_STATIC_LIB
+--- dtkcore-5.5.33.orig/tests/dutils/dutils.pro
++++ dtkcore-5.5.33/tests/dutils/dutils.pro
+@@ -2,7 +2,6 @@ QT += testlib dbus
+ QT -= gui
+
+ TEMPLATE = app
+-CONFIG += c++11
+
+ !isEmpty(DTK_STATIC_LIB){
+     DEFINES += DTK_STATIC_LIB
+--- dtkcore-5.5.33.orig/tests/dvtablehook/dvtablehook.pro
++++ dtkcore-5.5.33/tests/dvtablehook/dvtablehook.pro
+@@ -2,7 +2,6 @@ QT += testlib
+ QT -= gui
+
+ TEMPLATE = app
+-CONFIG += c++11
+
+ # TODO: vtabhook release test failed
+ QMAKE_CXXFLAGS_RELEASE -= -O2
+--- dtkcore-5.5.33.orig/tests/tests.pro
++++ dtkcore-5.5.33/tests/tests.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = app
+ QT += core dbus xml testlib concurrent
+-CONFIG += thread c++11 link_pkgconfig
++CONFIG += thread link_pkgconfig
+ CONFIG -= app_bundle
+
+ QMAKE_LFLAGS += -Wl,--export-dynamic
+--- dtkcore-5.5.33.orig/tools/qdbusxml2cpp/qdbusxml2cpp.pro
++++ dtkcore-5.5.33/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+@@ -2,7 +2,6 @@ TARGET = qdbusxml2cpp-fix
+
+ TEMPLATE = app
+ QT += core dbus-private dbus
+-CONFIG += c++11
+
+ SOURCES += qdbusxml2cpp.cpp
+
+--- dtkcore-5.5.33.orig/tools/settings/settings.pro
++++ dtkcore-5.5.33/tools/settings/settings.pro
+@@ -1,7 +1,6 @@
+ QT += core xml
+ QT -= gui
+
+-CONFIG += c++11
+
+ TARGET = dtk-settings
+ CONFIG += console link_pkgconfig

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..a11ea9c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001-fix-ftbfs-remove-explicit-cxx11.patch

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 5b348eb23c90a8ec24d5be4718f412e7378e32f0..12f79a1c96a8c7280bea2c62d0e7252be00475a9 100644 (file)
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -2,5 +2,5 @@
 Bug-Database: https://github.com/linuxdeepin/dtkcore/issues
 Bug-Submit: https://github.com/linuxdeepin/dtkcore/issues/new
 Changelog: https://github.com/linuxdeepin/dtkcore/blob/master/CHANGELOG.md
-Repository: https://github.com/linuxdeepin/dtkcore
+Repository: https://github.com/linuxdeepin/dtkcore.git
 Repository-Browse: https://github.com/linuxdeepin/dtkcore