diff --git a/debian/changelog b/debian/changelog index b3dbc20..cac0ce6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pulseaudio-modules-droid (12.2.79+gemian) buster; urgency=medium + + * Branch packaging for Gemian + + -- TheKit Wed, 13 Nov 2019 13:39:31 +0100 + pulseaudio-modules-droid (12.2.79-3) unstable; urgency=medium * Fix pulseaudio droid module version diff --git a/debian/control b/debian/control index f695124..eadc414 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Vcs-Browser: https://gitlab.com/debian-pm/halium/pulseaudio-modules-droid Package: pulseaudio-module-droid Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Description: PulseAudio Droid HAL module. (JOLLA TEST VERSION) +Description: PulseAudio Droid HAL module. Package: pulseaudio-module-droid-dev Architecture: any diff --git a/debian/patches/Fix-pkgconf-for-debian-based-systems.patch b/debian/patches/Fix-pkgconf-for-debian-based-systems.patch deleted file mode 100644 index f7ea41c..0000000 --- a/debian/patches/Fix-pkgconf-for-debian-based-systems.patch +++ /dev/null @@ -1,21 +0,0 @@ -From fbbeb01162a59e198acc89f5330e6fe7d661c4d4 Mon Sep 17 00:00:00 2001 -From: Marius Gripsgard -Date: Tue, 10 Apr 2018 01:48:14 +0200 -Subject: [PATCH] Fix pkgconf for debian based systems. - -Since debian based systems uses lib/{arch}/ as libdir and /usr/lib/pulse-* for modules this causes -L to search for -ldroid-utils in lib/{arch}/ ---- - src/common/libdroid-util.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/libdroid-util.pc.in b/src/common/libdroid-util.pc.in -index 523e4b0..32c77a1 100644 ---- a/src/common/libdroid-util.pc.in -+++ b/src/common/libdroid-util.pc.in -@@ -7,5 +7,5 @@ libexecdir=@libexecdir@ - Name: libdroid-util - Description: Common droid module building interface. - Version: @PA_MODULE_VERSION@ --Libs: -L${libdir}/pulse-@PA_MAJORMINOR@/modules -ldroid-util -+Libs: -L${prefix}/lib/pulse-@PA_MAJORMINOR@/modules -ldroid-util - Cflags: -D_REENTRANT -I${includedir}/pulsecore/modules diff --git a/debian/patches/detect-pulseaudio-version.patch b/debian/patches/detect-pulseaudio-version.patch deleted file mode 100644 index f304943..0000000 --- a/debian/patches/detect-pulseaudio-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Detect pulseaudio version from the system, don't assume it's always the same as the droid module's one -Author: Jonah BrĂ¼chert - ---- a/configure.ac -+++ b/configure.ac -@@ -20,8 +20,8 @@ - AM_PROG_CC_C_O - AC_PROG_GCC_TRADITIONAL - --m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) --m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) -+m4_define(pa_major, `pkg-config --modversion libpulse | cut -d. -f1 | cut -d- -f1`) -+m4_define(pa_minor, `pkg-config --modversion libpulse | cut -d. -f2 | cut -d- -f1`) - m4_define(pa_module_version, `echo $VERSION | cut -d. -f3 | cut -d- -f1`) - - AC_SUBST(PA_MAJOR, pa_major) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index c829042..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -Fix-pkgconf-for-debian-based-systems.patch -detect-pulseaudio-version.patch diff --git a/debian/pulseaudio-module-droid.install b/debian/pulseaudio-module-droid.install index e9a0db5..84594a6 100644 --- a/debian/pulseaudio-module-droid.install +++ b/debian/pulseaudio-module-droid.install @@ -2,6 +2,5 @@ usr/lib/pulse-*/modules/libdroid-sink*.so usr/lib/pulse-*/modules/libdroid-source*.so usr/lib/pulse-*/modules/libdroid-util*.so usr/lib/pulse-*/modules/module-droid-card*.so -usr/lib/pulse-*/modules/module-droid-keepalive*.so usr/lib/pulse-*/modules/module-droid-sink*.so usr/lib/pulse-*/modules/module-droid-source*.so diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)