[Pkg-voip-commits] [linphone] 03/04: run wrap-and-sort -abt
Johannes Schauer
josch-guest at moszumanska.debian.org
Tue Apr 25 11:35:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
josch-guest pushed a commit to branch master
in repository linphone.
commit e12ae19dadca7aecf0d2d47166856e55c34c2111
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date: Tue Apr 25 13:23:24 2017 +0200
run wrap-and-sort -abt
---
debian/changelog | 1 +
debian/control | 185 ++++++++++++++++++++++++-----------------
debian/liblinphone-dev.install | 2 +-
debian/linphone-common.install | 4 +-
debian/linphone-nogtk.docs | 2 +-
debian/linphone.docs | 2 +-
debian/linphone.install | 2 +-
7 files changed, 117 insertions(+), 81 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae07aeb..c7d29ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,7 @@ linphone (3.11.1-1) UNRELEASED; urgency=low
* add a patch adding the Keywords entry to the linphone.desktop file
* add a patch regenerating png images from their svg sources
* add a patch to update rootca.pem with a more recent version from mozilla
+ * run wrap-and-sort -abt
-- Felix Lechner <felix.lechner at gmail.com> Fri, 03 Jul 2015 17:24:11 -0700
diff --git a/debian/control b/debian/control
index bfe5b63..d7c315f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,52 +2,111 @@ Source: linphone
Section: sound
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 (>= 9),
- cmake (>= 3.0), libtool, pkg-config, intltool, doxygen,
- libncurses5-dev, libreadline6-dev, libnotify-dev, libpango1.0-dev,
- sgmltools-lite, vim-common,
- libpcap-dev, libupnp-dev, libcunit1-ncurses-dev,
- libglib2.0-dev,
- libbellesip-dev (>= 1.4.2),
- libbzrtp-dev,
- libsrtp0-dev,
- libsqlite3-dev, libsoup2.4-dev, libxml-parser-perl,
- libudev-dev [linux-any], libasound2-dev [linux-any], libv4l-dev [linux-any],
- libspeex-dev, libspeexdsp-dev, libspandsp-dev, libopus-dev, libogg-dev,
- libpulse-dev,
- libgtk2.0-dev, libglew-dev,
- libglade2-dev, libtheora-dev, libvpx-dev,
- libgsm1-dev,
- libxv-dev, libtiff-dev,
- libxext-dev,
- libatk1.0-dev,
- libreadline-dev, libsdl1.2-dev,
- libldap2-dev, libsasl2-dev,
- libcairo2-dev, libfontconfig1-dev, libfreetype6-dev, libgdk-pixbuf2.0-dev,
- mesa-common-dev,
- libavcodec-dev (>= 6:10~), libavutil-dev (>= 6:10~), libswscale-dev (>= 6:10~),
- libbctoolbox-dev,
- libortp-dev (>= 1:0.24.0),
- libmediastreamer-dev (>= 1:2.11.0),
- libmbedtls-dev,
- librsvg2-bin
-#
-# Requires updated libsrtp-dev
-# libsrtp-dev [!hurd-any !sparc], libzrtpcpp-dev (>= 2.1),
-#
+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 (>= 9),
+ doxygen,
+ intltool,
+ libasound2-dev [linux-any],
+ libatk1.0-dev,
+ libavcodec-dev (>= 6:10~),
+ libavutil-dev (>= 6:10~),
+ libbctoolbox-dev,
+ libbellesip-dev (>= 1.4.2),
+ libbzrtp-dev,
+ libcairo2-dev,
+ libcunit1-ncurses-dev,
+ libfontconfig1-dev,
+ libfreetype6-dev,
+ libgdk-pixbuf2.0-dev,
+ libglade2-dev,
+ libglew-dev,
+ libglib2.0-dev,
+ libgsm1-dev,
+ libgtk2.0-dev,
+ libldap2-dev,
+ libmbedtls-dev,
+ libmediastreamer-dev (>= 1:2.11.0),
+ libncurses5-dev,
+ libnotify-dev,
+ libogg-dev,
+ libopus-dev,
+ libortp-dev (>= 1:0.24.0),
+ libpango1.0-dev,
+ libpcap-dev,
+ libpulse-dev,
+ libreadline-dev,
+ libreadline6-dev,
+ librsvg2-bin,
+ libsasl2-dev,
+ libsdl1.2-dev,
+ libsoup2.4-dev,
+ libspandsp-dev,
+ libspeex-dev,
+ libspeexdsp-dev,
+ libsqlite3-dev,
+ libsrtp0-dev,
+ libswscale-dev (>= 6:10~),
+ libtheora-dev,
+ libtiff-dev,
+ libtool,
+ libudev-dev [linux-any],
+ libupnp-dev,
+ libv4l-dev [linux-any],
+ libvpx-dev,
+ libxext-dev,
+ libxml-parser-perl,
+ libxv-dev,
+ mesa-common-dev,
+ pkg-config,
+ sgmltools-lite,
+ vim-common,
Standards-Version: 3.9.8
Homepage: http://www.linphone.org/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/linphone.git/
Vcs-Git: https://anonscm.debian.org/git/pkg-voip/linphone.git
+Package: liblinphone-dev
+Section: libdevel
+Depends: liblinphone9 (= ${binary:Version}),
+ libmediastreamer-dev,
+ libortp-dev,
+ ${misc:Depends},
+Architecture: any
+Description: Linphone web phone's library - development files
+ Linphone is an audio and video internet phone using the SIP protocol. It
+ has a GTK+ and console interface, includes a large variety of audio and video
+ codecs, and provides IM features.
+ .
+ This package contains the files needed to use the linphone's library in your
+ programs.
+
+Package: liblinphone9
+Section: libs
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+Architecture: any
+Multi-Arch: same
+Description: Linphone's shared library part (supporting the SIP protocol)
+ Linphone is an audio and video internet phone using the SIP protocol. It
+ has a GTK+ and console interface, includes a large variety of audio and video
+ codecs, and provides IM features.
+ .
+ This package contains the shared runtime libraries.
+
Package: linphone
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, linphone-nogtk (=${binary:Version})
-Suggests: yelp
+Depends: linphone-nogtk (=${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests: yelp,
Description: SIP softphone - graphical client
- Linphone is an audio and video internet phone using the SIP protocol. It
- has a GTK+ and console interface, includes a large variety of audio and video
+ Linphone is an audio and video internet phone using the SIP protocol. It
+ has a GTK+ and console interface, includes a large variety of audio and video
codecs, and provides IM features.
.
The main features of linphone are:
@@ -55,50 +114,26 @@ Description: SIP softphone - graphical client
- it includes a large variety of codecs with different quality / bandwidths;
- it uses the well-known and standardised SIP protocol.
-Package: linphone-nogtk
-Depends: ${shlibs:Depends}, ${misc:Depends},
- linphone-common (= ${source:Version}),
- liblinphone9 (= ${binary:Version}), host
-Architecture: any
-Description: SIP softphone - console-only client
- Linphone is an audio and video internet phone using the SIP protocol. It
- has a GTK+ and console interface, includes a large variety of audio and video
- codecs, and provides IM features.
- .
- This package contains the console version of linphone.
-
Package: linphone-common
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
Architecture: all
Description: Shared components of the linphone SIP softphone
- Linphone is an audio and video internet phone using the SIP protocol. It
- has a GTK+ and console interface, includes a large variety of audio and video
+ Linphone is an audio and video internet phone using the SIP protocol. It
+ has a GTK+ and console interface, includes a large variety of audio and video
codecs, and provides IM features.
.
This package contains the resource files of linphone (the rings).
-Package: liblinphone9
-Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
-Multi-Arch: same
-Description: Linphone's shared library part (supporting the SIP protocol)
- Linphone is an audio and video internet phone using the SIP protocol. It
- has a GTK+ and console interface, includes a large variety of audio and video
- codecs, and provides IM features.
- .
- This package contains the shared runtime libraries.
-
-Package: liblinphone-dev
-Section: libdevel
-Depends: liblinphone9 (= ${binary:Version}), ${misc:Depends},
- libmediastreamer-dev, libortp-dev
+Package: linphone-nogtk
+Depends: host,
+ liblinphone9 (= ${binary:Version}),
+ linphone-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
Architecture: any
-Description: Linphone web phone's library - development files
- Linphone is an audio and video internet phone using the SIP protocol. It
- has a GTK+ and console interface, includes a large variety of audio and video
+Description: SIP softphone - console-only client
+ Linphone is an audio and video internet phone using the SIP protocol. It
+ has a GTK+ and console interface, includes a large variety of audio and video
codecs, and provides IM features.
.
- This package contains the files needed to use the linphone's library in your
- programs.
+ This package contains the console version of linphone.
diff --git a/debian/liblinphone-dev.install b/debian/liblinphone-dev.install
index 6b2befc..9d50afc 100644
--- a/debian/liblinphone-dev.install
+++ b/debian/liblinphone-dev.install
@@ -1,4 +1,4 @@
+#usr/lib/*/liblinphone.la
usr/include/linphone/*.h
usr/lib/*/liblinphone.so
-#usr/lib/*/liblinphone.la
usr/lib/*/pkgconfig/linphone.pc
diff --git a/debian/linphone-common.install b/debian/linphone-common.install
index 2f274da..4ec8781 100644
--- a/debian/linphone-common.install
+++ b/debian/linphone-common.install
@@ -1,4 +1,4 @@
-usr/share/sounds
-usr/share/pixmaps/linphone/*.png
usr/share/linphone
usr/share/locale
+usr/share/pixmaps/linphone/*.png
+usr/share/sounds
diff --git a/debian/linphone-nogtk.docs b/debian/linphone-nogtk.docs
index 3f2aba0..706127c 100644
--- a/debian/linphone-nogtk.docs
+++ b/debian/linphone-nogtk.docs
@@ -1,4 +1,4 @@
BUGS
-README.md
README.arm
+README.md
TODO
diff --git a/debian/linphone.docs b/debian/linphone.docs
index 7c46e9b..ef2c79e 100644
--- a/debian/linphone.docs
+++ b/debian/linphone.docs
@@ -1,5 +1,5 @@
BUGS
-README.md
README.arm
+README.md
TODO
debian/cv_addr_book.pl
diff --git a/debian/linphone.install b/debian/linphone.install
index 79f97db..bcfa6c1 100644
--- a/debian/linphone.install
+++ b/debian/linphone.install
@@ -1,4 +1,4 @@
+debian/linphone2.xpm /usr/share/pixmaps/linphone
usr/bin/linphone
usr/share/applications/linphone.desktop
-debian/linphone2.xpm /usr/share/pixmaps/linphone
usr/share/icons
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/linphone.git
More information about the Pkg-voip-commits
mailing list