update debian/*

diff --git a/debian/changelog b/debian/changelog
index 521cdd87e465df6db30eeadbc0cab1742515ca5a..6dfb87da1e38dfef9b8dc62286881e3d1eec1381 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dtkcore (5.4.13-1) unstable; urgency=medium
+
+  * New upstream version 5.4.13.
+
+ -- Clay Stan <claystan97@gmail.com>  Sun, 25 Apr 2021 17:02:11 +0800
+
 dtkcore (5.4.0-1~exp1) experimental; urgency=medium
 
   [ Clay Stan ]

diff --git a/debian/control b/debian/control
index 36ec70e9c1ba80363f46fe4e3ec3148648dda286..176c1951e65ac255035ace1de697e6afa963d683 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,8 @@ Build-Depends:
  pkg-kde-tools,
  qtbase5-private-dev,
  qttools5-dev-tools,
+ libgtest-dev,
+ libdtkcommon-dev,
 Rules-Requires-Root: no
 Standards-Version: 4.5.1
 Homepage: https://github.com/linuxdeepin/dtkcore

diff --git a/debian/libdtkcore-dev.install b/debian/libdtkcore-dev.install
index c343c31be3b22a5a71adeb51c19daf10c4954bc6..f1f7613e75cd4799e83adef2d96faf2138212972 100644 (file)
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@ -1,5 +1,5 @@
-usr/include
-usr/lib/*/cmake/*/*.cmake
 usr/lib/*/lib*.so
+usr/include
 usr/lib/*/pkgconfig/*.pc
+usr/lib/*/cmake/*/*.cmake
 usr/lib/*/qt5/*

diff --git a/debian/libdtkcore5.install b/debian/libdtkcore5.install
index 751f0dc036697182636d109b08eba7161015de7f..3ddde584198421f0d2a3fef9d36cc110f3b8b76d 100644 (file)
--- a/debian/libdtkcore5.install
+++ b/debian/libdtkcore5.install
@@ -1,2 +1 @@
 usr/lib/*/lib*.so.*
-usr/share/glib-2.0/schemas

diff --git a/debian/libdtkcore5.symbols b/debian/libdtkcore5.symbols
index f93778595ac88016cd0b606e2f338a25f750e2b7..7b84f238226af73ebbad40f02af7f8b42513c6d3 100644 (file)
--- a/debian/libdtkcore5.symbols
+++ b/debian/libdtkcore5.symbols
@@ -773,6 +773,7 @@ libdtkcore.so.5 libdtkcore5 #MINVER#
  _ZNK3Dtk4Core9DSettings7optionsEv@Base 5.2.2
  _ZNK3Dtk4Core9DSettings9getOptionERK7QString@Base 5.2.2
  _ZNK3Dtk4Core9DSettings9groupKeysEv@Base 5.2.2
+ _ZNK5QListI7QStringE5valueEi@Base 5.4.13
  (optional=templinst)_ZNK4QMapI7QString8QPointerIN3Dtk4Core15DSettingsOptionEEE6valuesEv@Base 5.2.2
  (optional=templinst)_ZNK4QMapI7QStringN3Dtk4Core20DDesktopEntrySectionEE4keysEv@Base 5.2.2
  (optional=templinst)_ZNK4QMapI7QStringPN3Dtk4Core16AbstractAppenderEE6valuesEv@Base 5.2.2

diff --git a/debian/patches/0001-fix-access-null-pointer.patch b/debian/patches/0001-fix-access-null-pointer.patch
deleted file mode 100644 (file)
index a5ed0a0..0000000
--- a/debian/patches/0001-fix-access-null-pointer.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: fix access null pointer
- TODO: fix access null pointer
-Author: Hu Feng <hufeng@uniontech.com>
-
-Forwarded: not-needed
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2021-03-02
-
---- dtkcore-5.4.0.orig/src/dsysinfo.cpp
-+++ dtkcore-5.4.0/src/dsysinfo.cpp
-@@ -48,6 +48,7 @@ public:
- #ifdef Q_OS_LINUX
-     void ensureDeepinInfo();
-     bool ensureOsVersion();
-+    void ensureDistributionInfo();
- #endif
-     void ensureReleaseInfo();
-     void ensureComputerInfo();
-@@ -97,6 +98,16 @@ DSysInfoPrivate::DSysInfoPrivate()
- }
- 
- #ifdef Q_OS_LINUX
-+void DSysInfoPrivate::ensureDistributionInfo()
-+{
-+    if (distributionInfo)
-+        return;
-+
-+    const QString distributionInfoFile(DSysInfo::distributionInfoPath());
-+    // Generic DDE distribution info
-+    distributionInfo.reset(new DDesktopEntry(distributionInfoFile));
-+}
-+
- void DSysInfoPrivate::ensureDeepinInfo()
- {
-     if (static_cast<int>(deepinType) >= 0)
-@@ -168,11 +179,6 @@ void DSysInfoPrivate::ensureDeepinInfo()
-     } else {
-         deepinType = DSysInfo::UnknownDeepin;
-     }
--
--    const QString distributionInfoFile(DSysInfo::distributionInfoPath());
--    // Generic DDE distribution info
--    distributionInfo.reset(new DDesktopEntry(distributionInfoFile));
--    QSettings distributionInfo(distributionInfoFile, QSettings::IniFormat); // TODO: treat as `.desktop` format instead of `.ini`
- }
- 
- bool DSysInfoPrivate::ensureOsVersion()
-@@ -734,7 +740,7 @@ QString DSysInfo::distributionInfoSectio
- QString DSysInfo::distributionOrgName(DSysInfo::OrgType type, const QLocale &locale)
- {
- #ifdef Q_OS_LINUX
--    siGlobal->ensureDeepinInfo();
-+      siGlobal->ensureDistributionInfo();
- #endif
- 
-     QString fallback = type == Distribution ? QStringLiteral("Deepin") : QString();
-@@ -757,7 +763,7 @@ QString DSysInfo::deepinDistributorName(
- QPair<QString, QString> DSysInfo::distributionOrgWebsite(DSysInfo::OrgType type)
- {
- #ifdef Q_OS_LINUX
--    siGlobal->ensureDeepinInfo();
-+      siGlobal->ensureDistributionInfo();
- #endif
- 
-     QString fallbackSiteName = type == Distribution ? QStringLiteral("www.deepin.org") : QString();

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index c6db926..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-fix-access-null-pointer.patch