[pulseaudio] 04/05: Drop build-sys-Fix-install-order-of-libpulsecore.patch, applied upstream
Felipe Sateler
fsateler at moszumanska.debian.org
Tue Jan 19 02:27:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
fsateler pushed a commit to branch master
in repository pulseaudio.
commit bf78ea6267e0947019363b5371dc405f1c94d044
Author: Felipe Sateler <fsateler at debian.org>
Date: Fri Jan 15 18:21:08 2016 -0300
Drop build-sys-Fix-install-order-of-libpulsecore.patch, applied upstream
---
debian/changelog | 2 +
...ild-sys-Fix-install-order-of-libpulsecore.patch | 44 ----------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1095dba..874057b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
pulseaudio (7.99.2-1) UNRELEASED; urgency=medium
* New upstream release candidate
+ * Drop build-sys-Fix-install-order-of-libpulsecore.patch, applied
+ upstream
-- Felipe Sateler <fsateler at debian.org> Fri, 15 Jan 2016 18:19:58 -0300
diff --git a/debian/patches/0001-build-sys-Fix-install-order-of-libpulsecore.patch b/debian/patches/0001-build-sys-Fix-install-order-of-libpulsecore.patch
deleted file mode 100644
index 1a2e290..0000000
--- a/debian/patches/0001-build-sys-Fix-install-order-of-libpulsecore.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Mon, 28 Dec 2015 20:16:18 -0300
-Subject: build-sys: Fix install order of libpulsecore
-
-It needs to be installed after libpulse, because of libtool relinking.
----
- src/Makefile.am | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3c035aa..b0ca2bc 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -631,7 +631,8 @@ lo_latency_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
- # Common library #
- ###################################
-
--pkglib_LTLIBRARIES = \
-+commonlibdir = $(pkglibdir)
-+commonlib_LTLIBRARIES = \
- libpulsecommon- at PA_MAJORMINOR@.la
-
- # We duplicate files from pulse/ in this to allow as-needed linking. If we did
-@@ -918,7 +919,7 @@ libpulsedsp_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version -disable-
- # Daemon core library #
- ###################################
-
--pkglib_LTLIBRARIES += libpulsecore- at PA_MAJORMINOR@.la
-+pkglib_LTLIBRARIES = libpulsecore- at PA_MAJORMINOR@.la
-
- # Pure core stuff
- libpulsecore_ at PA_MAJORMINOR@_la_SOURCES = \
-@@ -2262,7 +2263,10 @@ update-all: update-ffmpeg update-map-file
- # Isn't libtool/autotools fun!
-
- installlibLTLIBRARIES = install-libLTLIBRARIES
--$(installlibLTLIBRARIES): install-pkglibLTLIBRARIES
-+$(installlibLTLIBRARIES): install-commonlibLTLIBRARIES
-+
-+installpkglibLTLIBRARIES = install-pkglibLTLIBRARIES
-+$(installpkglibLTLIBRARIES): install-libLTLIBRARIES
-
- installmodlibexecLTLIBRARIES = install-modlibexecLTLIBRARIES
- $(installmodlibexecLTLIBRARIES): install-pkglibLTLIBRARIES install-libLTLIBRARIES
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b463a04..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-build-sys-Fix-install-order-of-libpulsecore.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git
More information about the pkg-pulseaudio-devel
mailing list