[libosmocore] 02/04: 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 fbdf9aa932903df899ce5532c95b07a11c491a88
Merge: b817d4e efc1941
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Dec 6 14:45:27 2015 +0100

    merge patched into master

 configure.ac                                         |  2 +-
 debian/.git-dpm                                      |  4 ++--
 .../0003-Setting-library-version-explicitly.patch    | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 680afbd,0000000..49cbe90
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
- eea84e9052b80269899641d5c2a72176ba1873bf
- eea84e9052b80269899641d5c2a72176ba1873bf
++efc194155b243dd6e16d7ad7a75e5447cfbf8d92
++efc194155b243dd6e16d7ad7a75e5447cfbf8d92
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +libosmocore_0.9.0.orig.tar.gz
 +705eca7a77d295fcaf08ed4c3d0feb8b696fe914
 +574737
diff --cc debian/patches/0003-Setting-library-version-explicitly.patch
index 0000000,0000000..219ad92
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Setting-library-version-explicitly.patch
@@@ -1,0 -1,0 +1,20 @@@
++From efc194155b243dd6e16d7ad7a75e5447cfbf8d92 Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Sun, 6 Dec 2015 14:44:46 +0100
++Subject: Setting library version explicitly
++
++---
++ configure.ac | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/configure.ac b/configure.ac
++index 9a744b1..eb192d7 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -1,5 +1,5 @@
++ AC_INIT([libosmocore],
++-	m4_esyscmd([./git-version-gen .tarball-version]),
+++	0.9.0,
++ 	[openbsc at lists.osmocom.org])
++ 
++ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects])
diff --cc debian/patches/series
index 5edaf1c,0ca407b..f67bb89
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,1 +1,3 @@@
 -debian-changes-0.1.17-1
 +0001-Removed-illegal-pkg-config-directive.patch
 +0002-Some-spelling-errors-corrected.patch
++0003-Setting-library-version-explicitly.patch

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