[Pkg-voip-commits] [ortp] 06/06: Move docs to libortp-doc, lintian clean-ify

daniel at gnoutcheff.name daniel at gnoutcheff.name
Thu Jan 12 05:06:19 UTC 2017 

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

gnoutchd-guest pushed a commit to branch master
in repository ortp.

commit 09c30b2206453e2d1c9462e5a16a3b3e42db653a
Author: Daniel Gnoutcheff <daniel at gnoutcheff.name>
Date:   Wed Jan 11 01:53:02 2017 -0500

    Move docs to libortp-doc, lintian clean-ify
    
    * Move docs to libortp-doc
      - Use libjs-jquery for jquery.js
    * Add kill-rpath.patch
    * Add myself to uploaders
    * Update/fix debian/copyright
    * Update Vcs-* to use https://
    * Bump standards-version to 3.9.8 (no changes needed)
---
 debian/changelog                |  6 +++++-
 debian/control                  | 28 ++++++++++++++++++++++++----
 debian/copyright                | 19 +++++++++++++++----
 debian/libortp-dev.install      |  1 -
 debian/libortp-doc.doc-base     |  7 +++++++
 debian/libortp-doc.docs         |  1 +
 debian/libortp-doc.links        |  1 +
 debian/patches/kill-rpath.patch | 16 ++++++++++++++++
 debian/patches/series           |  1 +
 9 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cde180e..24b0f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 ortp (1:0.27.0-1) unstable; urgency=medium
 
+  [ Felix Lechner ]
   * Initial release separate from linphone (Closes: #785522)
 
- -- Felix Lechner <felix.lechner at gmail.com>  Sun, 17 May 2015 05:07:34 -0700
+  [ Daniel Gnoutcheff ]
+  * Updated upstream version from 0.24.2 to 0.27.0
+
+ -- Daniel Gnoutcheff <daniel at gnoutcheff.name>  Wed, 11 Jan 2017 01:39:43 -0500
diff --git a/debian/control b/debian/control
index bb6906f..35af2a8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
 Source: ortp
 Priority: optional
 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>
+Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir at debian.org>, Felix Lechner <felix.lechner at gmail.com>, Daniel Gnoutcheff <daniel at gnoutcheff.name>
 Build-Depends:
  debhelper (>= 9),
  cmake (>= 3),
  bctoolbox-dev,
  doxygen
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Section: libs
 Homepage: http://www.linphone.org/technical-corner/ortp/overview
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-voip/ortp.git/
-Vcs-Git: git://anonscm.debian.org/pkg-voip/ortp.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/ortp.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-voip/ortp.git
 
 Package: libortp12
 Architecture: any
@@ -50,3 +50,23 @@ Description: Development files for the ortp RTP library
  telephone events over RTP.
  .
  This package contains the development files.
+
+Package: libortp-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: libjs-jquery, ${misc:Depends}
+Suggests: libortp-dev
+Description: oRTP API documentation
+ This library implements RFC 1889 (RTP) and offers an easy to
+ use API with high-level and low-level access. It is part of
+ Linphone.
+ .
+ The main features are support for multiple profiles (AV profile
+ RFC 1890 being the default one); an optional packet scheduler
+ for synchronizing RTP recv and send; blocking or non-blocking
+ IO for RTP sessions; multiplexed IO; some of RFC 2833 for
+ telephone events over RTP.
+ .
+ This package contains the API documentation.
+
diff --git a/debian/copyright b/debian/copyright
index 858c7ba..14a5123 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,18 +8,29 @@ Copyright: 2001-2015 Simon Morlat, Belledonne Communications, Grenoble, France
 License: LGPL-2.1+
 
 Files:
+ build/android/Android.mk
+ CMakeLists.txt
+ ORTPConfig.cmake.in
+ include/CMakeLists.txt
+ ortp-config.h.cmake
+ src/CMakeLists.txt
+ src/tests/CMakeLists.txt
+Copyright: 2014-2015 Belledonne Communications, Grenoble France
+License: GPL-2+
+
+Files:
  build/wp8/oRTP/inttypes.h
  build/wp8/oRTP/stdint.h
  include/MSVC/inttypes.h
  include/MSVC/stdint.h
 Copyright: 2006-2008 Alexander Chemeris
-License: BSD-2-clause (with faulty third clause)
+License: BSD-faulty-third-clause
 
 Files:
  src/b64.c
  include/ortp/b64.h
 Copyright: 2004-2008 Matthew Wilson and Synesis Software
-License: BSD-3-clause in favor of Wilson and Synesis
+License: BSD-3-clause-Wilson-Synesis
 
 Files: debian/*
 Copyright: 2015 Felix Lechner <felix.lechner at gmail.com>
@@ -45,7 +56,7 @@ License: LGPL-2.1+
  Public License version 2.1 can be found in
  "/usr/share/common-licenses/LGPL-2.1".
 
-License: BSD-2-clause (with faulty third clause)
+License: BSD-faulty-third-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  . 
@@ -70,7 +81,7 @@ License: BSD-2-clause (with faulty third clause)
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause in favor of Wilson and Synesis
+License: BSD-3-clause-Wilson-Synesis
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
diff --git a/debian/libortp-dev.install b/debian/libortp-dev.install
index 7656b07..43f12dc 100644
--- a/debian/libortp-dev.install
+++ b/debian/libortp-dev.install
@@ -3,4 +3,3 @@ usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
 usr/share/*/cmake/*
-usr/share/doc/oRTP-*/html/*  usr/share/doc/libortp-dev/html
diff --git a/debian/libortp-doc.doc-base b/debian/libortp-doc.doc-base
new file mode 100644
index 0000000..606c93a
--- /dev/null
+++ b/debian/libortp-doc.doc-base
@@ -0,0 +1,7 @@
+Document: ortp-apidoc
+Title: oRTP API documentation
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/libortp-doc/html/index.html
+Files: /usr/share/doc/libortp-doc/html/*
diff --git a/debian/libortp-doc.docs b/debian/libortp-doc.docs
new file mode 100644
index 0000000..395f4e3
--- /dev/null
+++ b/debian/libortp-doc.docs
@@ -0,0 +1 @@
+*/doc/html/
diff --git a/debian/libortp-doc.links b/debian/libortp-doc.links
new file mode 100644
index 0000000..910d207
--- /dev/null
+++ b/debian/libortp-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/libortp-doc/html/jquery.js
diff --git a/debian/patches/kill-rpath.patch b/debian/patches/kill-rpath.patch
new file mode 100644
index 0000000..c9d7cd1
--- /dev/null
+++ b/debian/patches/kill-rpath.patch
@@ -0,0 +1,16 @@
+Author: Daniel Gnoutcheff <daniel at gnoutcheff.name>
+Subject: Disable RPATH
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,11 +62,6 @@
+ include(CheckFunctionExists)
+ include(GNUInstallDirs)
+ 
+-if(NOT CMAKE_INSTALL_RPATH AND CMAKE_INSTALL_PREFIX)
+-	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+-	message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}")
+-endif()
+-
+ set(MSVC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/MSVC")
+ if(MSVC)
+ 	list(APPEND CMAKE_REQUIRED_INCLUDES "${MSVC_INCLUDE_DIR}")
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..33ed55d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kill-rpath.patch

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

More information about the Pkg-voip-commits mailing list