[libosmocore] 14/40: merge patched into master

[Ruben Undheim]

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

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

commit 5bd72a5f1c5b18f22ea29684fd3efd3831c0a05f
Merge: 061283b 24bf588
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Sep 16 19:01:23 2015 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../0001-Removed-illegal-pkg-config-directive.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 libosmogb.pc.in                                     |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index cdbaf00,0000000..b746bb3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- d452a48ac66d8e99a562c91660f371270d9c6b21
- d452a48ac66d8e99a562c91660f371270d9c6b21
++24bf5889ca5f902a2bda6c80bd273db99a5f39a6
++24bf5889ca5f902a2bda6c80bd273db99a5f39a6
 +d452a48ac66d8e99a562c91660f371270d9c6b21
 +d452a48ac66d8e99a562c91660f371270d9c6b21
 +libosmocore_0.8.3.orig.tar.gz
 +9d5552fb9928dc89d13d4f77aab4fbcceaae7e36
 +564575
diff --cc debian/patches/0001-Removed-illegal-pkg-config-directive.patch
index 0000000,0000000..79e613d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Removed-illegal-pkg-config-directive.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 24bf5889ca5f902a2bda6c80bd273db99a5f39a6 Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Wed, 16 Sep 2015 19:01:00 +0200
++Subject: Removed illegal pkg-config directive
++
++Gets rid of pkg-config-bad-directive lintian
++---
++ libosmogb.pc.in | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/libosmogb.pc.in b/libosmogb.pc.in
++index 33cacaf..4fc2547 100644
++--- a/libosmogb.pc.in
+++++ b/libosmogb.pc.in
++@@ -7,5 +7,5 @@ Name: Osmocom GPRS Gb Library
++ Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library
++ Version: @VERSION@
++ Libs: -L${libdir} -losmogb -losmovty
++-Cflags: -I${includedir}/ -fno-strict-aliasing
+++Cflags: -I${includedir}/
++ 
diff --cc debian/patches/series
index 0000000,0ca407b..ffcb485
mode 000000,100644..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,0 -1,1 +1,1 @@@
 -debian-changes-0.1.17-1
++0001-Removed-illegal-pkg-config-directive.patch

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