[Pkg-voip-commits] [mediastreamer2] 01/01: Unify libmediastreamer-base-dev and libmediastreamer-voip-dev into libmediastreamer-dev. linphone is the only user of the package and there is no reason to split them.

[Johannes Schauer]

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

josch-guest pushed a commit to branch master
in repository mediastreamer2.

commit 1714f375f810689a354a2119310856f554e6bb57
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 19:36:57 2017 +0200

    Unify libmediastreamer-base-dev and libmediastreamer-voip-dev into libmediastreamer-dev. linphone is the only user of the package and there is no reason to split them.
---
 debian/control                           | 28 ++++------------------------
 debian/libmediastreamer-base-dev.install |  3 ---
 debian/libmediastreamer-dev.docs         |  2 +-
 debian/libmediastreamer-dev.install      | 11 +++++++----
 debian/libmediastreamer-voip-dev.docs    |  1 -
 debian/libmediastreamer-voip-dev.install |  3 ---
 6 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index 3192a8d..a4fc756 100644
--- a/debian/control
+++ b/debian/control
@@ -50,24 +50,6 @@ Homepage: http://www.linphone.org/technical-corner/mediastreamer2/overview
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/mediastreamer2.git/
 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/mediastreamer2.git
 
-Package: libmediastreamer-base-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libmediastreamer-base9 (= ${binary:Version}),
-         ${misc:Depends},
-Breaks: libmediastreamer-dev,
-Replaces: libmediastreamer-dev,
-Description: Development files for the mediastreamer2 library (base)
- Mediastreamer2 is a powerful and lightweight streaming engine
- specially designed for voice/video telephony applications.
- .
- This open source library is responsible for all receiving and
- sending of multimedia streams in Linphone, including voice/video
- capture, encoding, decoding, and rendering.
- .
- This package contains the development files for the base library.
-
 Package: libmediastreamer-base9
 Architecture: any
 Multi-Arch: same
@@ -84,16 +66,14 @@ Description: Voice and video streaming engine for telephony (base)
  .
  This package contains the base library.
 
-Package: libmediastreamer-voip-dev
+Package: libmediastreamer-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libmediastreamer-base-dev,
+Depends: libmediastreamer-base9 (= ${binary:Version}),
          libmediastreamer-voip9 (= ${binary:Version}),
          ${misc:Depends},
-Breaks: libmediastreamer-dev,
-Replaces: libmediastreamer-dev,
-Description: Development files for the mediastreamer2 library (voip)
+Description: Development files for the mediastreamer2 library
  Mediastreamer2 is a powerful and lightweight streaming engine
  specially designed for voice/video telephony applications.
  .
@@ -101,7 +81,7 @@ Description: Development files for the mediastreamer2 library (voip)
  sending of multimedia streams in Linphone, including voice/video
  capture, encoding, decoding, and rendering.
  .
- This package contains the development files for the voip library.
+ This package contains the development files for the development library.
 
 Package: libmediastreamer-voip9
 Architecture: any
diff --git a/debian/libmediastreamer-base-dev.install b/debian/libmediastreamer-base-dev.install
deleted file mode 100644
index 09ba8ae..0000000
--- a/debian/libmediastreamer-base-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/*/libmediastreamer_base.a
-usr/lib/*/libmediastreamer_base.so
diff --git a/debian/libmediastreamer-dev.docs b/debian/libmediastreamer-dev.docs
index 1894c69..32e5cb3 100644
--- a/debian/libmediastreamer-dev.docs
+++ b/debian/libmediastreamer-dev.docs
@@ -1 +1 @@
-usr/share/doc/mediastreamer/mediastreamer-*/html/
+*/doc/html
diff --git a/debian/libmediastreamer-dev.install b/debian/libmediastreamer-dev.install
index f49d920..8773997 100644
--- a/debian/libmediastreamer-dev.install
+++ b/debian/libmediastreamer-dev.install
@@ -1,4 +1,7 @@
-usr/include/mediastreamer2/*.h
-usr/lib/libmediastreamer_base.so
-usr/lib/libmediastreamer_voip.so
-usr/lib/pkgconfig/mediastreamer.pc
+usr/include/*
+usr/lib/*/libmediastreamer_base.a
+usr/lib/*/libmediastreamer_base.so
+usr/lib/*/libmediastreamer_voip.a
+usr/lib/*/libmediastreamer_voip.so
+usr/lib/*/pkgconfig/mediastreamer.pc
+usr/share/*/cmake/*
diff --git a/debian/libmediastreamer-voip-dev.docs b/debian/libmediastreamer-voip-dev.docs
deleted file mode 100644
index b816f08..0000000
--- a/debian/libmediastreamer-voip-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/mediastreamer/*
diff --git a/debian/libmediastreamer-voip-dev.install b/debian/libmediastreamer-voip-dev.install
deleted file mode 100644
index f9d7284..0000000
--- a/debian/libmediastreamer-voip-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libmediastreamer_voip.a
-usr/lib/*/libmediastreamer_voip.so
-usr/lib/*/pkgconfig/mediastreamer.pc

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