~ubuntu-branches/ubuntu/vivid/oss4/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/302_libsalsa_rename_to_liboss4-salsa.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL
  • Date: 2012-11-19 11:47:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20121119114724-svu8mq7x3pk64nez
Tags: 4.2-build2007-1
* New upstream release.
* Acknowledge NMU, thanks Michael Gilbert.
* Add debian/patches/110_ld-as-needed.patch: Rearrange order of linker
  arguments to fix building with "ld --as-needed" (closes: #630737).
* Add missing dependency on dpkg-dev to oss4-dkms and oss4-source
  (closes: #687086).
* Fix typo in the changelog (closes: #628876, #675933)
* Add debian/patches/002_fix-linux-oss_native_word.patch (closes: #693657).
  Thanks to Ben Hutchings.
* Add debian/patches/003_linux-error-logging-fixes.patch (closes: #693657).
  Thanks to Ben Hutchings.
* check for /lib/modules/${kernelver}/build in addition of
  /lib/modules/${kernelver}/source (closes: #587191).
* oss4-dkms.dkms.in: fix 'CLEAN' rules (closes: #653374).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Rename libsalsa into liboss4-salsa (the former would conflict for no good reason
 
2
with another package in Debian).
 
3
 
 
4
Add rpath to /usr/lib/oss4-libsalsa, where the internal lib libOSSlib resides
 
5
(as agreed on with ftp-master).
 
6
 
 
7
Index: oss4-4.2-build2004/lib/libsalsa/Makefile
 
8
===================================================================
 
9
--- oss4-4.2-build2004.orig/lib/libsalsa/Makefile       2011-06-14 11:33:24.000000000 -0500
 
10
+++ oss4-4.2-build2004/lib/libsalsa/Makefile    2011-06-14 11:33:24.000000000 -0500
 
11
@@ -46,7 +46,7 @@
 
12
                $(LIBTOOL) --mode=compile ${CC} $(CFLAGS) -c rawmidi.c 
 
13
 
 
14
 libsalsa.la:   $(LOBJECTS)
 
15
-               $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
 
16
+               $(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -R /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/oss4-libsalsa -Wl,--version-script=Versions -version-info 2:0:0 -o liboss4-salsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
 
17
 
 
18
 install:       libsalsa.la
 
19
                $(LIBTOOL) cp libsalsa.la /usr/lib