[libosmo-sccp] 01/01: Fix library name in .pc files. Describe why libraries have been renamed in patch

Ruben Undheim rubund-guest at moszumanska.debian.org
Fri Feb 5 23:52:39 UTC 2016


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository libosmo-sccp.

commit 32359f57ca7b470671ed34d024f8b04d93ebd92e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat Feb 6 00:51:25 2016 +0100

    Fix library name in .pc files. Describe why libraries have been renamed in patch
---
 debian/patches/01_make_library_shared.patch | 38 +++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/debian/patches/01_make_library_shared.patch b/debian/patches/01_make_library_shared.patch
index cf04e55..f199362 100644
--- a/debian/patches/01_make_library_shared.patch
+++ b/debian/patches/01_make_library_shared.patch
@@ -1,11 +1,13 @@
 Description: Upstream only delivers static libraries. This patch changes these
- to shared libraries.
+ to shared libraries. In addition, the libraries are renamed to make it clearer
+ what they are (and because of a conflict in the Debian namespace for one of
+ them)
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 
 Index: libosmo-sccp/src/Makefile.am
 ===================================================================
---- libosmo-sccp.orig/src/Makefile.am	2016-02-05 16:46:17.942822181 +0100
-+++ libosmo-sccp/src/Makefile.am	2016-02-05 16:46:17.938822285 +0100
+--- libosmo-sccp.orig/src/Makefile.am	2016-02-06 00:49:23.908103167 +0100
++++ libosmo-sccp/src/Makefile.am	2016-02-06 00:49:23.900103276 +0100
 @@ -2,8 +2,11 @@
  AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS)
  
@@ -24,8 +26,8 @@ Index: libosmo-sccp/src/Makefile.am
 +libosmoxua_la_LDFLAGS= -shared -fPIC
 Index: libosmo-sccp/configure.ac
 ===================================================================
---- libosmo-sccp.orig/configure.ac	2016-02-05 16:46:17.942822181 +0100
-+++ libosmo-sccp/configure.ac	2016-02-05 16:46:17.938822285 +0100
+--- libosmo-sccp.orig/configure.ac	2016-02-06 00:49:23.908103167 +0100
++++ libosmo-sccp/configure.ac	2016-02-06 00:49:27.000000000 +0100
 @@ -12,6 +12,7 @@
  dnl checks for programs
  AC_PROG_MAKE_SET
@@ -36,11 +38,33 @@ Index: libosmo-sccp/configure.ac
  
 Index: libosmo-sccp/tests/m2ua/Makefile.am
 ===================================================================
---- libosmo-sccp.orig/tests/m2ua/Makefile.am	2016-02-05 16:22:38.984126416 +0100
-+++ libosmo-sccp/tests/m2ua/Makefile.am	2016-02-05 16:47:43.716668900 +0100
+--- libosmo-sccp.orig/tests/m2ua/Makefile.am	2016-02-06 00:49:23.908103167 +0100
++++ libosmo-sccp/tests/m2ua/Makefile.am	2016-02-06 00:49:23.900103276 +0100
 @@ -5,4 +5,4 @@
  
  noinst_PROGRAMS = m2ua_test
  m2ua_test_SOURCES = m2ua_test.c
 -m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
 +m2ua_test_LDADD = $(top_builddir)/src/libosmoxua.la $(LIBOSMOCORE_LIBS)
+Index: libosmo-sccp/libosmo-mtp.pc.in
+===================================================================
+--- libosmo-sccp.orig/libosmo-mtp.pc.in	2016-02-05 16:56:35.845659264 +0100
++++ libosmo-sccp/libosmo-mtp.pc.in	2016-02-06 00:49:42.451845664 +0100
+@@ -6,5 +6,5 @@
+ Name: Osmo MTP Lib
+ Description: Osmo MTP Lib
+ Version: @VERSION@
+-Libs: -L${libdir} -lmtp
++Libs: -L${libdir} -losmomtp
+ Cflags: -I${includedir}/
+Index: libosmo-sccp/libosmo-sccp.pc.in
+===================================================================
+--- libosmo-sccp.orig/libosmo-sccp.pc.in	2016-02-05 16:56:35.845659264 +0100
++++ libosmo-sccp/libosmo-sccp.pc.in	2016-02-06 00:50:00.707582698 +0100
+@@ -6,5 +6,5 @@
+ Name: OpenBSC SCCP Lib
+ Description: OpenBSC SCCP Lib
+ Version: @VERSION@
+-Libs: -L${libdir} -lsccp
++Libs: -L${libdir} -losmosccp -losmoxua
+ Cflags: -I${includedir}/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmo-sccp.git



More information about the debian-science-commits mailing list