[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 31 15:03:11 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=7321f23
The following commit has been merged in the master branch:
commit 7321f2375b1d9743aa44f7c8cb85564326364423
Author: Rohan Garg <rohangarg at kubuntu.org>
Date: Wed Nov 13 19:51:24 2013 +0100
* Import new_linphone.diff patch from debian, to fix FTBFS against new
linphone.
* Bump to Boost 1.54.
---
debian/changelog | 13 +++++++++++++
debian/control | 2 +-
debian/patches/series | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index c001387..9fc7278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+kopete (4:4.11.2-0ubuntu3) trusty; urgency=low
+
+ * Import new_linphone.diff patch from debian, to fix FTBFS against new
+ linphone.
+
+ -- Dmitrijs Ledkovs <xnox at ubuntu.com> Wed, 30 Oct 2013 23:09:31 +0000
+
+kopete (4:4.11.2-0ubuntu2) trusty; urgency=low
+
+ * Bump to Boost 1.54.
+
+ -- Dmitrijs Ledkovs <xnox at ubuntu.com> Sat, 26 Oct 2013 22:26:43 +0100
+
kopete (4:4.11.2-0ubuntu1) saucy; urgency=low
* New upstream bugfix release
diff --git a/debian/control b/debian/control
index cca0219..f50d732 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
libssl-dev, libxss-dev,
libmediastreamer-dev, libmeanwhile-dev, libgadu-dev,
libjasper-dev, libgif-dev, libotr2-dev, libjsoncpp-dev,
- libboost1.53-dev, libv4l-dev, libexpat1-dev, libsrtp0-dev,
+ libboost1.54-dev, libv4l-dev, libexpat1-dev, libsrtp0-dev,
libasound2-dev
Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64]
Standards-Version: 3.9.4
diff --git a/debian/patches/series b/debian/patches/series
index b2ed00c..a86d042 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
kubuntu_03_no_mediastreamer_in_wlm.diff
+new_linphone.diff
--
kopete packaging
More information about the pkg-kde-commits
mailing list