Merge remote-tracking branch 'debian-pm/master'

This commit is contained in:
TheKit 2019-11-13 13:05:53 +01:00
commit 5edb6d17e8
13 changed files with 253 additions and 0 deletions

3
debian/.gitlab-ci.yml vendored Normal file
View file

@ -0,0 +1,3 @@
include: 'https://gitlab.com/debian-pm/tools/build/raw/master/docker/gitlab-ci-base.yml'
image: jbbgameich/build

73
debian/changelog vendored Normal file
View file

@ -0,0 +1,73 @@
pulseaudio-modules-droid (12.2.79-3) unstable; urgency=medium
* Fix pulseaudio droid module version
-- Jonah Brüchert <jbb@kaidan.im> Tue, 12 Nov 2019 12:35:51 +0100
pulseaudio-modules-droid (12.2.79-2) unstable; urgency=medium
* Fix generating the pkgconfig files with proper pathes
-- Jonah Brüchert <jbb@kaidan.im> Tue, 12 Nov 2019 12:06:47 +0100
pulseaudio-modules-droid (12.2.79-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Sun, 06 Oct 2019 15:23:45 +0200
pulseaudio-modules-droid (12.2.78-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Thu, 25 Apr 2019 22:37:38 +0200
pulseaudio-modules-droid (11.1.75-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Tue, 13 Nov 2018 21:17:39 +0100
pulseaudio-modules-droid (11.1.74-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Sat, 13 Oct 2018 20:43:53 +0200
pulseaudio-modules-droid (11.1.73-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Sat, 13 Oct 2018 20:43:29 +0200
pulseaudio-modules-droid (11.1.72-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Sun, 26 Aug 2018 12:27:09 +0200
pulseaudio-modules-droid (11.1.71-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Wed, 22 Aug 2018 14:04:55 +0200
pulseaudio-modules-droid (11.1.68-1) unstable; urgency=medium
* New upstream release
-- Jonah Brüchert <jbb@kaidan.im> Wed, 06 Jun 2018 14:03:22 +0200
pulseaudio-modules-droid (11.1.67-1) unstable; urgency=medium
* New upstream release
* Move to mer-hybris upstream
* Split packaging from source
-- Jonah Brüchert <jbb@kaidan.im> Sat, 26 May 2018 20:06:24 +0200
pulseaudio-modules-droid (0.1) xenial; urgency=medium
* Initial release.
-- Marius Gripsgard <marius@ubports.com> Fri, 19 Jan 2018 07:39:13 +0100

1
debian/compat vendored Normal file
View file

@ -0,0 +1 @@
11

29
debian/control vendored Normal file
View file

@ -0,0 +1,29 @@
Source: pulseaudio-modules-droid
Section: sound
Priority: optional
Build-Depends: android-headers (>= 23),
check,
debhelper (>= 11),
dh-exec,
intltool,
libdbus-1-dev,
libhardware-dev,
libhybris-common-dev,
libltdl-dev,
libpulse-dev,
pulseaudio-dev
Maintainer: Marius Gripsgard <marius@ubports.com>
Standards-Version: 4.3.0
Homepage: https://github.com/mer-hybris/pulseaudio-modules-droid
Vcs-Git: https://gitlab.com/debian-pm/halium/pulseaudio-modules-droid.git
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)
Package: pulseaudio-module-droid-dev
Architecture: any
Depends: pulseaudio-module-droid, ${misc:Depends}
Description: PulseAudio Droid HAL module development headers.

62
debian/copyright vendored Normal file
View file

@ -0,0 +1,62 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: pulseaudio-modules-droid
Source: https://github.com/mer-hybris/pulseaudio-modules-droid
Files: *
Copyright: 1991, 1999, Free Software Foundation, Inc.
License: UNKNOWN
Please fill license UNKNOWN from header of *
Files: debian/*
Copyright: 2018, Jonah Brüchert
2017, 2018, Marius Gripsgard
License: LGPL-2.1
Files: m4/*
Copyright: 2006, 2007, xine project
2006, 2007, Diego Pettenò <flameeyes@gmail.com>
License: GPL-2+
Files: src/*
Copyright: 2013-2018, Jolla Ltd.
License: LGPL-2.1
Files: src/Makefile.am
Copyright: 2013, 2017, Jolla Ltd.
License: LGPL-2.1
Files: src/common/Makefile.am
src/common/libdroid-util.pc.in
Copyright: 2013, 2017, Jolla Ltd.
License: LGPL-2.1
Files: src/droid/Makefile.am
Copyright: 2013, 2017, Jolla Ltd.
License: LGPL-2.1
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991, or (at
your option) any later version.
.
On Debian systems, the complete text of version 2 of the GNU General
Public License can be found in '/usr/share/common-licenses/GPL-2'.
License: LGPL-2.1
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation, version 2.1 of
the License.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

View file

@ -0,0 +1,21 @@
From fbbeb01162a59e198acc89f5330e6fe7d661c4d4 Mon Sep 17 00:00:00 2001
From: Marius Gripsgard <marius@ubports.com>
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

View file

@ -0,0 +1,16 @@
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 <jbb@kaidan.im>
--- 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)

2
debian/patches/series vendored Normal file
View file

@ -0,0 +1,2 @@
Fix-pkgconf-for-debian-based-systems.patch
detect-pulseaudio-version.patch

View file

@ -0,0 +1,2 @@
usr/include/pulsecore/modules/droid/*.h
usr/lib/*/pkgconfig/*

View file

@ -0,0 +1,7 @@
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

33
debian/rules vendored Executable file
View file

@ -0,0 +1,33 @@
#!/usr/bin/make -f
# -*- makefile -*-
include /usr/share/dpkg/default.mk
PA_MODULE_DIR := $$(readlink -f /usr/lib/pulse-*/modules)
%:
dh $@ --with=autoreconf
override_dh_auto_configure:
dh_auto_configure -- --disable-static --with-module-dir=${PA_MODULE_DIR}
override_dh_autoreconf:
echo ${DEB_VERSION_UPSTREAM} > .tarball-version
dh_autoreconf
override_dh_auto_clean:
if [ -f .tarball-version ]; then rm .tarball-version; fi
dh_auto_clean
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l/usr/lib/${DEB_HOST_MULTIARCH}/pulseaudio:/usr/lib/pulse-*/modules
override_dh_auto_install:
dh_auto_install
rm debian/tmp/usr/lib/pulse-*/modules/*.la
install -d debian/tmp/usr/include/pulsecore/modules/droid
install -m 644 src/common/*.h debian/tmp/usr/include/pulsecore/modules/droid
install -d debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
install -m 644 src/common/*.pc debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig

1
debian/source/format vendored Normal file
View file

@ -0,0 +1 @@
3.0 (quilt)

3
debian/watch vendored Normal file
View file

@ -0,0 +1,3 @@
version=4
opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/pulseaudio-modules-droid-$1\.tar\.gz/ \
https://github.com/mer-hybris/pulseaudio-modules-droid/tags .*/v?(\d\S+)\.tar\.gz