[neon/extras/amarok/Neon/unstable] debian: simplify packaging

[Jonathan Riddell]

Git commit 03db440fbbdf9b9d2744bbf532c9b8cefd0064f2 by Jonathan Riddell.
Committed on 15/02/2021 at 17:41.
Pushed by jriddell into branch 'Neon/unstable'.

simplify packaging

D  +0    -1    debian/amarok-common.dirs
D  +0    -64   debian/amarok-common.install
D  +0    -10   debian/amarok-doc.install
D  +0    -6    debian/amarok-utils.install
D  +0    -2    debian/amarok-utils.lintian-overrides
D  +0    -1    debian/amarok-utils.manpages
D  +0    -62   debian/amarok.install
D  +0    -4    debian/amarok.lintian-overrides
D  +0    -1    debian/amarok.manpages
M  +0    -43   debian/control
M  +1    -30   debian/rules

https://invent.kde.org/neon/extras/amarok/commit/03db440fbbdf9b9d2744bbf532c9b8cefd0064f2

diff --git a/debian/amarok-common.dirs b/debian/amarok-common.dirs
deleted file mode 100644
index bcbf356a..00000000
--- a/debian/amarok-common.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kde4/apps/amarok/mysqle
diff --git a/debian/amarok-common.install b/debian/amarok-common.install
deleted file mode 100644
index ac64bd4a..00000000
--- a/debian/amarok-common.install
+++ /dev/null
@@ -1,64 +0,0 @@
-usr/share/icons/hicolor/*
-usr/share/kde4/apps/amarok/*
-usr/share/kde4/apps/desktoptheme/*
-usr/share/kde4/apps/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
-usr/share/kde4/apps/solid/actions/amarok-play-audiocd.desktop
-usr/share/kde4/config.kcfg/*
-usr/share/kde4/config/amarok.knsrc
-usr/share/kde4/config/amarok_homerc
-usr/share/kde4/config/amarokapplets.knsrc
-usr/share/kde4/services/ServiceMenus/*
-usr/share/kde4/services/amarok-containment-vertical.desktop
-usr/share/kde4/services/amarok-context-applet-albums.desktop
-usr/share/kde4/services/amarok-context-applet-analyzer.desktop
-usr/share/kde4/services/amarok-context-applet-currenttrack.desktop
-usr/share/kde4/services/amarok-context-applet-info.desktop
-usr/share/kde4/services/amarok-context-applet-labels.desktop
-usr/share/kde4/services/amarok-context-applet-lyrics.desktop
-usr/share/kde4/services/amarok-context-applet-photos.desktop
-usr/share/kde4/services/amarok-context-applet-similarArtists.desktop
-usr/share/kde4/services/amarok-context-applet-tabs.desktop
-usr/share/kde4/services/amarok-context-applet-upcomingEvents.desktop
-usr/share/kde4/services/amarok-context-applet-wikipedia.desktop
-usr/share/kde4/services/amarok-data-engine-current.desktop
-usr/share/kde4/services/amarok-data-engine-info.desktop
-usr/share/kde4/services/amarok-data-engine-labels.desktop
-usr/share/kde4/services/amarok-data-engine-lyrics.desktop
-usr/share/kde4/services/amarok-data-engine-photos.desktop
-usr/share/kde4/services/amarok-data-engine-similarArtists.desktop
-usr/share/kde4/services/amarok-data-engine-tabs.desktop
-usr/share/kde4/services/amarok-data-engine-upcomingEvents.desktop
-usr/share/kde4/services/amarok-data-engine-wikipedia.desktop
-usr/share/kde4/services/amarok_collection-audiocdcollection.desktop
-usr/share/kde4/services/amarok_collection-daapcollection.desktop
-usr/share/kde4/services/amarok_collection-ipodcollection.desktop
-usr/share/kde4/services/amarok_collection-mtpcollection.desktop
-usr/share/kde4/services/amarok_collection-mysqlcollection.desktop
-usr/share/kde4/services/amarok_collection-playdarcollection.desktop
-usr/share/kde4/services/amarok_collection-umscollection.desktop
-usr/share/kde4/services/amarok_collection-upnpcollection.desktop
-usr/share/kde4/services/amarok_importer-amarok.desktop
-usr/share/kde4/services/amarok_importer-banshee.desktop
-usr/share/kde4/services/amarok_importer-clementine.desktop
-usr/share/kde4/services/amarok_importer-fastforward.desktop
-usr/share/kde4/services/amarok_importer-itunes.desktop
-usr/share/kde4/services/amarok_importer-rhythmbox.desktop
-usr/share/kde4/services/amarok_service_amazonstore.desktop
-usr/share/kde4/services/amarok_service_amazonstore_config.desktop
-usr/share/kde4/services/amarok_service_ampache.desktop
-usr/share/kde4/services/amarok_service_ampache_config.desktop
-usr/share/kde4/services/amarok_service_jamendo.desktop
-usr/share/kde4/services/amarok_service_lastfm.desktop
-usr/share/kde4/services/amarok_service_lastfm_config.desktop
-usr/share/kde4/services/amarok_service_magnatunestore.desktop
-usr/share/kde4/services/amarok_service_magnatunestore_config.desktop
-usr/share/kde4/services/amarok_service_opmldirectory.desktop
-usr/share/kde4/services/amarok_storage-mysqlestorage.desktop
-usr/share/kde4/services/amarok_storage-mysqlserverstorage.desktop
-usr/share/kde4/services/amarokitpc.protocol
-usr/share/kde4/services/amaroklastfm.protocol
-usr/share/kde4/servicetypes/amarok_codecinstall.desktop
-usr/share/kde4/servicetypes/amarok_context_applet.desktop
-usr/share/kde4/servicetypes/amarok_data_engine.desktop
-usr/share/kde4/servicetypes/amarok_plugin.desktop
-usr/share/locale/*
diff --git a/debian/amarok-doc.install b/debian/amarok-doc.install
deleted file mode 100644
index 84bb0d86..00000000
--- a/debian/amarok-doc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/share/doc/kde/HTML/de/*
-usr/share/doc/kde/HTML/en/*
-usr/share/doc/kde/HTML/es/*
-usr/share/doc/kde/HTML/fr/*
-usr/share/doc/kde/HTML/nl/*
-usr/share/doc/kde/HTML/pt/*
-usr/share/doc/kde/HTML/pt_BR/*
-usr/share/doc/kde/HTML/ru/*
-usr/share/doc/kde/HTML/sv/*
-usr/share/doc/kde/HTML/uk/*
diff --git a/debian/amarok-utils.install b/debian/amarok-utils.install
deleted file mode 100644
index e420aace..00000000
--- a/debian/amarok-utils.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/amarok_afttagger
-usr/bin/amarokcollectionscanner
-usr/bin/amzdownloader
-usr/lib/libamarokshared.so.1*
-usr/share/applications/kde4/amzdownloader.desktop
-usr/share/mime/packages/amzdownloader.xml
diff --git a/debian/amarok-utils.lintian-overrides b/debian/amarok-utils.lintian-overrides
deleted file mode 100644
index 4f1e38ee..00000000
--- a/debian/amarok-utils.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-amarok-utils: package-name-doesnt-match-sonames libamarokshared1
-amarok-utils: no-symbols-control-file
diff --git a/debian/amarok-utils.manpages b/debian/amarok-utils.manpages
deleted file mode 100644
index 8a48cad8..00000000
--- a/debian/amarok-utils.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/amarokcollectionscanner.1
diff --git a/debian/amarok.install b/debian/amarok.install
deleted file mode 100644
index 579d07ec..00000000
--- a/debian/amarok.install
+++ /dev/null
@@ -1,62 +0,0 @@
-usr/bin/amarok
-usr/bin/amarokpkg
-usr/lib/kde4/amarok_collection-audiocdcollection.so
-usr/lib/kde4/amarok_collection-daapcollection.so
-usr/lib/kde4/amarok_collection-ipodcollection.so
-usr/lib/kde4/amarok_collection-mtpcollection.so
-usr/lib/kde4/amarok_collection-mysqlcollection.so
-usr/lib/kde4/amarok_collection-playdarcollection.so
-usr/lib/kde4/amarok_collection-umscollection.so
-usr/lib/kde4/amarok_collection-upnpcollection.so
-usr/lib/kde4/amarok_containment_vertical.so
-usr/lib/kde4/amarok_context_applet_albums.so
-usr/lib/kde4/amarok_context_applet_analyzer.so
-usr/lib/kde4/amarok_context_applet_currenttrack.so
-usr/lib/kde4/amarok_context_applet_info.so
-usr/lib/kde4/amarok_context_applet_labels.so
-usr/lib/kde4/amarok_context_applet_lyrics.so
-usr/lib/kde4/amarok_context_applet_photos.so
-usr/lib/kde4/amarok_context_applet_similarArtists.so
-usr/lib/kde4/amarok_context_applet_tabs.so
-usr/lib/kde4/amarok_context_applet_upcomingEvents.so
-usr/lib/kde4/amarok_context_applet_wikipedia.so
-usr/lib/kde4/amarok_data_engine_current.so
-usr/lib/kde4/amarok_data_engine_info.so
-usr/lib/kde4/amarok_data_engine_labels.so
-usr/lib/kde4/amarok_data_engine_lyrics.so
-usr/lib/kde4/amarok_data_engine_photos.so
-usr/lib/kde4/amarok_data_engine_similarArtists.so
-usr/lib/kde4/amarok_data_engine_tabs.so
-usr/lib/kde4/amarok_data_engine_upcomingEvents.so
-usr/lib/kde4/amarok_data_engine_wikipedia.so
-usr/lib/kde4/amarok_importer-amarok.so
-usr/lib/kde4/amarok_importer-banshee.so
-usr/lib/kde4/amarok_importer-clementine.so
-usr/lib/kde4/amarok_importer-fastforward.so
-usr/lib/kde4/amarok_importer-itunes.so
-usr/lib/kde4/amarok_importer-rhythmbox.so
-usr/lib/kde4/amarok_service_amazonstore.so
-usr/lib/kde4/amarok_service_ampache.so
-usr/lib/kde4/amarok_service_jamendo.so
-usr/lib/kde4/amarok_service_lastfm.so
-usr/lib/kde4/amarok_service_magnatunestore.so
-usr/lib/kde4/amarok_service_opmldirectory.so
-usr/lib/kde4/amarok_storage-mysqlestorage.so
-usr/lib/kde4/amarok_storage-mysqlserverstorage.so
-usr/lib/kde4/kcm_amarok_service_amazonstore.so
-usr/lib/kde4/kcm_amarok_service_ampache.so
-usr/lib/kde4/kcm_amarok_service_lastfm.so
-usr/lib/kde4/kcm_amarok_service_magnatunestore.so
-usr/lib/libamarok-sqlcollection.so.1*
-usr/lib/libamarok-transcoding.so.1*
-usr/lib/libamarok_service_lastfm_shared.so
-usr/lib/libamarokcore.so.1*
-usr/lib/libamaroklib.so.1*
-usr/lib/libamarokocsclient.so.4*
-usr/lib/libamarokpud.so.1*
-usr/lib/libampache_account_login.so
-usr/share/applications/kde4/org.kde.amarok.desktop
-usr/share/applications/kde4/org.kde.amarok_containers.desktop
-usr/share/kde4/apps/kconf_update/amarok.upd
-usr/share/kde4/services/amarok.protocol
-usr/share/metainfo/org.kde.amarok.appdata.xml
diff --git a/debian/amarok.lintian-overrides b/debian/amarok.lintian-overrides
deleted file mode 100644
index d07b3c82..00000000
--- a/debian/amarok.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-amarok: package-name-doesnt-match-sonames
-amarok: shlib-without-versioned-soname usr/lib/libamarok_service_lastfm_shared.so libamarok_service_lastfm_shared.so
-amarok: shlib-without-versioned-soname usr/lib/libampache_account_login.so libampache_account_login.so
-amarok: no-symbols-control-file
diff --git a/debian/amarok.manpages b/debian/amarok.manpages
deleted file mode 100644
index 169c2fbb..00000000
--- a/debian/amarok.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/amarok.1
diff --git a/debian/control b/debian/control
index b182663d..27ebd4b6 100644
--- a/debian/control
+++ b/debian/control
@@ -107,46 +107,3 @@ Description: easy to use media player based on the KDE Platform
      easier with Amarok's powerful tagging, renaming, and sorting abilities.
    - Database Importing - import collections from Amarok 1.4 or iTunes.
    - Scriptable Services - integrate other web services into Amarok.
-
-Package: amarok-common
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}
-Recommends: amarok (>= ${source:Version})
-Description: architecture independent files for Amarok
- This package contains architecture independent files needed for Amarok to run
- properly. Therefore, unless you have 'amarok' package of the same version
- installed, you will hardly find this package useful.
- .
- Amarok is a powerful music player with an intuitive interface.
-
-Package: amarok-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: amarok-common (<= 2.5.0-2)
-Breaks: amarok-common (<= 2.5.0-2)
-Recommends: amarok (>= ${source:Version}), khelpcenter
-Description: Amarok documentation (Handbook)
- This package contains Amarok user documentation in various languages. It can be
- opened from the application menu Help -> Amarok Handbook.
- .
- Amarok is a powerful music player with an intuitive interface.
-
-Package: amarok-utils
-Section: utils
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: amarok (<< 2.8.0)
-Breaks: amarok (<< 2.8.0)
-Description: utilities for Amarok media player
- This package contains command line utilities that are typically used by Amarok
- media player but might also be useful on systems without Amarok installed.
- They are designed to be lightweight as they do not depend on KDE libraries.
- .
- Currently the package contains the following utilities:
-   - amarokcollectionscanner - scans audio files, collects information from
-     file tags and prints it in the structured XML format.
-   - amarok_afttagger - a helper program which writes/removes custom tags
-     to/from media files required for embedded "Amarok File Tracking".
-   - amzdownloader - easily download your files from Amazon if you have their
-     references in an encrypted .amz file.
diff --git a/debian/rules b/debian/rules
index c104c371..11dd218f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,36 +3,7 @@
 #export DEB_KDE_LINK_WITH_AS_NEEDED := yes
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-override_dh_auto_configure:
-	dh_auto_configure -Skde -- -DKDE4_BUILD_TESTS=false
-
-override_dh_bugfiles:
-	dh_bugfiles -A
-
-override_dh_install:
-	dh_install
-	# Copy English errmsg.sys from mysql-server-core package
-	if [ -d debian/amarok-common ]; then \
-	    cp -a /usr/share/mysql/english/errmsg.sys debian/amarok-common/usr/share/kde4/apps/amarok/mysqle/; \
-	fi
-
-override_dh_strip:
-	dh_strip --dbgsym-migration='amarok-dbg (<< 2.8.0-5~)'
-
-override_dh_auto_install:
-	dh_auto_install
-	# Remove development stuff
-	find debian/tmp -name '*.so' -type l -delete
-	rm -rf debian/tmp/usr/share/dbus-1/interfaces/
-	# Remove extra COPYING files
-	find debian/tmp -name COPYING -type f -delete
-	# At the end, remove empty directories
-	find debian/tmp -type d -empty -delete
-
-override_dh_missing:
-	dh_missing --fail-missing
-
 %:
-	dh $@ --with kde
+	dh $@ --with kf5
 
 .PHONY: override_dh_auto_test