Remove metadependency that breaks Neon

KDE · Jul 3, 2020 · 12a162e · 12a162e
1 parent 7d8d2e4
commit 12a162e
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 25 deletions.
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/changelog b/distribution/deb_packaging/ubuntu/18.04/debian/changelog
@@ -1,3 +1,9 @@
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
 amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
 
   * Replace usage of QJSEngine:importModule to compile with QT5.8

diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/control b/distribution/deb_packaging/ubuntu/18.04/debian/control
@@ -62,17 +62,15 @@ Build-Depends: debhelper-compat (= 11),
                qtquickcontrols2-5-dev,
                qtscript5-dev,
                qtwebengine5-dev
-Depends:
-               libqt5qml5 | qtdeclarative-abi-5-9-5
 Standards-Version: 4.4.0
-Homepage: https://github.com/pcgomes/amarok
-#Vcs-Browser: https://salsa.debian.org/debian/amarok
-#Vcs-Git: https://salsa.debian.org/debian/amarok.git
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
 
 Package: amarok
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Amarok for KDE5
- Since (K)ubuntu 19.10, applications that were not ported to QT5 are no longer supported.
- Amarok has not been completely ported yet, but is usable. So I create packages for KDE5
- until the final port is concluded.
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/rules b/distribution/deb_packaging/ubuntu/18.04/debian/rules
@@ -25,3 +25,6 @@ override_dh_auto_configure:
 #	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
+override_dh_shlibdeps:
+# Remove metapackage to be compatible with Neon
+	dh_shlibdeps -- -xqtdeclarative-abi-5-9-5
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/changelog b/distribution/deb_packaging/ubuntu/19.10/debian/changelog
@@ -1,3 +1,9 @@
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
 amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
 
   * Replace usage of QJSEngine:importModule to compile with QT5.8

diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/control b/distribution/deb_packaging/ubuntu/19.10/debian/control
@@ -64,17 +64,15 @@ Build-Depends: debhelper-compat (= 12),
                qtquickcontrols2-5-dev,
                qtscript5-dev,
                qtwebengine5-dev
-Depends:
-               libqt5qml5
 Standards-Version: 4.4.0
-Homepage: https://github.com/pcgomes/amarok
-#Vcs-Browser: https://salsa.debian.org/debian/amarok
-#Vcs-Git: https://salsa.debian.org/debian/amarok.git
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
 
 Package: amarok
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Amarok for KDE5
- Since (K)ubuntu 19.10, applications that were not ported to QT5 are no longer supported.
- Amarok has not been completely ported yet, but is usable. So I create packages for KDE5
- until the final port is concluded.
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/rules b/distribution/deb_packaging/ubuntu/19.10/debian/rules
@@ -25,3 +25,6 @@ override_dh_auto_configure:
 #	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config
 
+override_dh_shlibdeps:
+# Remove metapackage to be compatible with Neon
+	dh_shlibdeps -- -xqtdeclarative-abi-5-12-4
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/changelog b/distribution/deb_packaging/ubuntu/20.04/debian/changelog
@@ -1,3 +1,9 @@
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
 amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
 
   * Replace usage of QJSEngine:importModule to compile with QT5.8

diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/control b/distribution/deb_packaging/ubuntu/20.04/debian/control
@@ -64,17 +64,15 @@ Build-Depends: debhelper-compat (= 12),
                qtquickcontrols2-5-dev,
                qtscript5-dev,
                qtwebengine5-dev
-Depends:
-               libqt5qml5
 Standards-Version: 4.4.0
-Homepage: https://github.com/pcgomes/amarok
-#Vcs-Browser: https://salsa.debian.org/debian/amarok
-#Vcs-Git: https://salsa.debian.org/debian/amarok.git
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
 
 Package: amarok
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Amarok for KDE5
- Since (K)ubuntu 19.10, applications that were not ported to QT5 are no longer supported.
- Amarok has not been completely ported yet, but is usable. So I create packages for KDE5
- until the final port is concluded.
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/rules b/distribution/deb_packaging/ubuntu/20.04/debian/rules
@@ -25,3 +25,6 @@ override_dh_auto_configure:
 #	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config
 
+override_dh_shlibdeps:
+# Remove metapackage to be compatible with Neon
+	dh_shlibdeps -- -xqtdeclarative-abi-5-12-8
diff --git a/distribution/deb_packaging/ubuntu/changelog_edit.sh b/distribution/deb_packaging/ubuntu/changelog_edit.sh
@@ -2,7 +2,7 @@
 DATENOW=$(date "+%s"); for i in 18.04_bionic 19.10_eoan 20.04_focal; do version=$(echo $i|cut -d_ -f1); code=$(echo $i|cut -d_ -f2); cat << EOF > ${version}/new_cl_entry; cat ${version}/new_cl_entry ${version}/debian/changelog > ${version}/new_cl; mv ${version}/new_cl ${version}/debian/changelog; rm ${version}/new_cl*; done
 amarok (2:2.9.70+1SNAPSHOT$(date -d "@${DATENOW}" +"%Y%m%d%H%M%S%z")-0ubuntu1ppa1~ubuntu${version}.1) ${code}; urgency=medium
 
-  * Replace usage of QJSEngine:importModule to compile with QT5.8
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
 
  -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  $(date -R -d "@${DATENOW}")