diff -Nru qmmp-1.3.1/debian/changelog qmmp-1.3.1/debian/changelog --- qmmp-1.3.1/debian/changelog 2020-01-23 18:33:49.000000000 +0000 +++ qmmp-1.3.1/debian/changelog 2020-03-03 20:44:54.000000000 +0000 @@ -1,10 +1,9 @@ -qmmp (1.3.1-1ubuntu1) focal; urgency=medium +qmmp (1.3.1-1.1) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Disable qmmp-plugin-projectm on arm64, where Qt is also linked to - GLESv2 in Ubuntu. + * Non-maintainer upload. + * Drop qmmp-plugin-projectm, projectm is being removed (Closes: #952775) - -- Rik Mills Thu, 23 Jan 2020 18:33:49 +0000 + -- Moritz Muehlenhoff Tue, 03 Mar 2020 21:44:54 +0100 qmmp (1.3.1-1) unstable; urgency=medium @@ -33,14 +32,6 @@ -- Matteo Cypriani Wed, 23 Jan 2019 20:15:21 +0100 -qmmp (1.2.2-1ubuntu1) cosmic; urgency=medium - - * Merge with Debian; remaining changes: - - Disable qmmp-plugin-projectm on arm64, where Qt is also linked to - GLESv2 in Ubuntu. - - -- Matthias Klose Mon, 23 Jul 2018 12:55:40 +0200 - qmmp (1.2.2-1) unstable; urgency=medium * Acknowledging NMU. @@ -50,20 +41,6 @@ -- Matteo Cypriani Wed, 13 Jun 2018 22:04:33 +0200 -qmmp (1.2.0-1ubuntu2) cosmic; urgency=medium - - * No-change rebuild for libcdio soname change. - - -- Matthias Klose Thu, 14 Jun 2018 00:35:30 +0000 - -qmmp (1.2.0-1ubuntu1) cosmic; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Disable qmmp-plugin-projectm on arm64, where Qt is also linked to - GLESv2 in Ubuntu. - - -- Steve Langasek Tue, 15 May 2018 11:51:42 -0700 - qmmp (1.2.0-1) unstable; urgency=medium * New upstream version 1.2.0. @@ -87,33 +64,6 @@ -- Matthias Klose Thu, 16 Nov 2017 18:35:41 +0100 -qmmp (1.1.10-1.1ubuntu2) bionic; urgency=medium - - * No-change rebuild against libcdio17 - - -- Steve Langasek Wed, 06 Dec 2017 02:52:46 +0000 - -qmmp (1.1.10-1.1ubuntu1) bionic; urgency=medium - - * Merge with Debian; remaining changes: - - -- Matthias Klose Thu, 16 Nov 2017 18:44:45 +0100 - -qmmp (1.1.10-1.1) unstable; urgency=medium - - * Non-maintainer upload. - * Build-depend on qttools5-dev. Closes: #881084. - - -- Matthias Klose Thu, 16 Nov 2017 18:35:41 +0100 - -qmmp (1.1.10-1ubuntu1) bionic; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Disable qmmp-plugin-projectm on arm64, where Qt is also linked to - GLESv2 in Ubuntu. - - -- Steve Langasek Thu, 26 Oct 2017 16:05:53 -0700 - qmmp (1.1.10-1) unstable; urgency=medium * Acknowledging NMU. @@ -123,13 +73,6 @@ -- Matteo Cypriani Thu, 24 Aug 2017 20:39:12 -0400 -qmmp (1.1.6-1.1ubuntu1) artful; urgency=medium - - * Disable qmmp-plugin-projectm on arm64, where Qt is also linked to GLESv2 - in Ubuntu. - - -- Steve Langasek Thu, 31 Aug 2017 00:26:01 -0700 - qmmp (1.1.6-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -723,4 +666,3 @@ * Initial release. (Closes: #492106) -- Eugene V. Lyubimkin Wed, 23 Jul 2008 20:48:18 +0300 - diff -Nru qmmp-1.3.1/debian/control qmmp-1.3.1/debian/control --- qmmp-1.3.1/debian/control 2020-01-23 18:31:30.000000000 +0000 +++ qmmp-1.3.1/debian/control 2020-03-02 19:20:02.000000000 +0000 @@ -1,8 +1,7 @@ Source: qmmp Section: sound Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Matteo Cypriani +Maintainer: Matteo Cypriani Build-Depends: debhelper (>= 12), cmake, pkg-config, qtbase5-dev (>= 5.4), libqt5x11extras5-dev (>= 5.4), qttools5-dev (>= 5.4), qttools5-dev-tools (>= 5.4), @@ -14,7 +13,7 @@ libavcodec-dev, libavformat-dev, libcdio-dev, libcdio-paranoia-dev, libcddb2-dev, libfaad-dev, libgme-dev, libopus-dev (>= 1.0.2), libopusfile-dev, libwildmidi-dev, libsidplayfp-dev (>= 1.0.3), - libbs2b-dev, libprojectm-dev [!armel !armhf !arm64], libenca-dev, + libbs2b-dev, libenca-dev, libarchive-dev (>= 3.2), libshout3-dev Standards-Version: 4.3.0 Homepage: http://qmmp.ylsoftware.com/ @@ -24,7 +23,7 @@ Package: qmmp Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Suggests: qmmp-plugin-projectm, mplayer, unzip, udisks2 [linux-any], +Suggests: mplayer, unzip, udisks2 [linux-any], hal [!linux-any] Replaces: libqmmp0 (<< 0.8), libqmmpui0 (<< 0.8), libqmmp-misc (<< 0.8) Breaks: libqmmp0 (<< 0.8), libqmmpui0 (<< 0.8), libqmmp-misc (<< 0.8) @@ -89,16 +88,5 @@ - ReplayGain scanner - archive reader - audio recording - - visualization (spectre analyzer, projectm) + - visualization (spectre analyzer) - global hotkeys - -Package: qmmp-plugin-projectm -Architecture: any-amd64 any-i386 any-mips any-mipsel any-powerpc any-ppc64el any-s390x any-alpha any-hppa any-m68k any-mips64el any-powerpcspe any-sh4 any-sparc64 any-x32 -Depends: ${misc:Depends}, ${shlibs:Depends}, fonts-dejavu-core -Description: qmmp audio player -- projectM visualization plugin - Qmmp is feature-rich audio player with support of many formats. - It is written in Qt. - . - See 'qmmp' package for full description. - . - This package contains projectM visualization plugin for qmmp. diff -Nru qmmp-1.3.1/debian/rules qmmp-1.3.1/debian/rules --- qmmp-1.3.1/debian/rules 2019-03-06 04:16:54.000000000 +0000 +++ qmmp-1.3.1/debian/rules 2020-03-02 22:46:12.000000000 +0000 @@ -36,11 +36,7 @@ dh_auto_build -- VERBOSE=1 override_dh_install: -ifneq (,$(filter-out armel armhf arm64,$(DEB_HOST_ARCH))) - dh_install -pqmmp-plugin-projectm -endif - chmod +x debian/tmp/usr/share/qmmp/scripts/kwin.sh - dh_install -Xprojectm + chmod +x debian/qmmp/usr/share/qmmp/scripts/kwin.sh # Avoid a call to ldconfig in postinst & postrm (ldconfig is not needed since we # only install private libraries)