Debian 3.8.1-1

diff --git a/debian/changelog b/debian/changelog
index 2c7e75b47e14681e6c9468ddb70b1311512c81a8..6b8a025461d36d9437295be05bd95b42be249b1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+minitube (3.8.1-1) UNRELEASED; urgency=medium
+
+  * New upstream version 3.8.1
+  * Rework patch: disable-update-check
+  * Drop patch: Install-AppStream-files-to-usr_share_metainfo
+    - No longer needed, changed upstream
+
+ -- Jakob Haufe <sur5r@debian.org>  Thu, 04 Mar 2021 19:44:32 +0000
+
 minitube (3.6.1-1) unstable; urgency=medium
 
   * New upstream version 3.6.1

diff --git a/debian/patches/Install-AppStream-files-to-usr_share_metainfo b/debian/patches/Install-AppStream-files-to-usr_share_metainfo
deleted file mode 100644 (file)
index 16166e6..0000000
--- a/debian/patches/Install-AppStream-files-to-usr_share_metainfo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Install AppStream metadata to /usr/share/metainfo/
-Author: Jakob Haufe <sur5r@debian.org>
-Forwarded: no
-Last-Update: 2019-07-14
-
---- minitube-3.1.orig/minitube.pro
-+++ minitube-3.1/minitube.pro
-@@ -236,7 +236,7 @@ unix:!mac {
-     sounds.files += sounds/
-     desktop.path = $$DATADIR/applications
-     desktop.files += minitube.desktop
--    appdata.path = $$DATADIR/appdata
-+    appdata.path = $$DATADIR/metainfo
-     appdata.files += minitube.appdata.xml
-     iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps
-     iconsvg.files += data/minitube.svg

diff --git a/debian/patches/disable-update-check b/debian/patches/disable-update-check
index ab15fde1304889885b39bc4b2f042bde0f86d2cf..f3b8c0990b7a6198b88b1d6e1a0cabf5c82715cc 100644 (file)
--- a/debian/patches/disable-update-check
+++ b/debian/patches/disable-update-check
@@ -1,16 +1,11 @@
 Description: Disable update check as it's useless for a packaged version
-Author: Jakob Haufe <sur5r@sur5r.net>
+Author: Jakob Haufe <sur5r@debian.org>
 
-diff --git a/minitube.pro b/minitube.pro
-index e75a41d..441cc28 100644
---- a/minitube.pro
-+++ b/minitube.pro
-@@ -281,6 +281,8 @@ mac|win32|contains(DEFINES, APP_UBUNTU):include(local/local.pri)
-     include(lib/updater/updater.pri)
- }
+--- minitube-3.8.1.orig/lib/updater/updater.pri
++++ minitube-3.8.1/lib/updater/updater.pri
+@@ -1,4 +1,4 @@
+-DEFINES *= UPDATER
++#DEFINES *= UPDATER
  
-+DEFINES -= UPDATER
-+
- message(CONFIG: $$CONFIG)
- message(DEFINES: $$DEFINES)
- message(QMAKE_CXXFLAGS: $$QMAKE_CXXFLAGS)
+ INCLUDEPATH += $$PWD/src
+ DEPENDPATH += $$PWD/src

diff --git a/debian/patches/series b/debian/patches/series
index e7ecdc5acce26e051b3222470fa11ab9a3e9a0e1..5e67db8d00524501f73e38eac391b7421cceda29 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-disable-update-check
 proper-tempfiles
-Install-AppStream-files-to-usr_share_metainfo
+disable-update-check