[Pkg-voip-commits] [bzrtp] 01/04: Switch from autotools to CMake

[Johannes Schauer]

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

josch pushed a commit to branch master
in repository bzrtp.

commit 8e9e4a99feed122a1017f1fe03c9d02458a1b355
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 16:02:42 2017 +0200

    Switch from autotools to CMake
    
    Also add patch installing pkgconfig file
---
 debian/changelog                 |  4 ++++
 debian/control                   |  4 +---
 debian/patches/install-pkgconfig | 19 +++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  8 ++++----
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e627404..0d353dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ bzrtp (1.0.5-1) UNRELEASED; urgency=medium
   * Update standards-version to 3.8.9 (no changes needed).
   * Point Vcs-* to git packaging repo
 
+  [ Johannes Schauer ]
+  * Switch from autotools to CMake
+  * Replace build-deps autotools-dev, dh-autoreconf with cmake (>= 3)
+
  -- Daniel Gnoutcheff <daniel at gnoutcheff.name>  Thu, 30 Mar 2017 01:04:00 -0400
 
 bzrtp (1.0.2-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c229938..446bcc5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,7 @@ Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir at debian.org>, Daniel Gnoutcheff <daniel at gnoutcheff.name>
 Build-Depends:
  debhelper (>= 9),
- autotools-dev,
- dh-autoreconf,
- pkg-config,
+ cmake (>= 3.0),
  bctoolbox-dev,
  libxml2-dev
 Standards-Version: 3.9.8
diff --git a/debian/patches/install-pkgconfig b/debian/patches/install-pkgconfig
new file mode 100644
index 0000000..2920c0d
--- /dev/null
+++ b/debian/patches/install-pkgconfig
@@ -0,0 +1,19 @@
+Configure and install pkgconfig file for libbzrtp
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,6 +126,14 @@ if(ENABLE_TESTS AND BCTOOLBOX_TESTER_FOU
+ 	add_subdirectory(test)
+ endif()
+ 
++set(prefix ${CMAKE_INSTALL_PREFIX})
++set(exec_prefix ${prefix}/bin)
++set(libdir ${prefix}/lib)
++set(includedir ${prefix}/include)
++set(PACKAGE_VERSION "${ORTP_VERSION}")
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libbzrtp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libbzrtp.pc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbzrtp.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ 
+ include(CMakePackageConfigHelpers)
+ write_basic_package_version_file(
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..e3c5e83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install-pkgconfig
diff --git a/debian/rules b/debian/rules
index 147e1ee..e812f6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,9 @@
 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --parallel \
-		--with autotools-dev --with autoreconf \
-		--buildsystem=autoconf
+	dh $@ --buildsystem=cmake
 
+# Upstream unconditionally sets CMAKE_INSTALL_RPATH. Make it ineffective by
+# setting CMAKE_SKIP_RPATH
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bzrtp.git