[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-4-15-g12a11cd
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Nov 9 15:20:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=12a11cd
The following commit has been merged in the master branch:
commit 12a11cd4b265926f670945052e6dfd4652de76c1
Author: Rohan Garg <rohan at garg.io>
Date: Wed Nov 9 16:20:50 2016 +0100
New upstream release
* New upstream release
* Drop upstreamed patches
* Refresh improve-doxygen-build.patch
---
debian/changelog | 8 ++-
debian/patches/fix-deprecated-bsd-source.patch | 14 -----
debian/patches/fix-failing-test.patch | 21 --------
debian/patches/force-service-pic.patch | 17 ------
debian/patches/gstreamer-1.5.patch | 74 --------------------------
debian/patches/improve-doxygen-build.patch | 33 ++++++------
debian/patches/series | 5 --
debian/patches/update-doxygen.patch | 49 -----------------
debian/rules | 3 +-
9 files changed, 26 insertions(+), 198 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 07c6bfc..fef7047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
-telepathy-qt (0.9.7-7) UNRELEASED; urgency=medium
+telepathy-qt (0.9.7-1) UNRELEASED; urgency=medium
+ [ Diane Trout ]
* Relax libssl build-dep
+ [ Rohan Garg ]
+ * New upstream release
+ * Drop upstreamed patches
+ * Refresh improve-doxygen-build.patch
+
-- Diane Trout <diane at ghic.org> Fri, 22 Apr 2016 10:33:12 -0700
telepathy-qt (0.9.6.1-6) unstable; urgency=medium
diff --git a/debian/patches/fix-deprecated-bsd-source.patch b/debian/patches/fix-deprecated-bsd-source.patch
deleted file mode 100644
index 5f26c71..0000000
--- a/debian/patches/fix-deprecated-bsd-source.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
-Commit: https://cgit.freedesktop.org/cgit/?url=telepathy/telepathy-qt/commit/&id=2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b
-Description: _DEFAULT_SOURCE is now required
---- a/cmake/modules/TelepathyDefaults.cmake
-+++ b/cmake/modules/TelepathyDefaults.cmake
-@@ -108,7 +108,7 @@
- endif(${NOT_RELEASE} EQUAL 1)
-
- if(CMAKE_SYSTEM_NAME MATCHES Linux)
-- add_definitions(-D_BSD_SOURCE)
-+ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)
- endif(CMAKE_SYSTEM_NAME MATCHES Linux)
-
- # Compiler coverage
diff --git a/debian/patches/fix-failing-test.patch b/debian/patches/fix-failing-test.patch
deleted file mode 100644
index 4ae3849..0000000
--- a/debian/patches/fix-failing-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 15374115fa910ffa41ac2acce71b7f4fc0937674 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde at davidedmundson.co.uk>
-Date: Tue, 26 Apr 2016 15:10:44 +0100
-Subject: Use C++ bool type rather than mixing with gboolean
-
-They are not always the same size.
-This fixes a compile error on some systems.
-
-Index: telepathy-qt-0.9.6.1/tests/dbus/contacts-capabilities.cpp
-===================================================================
---- telepathy-qt-0.9.6.1.orig/tests/dbus/contacts-capabilities.cpp
-+++ telepathy-qt-0.9.6.1/tests/dbus/contacts-capabilities.cpp
-@@ -111,7 +111,7 @@ void TestContactsCapabilities::testCapab
- QStringList ids = QStringList() << QLatin1String("alice")
- << QLatin1String("bob") << QLatin1String("chris");
-
-- gboolean supportTextChat[] = { TRUE, FALSE, FALSE };
-+ bool supportTextChat[] = { true, false, false};
-
- TpHandleRepoIface *serviceRepo =
- tp_base_connection_get_handles(TP_BASE_CONNECTION(mConn->service()),
diff --git a/debian/patches/force-service-pic.patch b/debian/patches/force-service-pic.patch
deleted file mode 100644
index 9d1c180..0000000
--- a/debian/patches/force-service-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description: A temporary work around for linking the
- static library into a shared library. Upstream is
- going to make this a static library next release.
-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801817
---- a/TelepathyQt/CMakeLists.txt
-+++ b/TelepathyQt/CMakeLists.txt
-@@ -953,6 +953,9 @@
- #endif (ENABLE_COMPILER_COVERAGE)
- # lets build a static only library until we have a stable API/ABI
- add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
-+ add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service all-generated-sources)
-+ set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-service PROPERTIES
-+ POSITION_INDEPENDENT_CODE ON)
-
- # generate service moc files
- foreach(moc_src ${telepathy_qt_service_MOC_SRCS})
diff --git a/debian/patches/gstreamer-1.5.patch b/debian/patches/gstreamer-1.5.patch
deleted file mode 100644
index 56d2087..0000000
--- a/debian/patches/gstreamer-1.5.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
-Description: Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly
- Since GStreamer-1.5.1 config header file moved to LIBDIR.
-Commit: http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb
-Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---- a/TelepathyQt/Farstream/CMakeLists.txt
-+++ b/TelepathyQt/Farstream/CMakeLists.txt
-@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND)
- include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR}
- ${TELEPATHY_GLIB_INCLUDE_DIR}
- ${FARSTREAM_INCLUDE_DIR}
-- ${GSTREAMER_INCLUDE_DIR}
-+ ${GSTREAMER_INCLUDE_DIRS}
- ${GLIB2_INCLUDE_DIR}
- ${LIBXML2_INCLUDE_DIR}
- ${DBUS_INCLUDE_DIR})
-diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
-index 63fb41c..ffdd7a9 100644
---- a/cmake/modules/FindGStreamer.cmake
-+++ b/cmake/modules/FindGStreamer.cmake
-@@ -13,12 +13,12 @@
-
- # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
-
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
- # in cache already
- SET(GSTREAMER_FIND_QUIETLY TRUE)
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
- SET(GSTREAMER_FIND_QUIETLY FALSE)
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-
- IF (NOT WIN32)
- # use pkg-config to get the directories and then use these values
-@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
- PATH_SUFFIXES gstreamer-1.0
- )
-
-+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
-+ PATHS
-+ ${PC_GSTREAMER_INCLUDEDIR}
-+ ${PC_GSTREAMER_INCLUDE_DIRS}
-+ PATH_SUFFIXES gstreamer-1.0
-+ )
-+
-+SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR})
-+
- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
- PATHS
- ${PC_GSTREAMER_LIBDIR}
-@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR)
- MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
- ENDIF (GSTREAMER_INCLUDE_DIR)
-
-+IF (GSTREAMER_CONF_INCLUDE_DIR)
-+ #MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}")
-+ELSE (GSTREAMER_CONF_INCLUDE_DIR)
-+ MESSAGE(STATUS "GStreamer: WARNING: config include dir not found")
-+ENDIF (GSTREAMER_CONF_INCLUDE_DIR)
-+
- IF (GSTREAMER_LIBRARIES)
- #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
- ELSE (GSTREAMER_LIBRARIES)
-@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES)
-
-
- INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY)
-
--MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
-+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
diff --git a/debian/patches/improve-doxygen-build.patch b/debian/patches/improve-doxygen-build.patch
index 710cb96..8909c85 100644
--- a/debian/patches/improve-doxygen-build.patch
+++ b/debian/patches/improve-doxygen-build.patch
@@ -8,21 +8,6 @@ Description: Improve Doxygen generated documentation.
it defaults to whereever the qt tags file is but you can
override it to point at the html docs with
-DQT_DOC_BASE=http://qt-project.org/docs/qt-4.8/
---- a/doxygen-header.html
-+++ b/doxygen-header.html
-@@ -5,6 +5,12 @@
- <head>
- <title>$title</title>
- <link href="doxygen.css" rel="stylesheet" type="text/css" />
-+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-+ <meta name="no-email-collection" content="http://www.unspam.com/noemailcollection" />
-+ <script type="text/javascript" src="jquery.js"></script>
-+ <script type="text/javascript" src="dynsections.js"></script>
-+ <link rel="stylesheet" type="text/css" href="doxygen.css" />
-+ <link rel="stylesheet" type="text/css" href="tabs.css" />
- </head>
- <body>
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
--- a/doxygen.cfg.in
+++ b/doxygen.cfg.in
@@ -131,7 +131,7 @@
@@ -34,7 +19,7 @@ Description: Improve Doxygen generated documentation.
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
# (but less readable) file names. This can be useful is your file systems
-@@ -1212,7 +1212,7 @@
+@@ -1188,7 +1188,7 @@
# FIXME: for some reason, doxygen doesn't seem to emit a doxygen= attribute at all
# in the <a> element if there is no location, in which case there is nothing for
# installdox to rewrite.
@@ -56,3 +41,19 @@ Description: Improve Doxygen generated documentation.
if(EXISTS ${QT_TAGS_FILE})
find_package(Perl)
+--- a/doxygen-header.html
++++ b/doxygen-header.html
+@@ -5,8 +5,11 @@
+ <head>
+ <title>$title</title>
+ <link href="doxygen.css" rel="stylesheet" type="text/css" />
+- <script type="text/javascript" src="$relpath$jquery.js"></script>
+- <script type="text/javascript" src="$relpath$dynsections.js"></script>
++ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
++ <meta name="no-email-collection" content="http://www.unspam.com/noemailcollection" />
++ <script type="text/javascript" src="jquery.js"></script>
++ <script type="text/javascript" src="dynsections.js"></script>
++ <link rel="stylesheet" type="text/css" href="tabs.css" />
+ </head>
+ <body>
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
diff --git a/debian/patches/series b/debian/patches/series
index 2743040..a9681d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
improve-doxygen-build.patch
-update-doxygen.patch
-gstreamer-1.5.patch
-force-service-pic.patch
-fix-deprecated-bsd-source.patch
-fix-failing-test.patch
diff --git a/debian/patches/update-doxygen.patch b/debian/patches/update-doxygen.patch
deleted file mode 100644
index 01eb39f..0000000
--- a/debian/patches/update-doxygen.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Author: Diane Trout
-Description: Remove a few deprecated Doxygen tags.
---- a/doxygen.cfg.in
-+++ b/doxygen.cfg.in
-@@ -447,12 +447,6 @@
-
- SHOW_USED_FILES = NO
-
--# If the sources in your project are distributed over multiple directories
--# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
--# in the documentation. The default is NO.
--
--SHOW_DIRECTORIES = NO
--
- # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
- # This will remove the Files entry from the Quick Index and from the
- # Folder Tree View (if specified). The default is YES.
-@@ -772,12 +766,6 @@
-
- HTML_STYLESHEET = @abs_top_srcdir@/doxygen.css
-
--# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
--# files or namespaces will be aligned in HTML using tables. If set to
--# NO a bullet list will be used.
--
--HTML_ALIGN_MEMBERS = NO
--
- # If the GENERATE_HTMLHELP tag is set to YES, additional index files
- # will be generated that can be used as input for tools like the
- # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-@@ -1059,18 +1047,6 @@
-
- XML_OUTPUT = xml
-
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_SCHEMA =
--
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_DTD =
--
- # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
- # dump the program listings (including syntax highlighting
- # and cross-referencing information) to the XML output. Note that
diff --git a/debian/rules b/debian/rules
index 837065d..ee91eec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ include /usr/share/dpkg/architecture.mk
BUILD_QT5 := build-qt5
CMAKE_OPTS := -DDISABLE_WERROR=ON -DHAVE_DOT=YES \
-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFORCE_STATIC_SERVICE_LIBRARY=YES
%:
--
telepathy-qt4 packaging
More information about the pkg-kde-commits
mailing list