[Pkg-voip-commits] [mediastreamer2] 18/18: run wrap-and-sort -abt

Johannes Schauer josch-guest at moszumanska.debian.org
Mon Apr 24 15:59:03 UTC 2017


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

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

commit ec65bc878a97715dec23e298ab7b21848168622d
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 17:58:38 2017 +0200

    run wrap-and-sort -abt
---
 debian/control                      | 151 ++++++++++++++++++------------------
 debian/copyright                    |   8 +-
 debian/docs                         |   2 +-
 debian/libmediastreamer-dev.install |   2 +-
 4 files changed, 80 insertions(+), 83 deletions(-)

diff --git a/debian/control b/debian/control
index 247765e..3192a8d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,62 +1,64 @@
 Source: mediastreamer2
 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>, Felix Lechner <felix.lechner at gmail.com>
-Build-Depends:
- debhelper (>= 10),
- cmake (>= 3.0),
- pkg-config,
- libortp-dev (>= 1:1.0.0),
- libbzrtp-dev (>= 1.0.5),
- libsrtp-dev [!hurd-any !sparc],
- libsdl1.2-dev,
- libx11-dev,
- libxext-dev,
- libxv-dev,
- libglew-dev,
- mesa-common-dev,
- libv4l-dev [linux-any],
- libavcodec-dev (>= 6:10~),
- libavutil-dev (>= 6:10~),
- libswscale-dev (>= 6:10~),
- libtheora-dev,
- libvpx-dev,
- libasound2-dev [linux-any],
- libpulse-dev,
- libspeex-dev,
- libspeexdsp-dev,
- libspandsp-dev,
- libopus-dev,
- libogg-dev,
- libgsm1-dev,
- libebml-dev,
- libupnp-dev,
- libpcap-dev,
- libltdl-dev,
- libcunit1-ncurses,
- gettext,
- intltool,
- doxygen,
- libbctoolbox-dev,
- xxd,
- libmbedtls-dev,
- graphviz,
- libvpx-dev,
- libturbojpeg0-dev,
+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>,
+Build-Depends: cmake (>= 3.0),
+               debhelper (>= 10),
+               doxygen,
+               gettext,
+               graphviz,
+               intltool,
+               libasound2-dev [linux-any],
+               libavcodec-dev (>= 6:10~),
+               libavutil-dev (>= 6:10~),
+               libbctoolbox-dev,
+               libbzrtp-dev (>= 1.0.5),
+               libcunit1-ncurses,
+               libebml-dev,
+               libglew-dev,
+               libgsm1-dev,
+               libltdl-dev,
+               libmbedtls-dev,
+               libogg-dev,
+               libopus-dev,
+               libortp-dev (>= 1:1.0.0),
+               libpcap-dev,
+               libpulse-dev,
+               libsdl1.2-dev,
+               libspandsp-dev,
+               libspeex-dev,
+               libspeexdsp-dev,
+               libsrtp-dev [!hurd-any !sparc],
+               libswscale-dev (>= 6:10~),
+               libtheora-dev,
+               libturbojpeg0-dev,
+               libupnp-dev,
+               libv4l-dev [linux-any],
+               libvpx-dev,
+               libx11-dev,
+               libxext-dev,
+               libxv-dev,
+               mesa-common-dev,
+               pkg-config,
+               xxd,
 Standards-Version: 3.9.8
 Section: libs
 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-base9
+Package: libmediastreamer-base-dev
+Section: libdevel
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Voice and video streaming engine for telephony (base)
+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.
  .
@@ -64,18 +66,15 @@ Description: Voice and video streaming engine for telephony (base)
  sending of multimedia streams in Linphone, including voice/video
  capture, encoding, decoding, and rendering.
  .
- This package contains the base library.
+ This package contains the development files for the base library.
 
-Package: libmediastreamer-base-dev
-Section: libdevel
+Package: libmediastreamer-base9
 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)
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Voice and video streaming engine for telephony (base)
  Mediastreamer2 is a powerful and lightweight streaming engine
  specially designed for voice/video telephony applications.
  .
@@ -83,18 +82,18 @@ Description: Development files for the mediastreamer2 library (base)
  sending of multimedia streams in Linphone, including voice/video
  capture, encoding, decoding, and rendering.
  .
- This package contains the development files for the base library.
+ This package contains the base library.
 
-Package: libmediastreamer-voip9
+Package: libmediastreamer-voip-dev
+Section: libdevel
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Breaks: libmediastreamer-base4 (<< 1:2.11.2)
-Replaces: libmediastreamer-base4 (<< 1:2.11.2)
-Description: Voice and video streaming engine for telephony (voip)
+Depends: libmediastreamer-base-dev,
+         libmediastreamer-voip9 (= ${binary:Version}),
+         ${misc:Depends},
+Breaks: libmediastreamer-dev,
+Replaces: libmediastreamer-dev,
+Description: Development files for the mediastreamer2 library (voip)
  Mediastreamer2 is a powerful and lightweight streaming engine
  specially designed for voice/video telephony applications.
  .
@@ -102,19 +101,17 @@ Description: Voice and video streaming engine for telephony (voip)
  sending of multimedia streams in Linphone, including voice/video
  capture, encoding, decoding, and rendering.
  .
- This package contains the voip library.
+ This package contains the development files for the voip library.
 
-Package: libmediastreamer-voip-dev
-Section: libdevel
+Package: libmediastreamer-voip9
 Architecture: any
 Multi-Arch: same
-Depends:
- libmediastreamer-voip9 (= ${binary:Version}),
- libmediastreamer-base-dev,
- ${misc:Depends}
-Breaks: libmediastreamer-dev
-Replaces: libmediastreamer-dev
-Description: Development files for the mediastreamer2 library (voip)
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: libmediastreamer-base4 (<< 1:2.11.2),
+Replaces: libmediastreamer-base4 (<< 1:2.11.2),
+Description: Voice and video streaming engine for telephony (voip)
  Mediastreamer2 is a powerful and lightweight streaming engine
  specially designed for voice/video telephony applications.
  .
@@ -122,4 +119,4 @@ 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 voip library.
diff --git a/debian/copyright b/debian/copyright
index e588e2f..446f1af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -112,7 +112,7 @@ License: GPL-3+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public
  License version 3 can be found in
@@ -182,10 +182,10 @@ License: BSD-3-clause
 License: BSD-2-clause-with-faulty-third-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
- . 
+ .
    1. Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
- . 
+ .
    2. Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
@@ -199,7 +199,7 @@ License: BSD-2-clause-with-faulty-third-clause
  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/docs b/debian/docs
index abac4cb..46a4ca7 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
-NEWS
 AUTHORS
+NEWS
 README.md
diff --git a/debian/libmediastreamer-dev.install b/debian/libmediastreamer-dev.install
index 0489be4..f49d920 100644
--- a/debian/libmediastreamer-dev.install
+++ b/debian/libmediastreamer-dev.install
@@ -1,4 +1,4 @@
+usr/include/mediastreamer2/*.h
 usr/lib/libmediastreamer_base.so
 usr/lib/libmediastreamer_voip.so
 usr/lib/pkgconfig/mediastreamer.pc
-usr/include/mediastreamer2/*.h

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



More information about the Pkg-voip-commits mailing list