[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.3-1-36-g3f24e4e

Diane Trout diane-guest at moszumanska.debian.org
Thu Jun 19 17:55:49 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=0ecda87

The following commit has been merged in the master branch:
commit 0ecda87dcf66b2e3bf73e8050106725cff124e40
Author: Diane Trout <diane at ghic.org>
Date:   Sat Jun 14 12:45:34 2014 -0700

    Remove link-against-gobject.patch. Seems unnecessary.
---
 debian/changelog                          |  1 +
 debian/patches/link-against-gobject.patch | 13 -------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7dc654..1e640d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ telepathy-qt (0.9.4-1) UNRELEASED; urgency=medium
   * Verify upstream pgp signature.
   * Remove fix_storing_avatars.patch. Applied upstream.
   * Remove create_moc_command.patch. Applied upstream.
+  * Remove link-against-gobject.patch. Seems unnecessary.
 
  -- Diane Trout <diane at ghic.org>  Sat, 14 Jun 2014 10:17:26 -0700
 
diff --git a/debian/patches/link-against-gobject.patch b/debian/patches/link-against-gobject.patch
deleted file mode 100644
index 6a83d55..0000000
--- a/debian/patches/link-against-gobject.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: link aginst gobject for symbols used by telepathy-qt?-farstream
-Author: Diane Trout <diane at ghic.org>
-
---- a/TelepathyQt/Farstream/CMakeLists.txt
-+++ b/TelepathyQt/Farstream/CMakeLists.txt
-@@ -43,6 +43,7 @@
-         ${QT_QTCORE_LIBRARY}
-         ${TELEPATHY_FARSTREAM_LIBRARIES}
-         ${TELEPATHY_GLIB_LIBRARIES}
-+        ${GOBJECT_LIBRARIES}
-         telepathy-qt${QT_VERSION_MAJOR}
-         ${TP_QT_LIBRARY_LINKER_FLAGS})
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e505833..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-link-against-gobject.patch

-- 
telepathy-qt4 packaging



More information about the pkg-kde-commits mailing list