[Pkg-voip-commits] [linphone] 05/05: Run wrap-and-sort

Bernhard Schmidt berni at moszumanska.debian.org
Fri Nov 18 17:12:54 UTC 2016


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

berni pushed a commit to branch jessie
in repository linphone.

commit d92a0a36d7d8fcfe55f0ef43fef357e540c4c842
Author: Bernhard Schmidt <berni at debian.org>
Date:   Wed Nov 16 08:38:02 2016 +0100

    Run wrap-and-sort
---
 debian/control                      | 134 +++++++++++++++++++++++-------------
 debian/liblinphone-dev.install      |   2 +-
 debian/libmediastreamer-dev.install |   2 +-
 debian/libortp-dev.install          |   4 +-
 debian/linphone-common.install      |   6 +-
 debian/linphone-nogtk.manpages      |   4 +-
 debian/linphone.install             |   2 +-
 debian/linphone.manpages            |   2 +-
 8 files changed, 97 insertions(+), 59 deletions(-)

diff --git a/debian/control b/debian/control
index 80cb526..9e954fa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,29 +2,60 @@ Source: linphone
 Section: sound
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf, autoconf, automake, autotools-dev, libtool, pkg-config, intltool, doxygen,
- libncurses5-dev, libreadline6-dev, libnotify-dev, libpango1.0-dev,
- sgmltools-lite, vim-common,
- libpcap-dev, libupnp-dev, libcunit1-dev,
- libglib2.0-dev, 
- libosip2-dev (>= 4), libexosip2-dev (>= 4),
- libsqlite3-dev, libsoup2.4-dev, libxml-parser-perl,
- libncurses5-dev, libreadline-dev, libnotify-dev,
- 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,
- libxv-dev, libtiff-dev,
- libxext-dev,
- libatk1.0-dev,
- libreadline-dev, libsdl1.2-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~)
-#
+Uploaders: Kilian Krause <kilian at debian.org>,
+           Tzafrir Cohen <tzafrir at debian.org>
+Build-Depends: autoconf,
+               automake,
+               autotools-dev,
+               debhelper (>= 9),
+               dh-autoreconf,
+               doxygen,
+               intltool,
+               libasound2-dev [linux-any],
+               libatk1.0-dev,
+               libavcodec-dev (>= 6:10~),
+               libavutil-dev (>= 6:10~),
+               libcairo2-dev,
+               libcunit1-dev,
+               libexosip2-dev (>= 4),
+               libfontconfig1-dev,
+               libfreetype6-dev,
+               libgdk-pixbuf2.0-dev,
+               libglade2-dev,
+               libglew-dev,
+               libglib2.0-dev,
+               libgtk2.0-dev,
+               libncurses5-dev,
+               libnotify-dev,
+               libogg-dev,
+               libopus-dev,
+               libosip2-dev (>= 4),
+               libpango1.0-dev,
+               libpcap-dev,
+               libpulse-dev,
+               libreadline-dev,
+               libreadline6-dev,
+               libsdl1.2-dev,
+               libsoup2.4-dev,
+               libspandsp-dev,
+               libspeex-dev,
+               libspeexdsp-dev,
+               libsqlite3-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
 # Requires updated libsrtp-dev
 # libsrtp-dev [!hurd-any !sparc], libzrtpcpp-dev (>= 2.1),
 #
@@ -37,11 +68,13 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-voip/asterisk.git
 
 Package: linphone
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, linphone-nogtk (=${binary:Version})
+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:
@@ -62,13 +95,15 @@ Description: Debugging symbols for linphone
  This package contains the debugging symbols.
 
 Package: linphone-nogtk
-Depends: ${shlibs:Depends}, ${misc:Depends},
- linphone-common (= ${source:Version}),
- liblinphone5 (= ${binary:Version}), host
+Depends: host,
+         liblinphone5 (= ${binary:Version}),
+         linphone-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 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 
+ 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.
@@ -77,8 +112,8 @@ Package: linphone-common
 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).
@@ -86,24 +121,26 @@ Description: Shared components of the linphone SIP softphone
 Package: liblinphone5
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc: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 
+ 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: liblinphone5 (= ${binary:Version}), ${misc:Depends},
- libmediastreamer-dev, libortp-dev
+Depends: liblinphone5 (= ${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 
+ 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
@@ -112,12 +149,12 @@ Description: Linphone web phone's library - development files
 Package: libmediastreamer-base3
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Architecture: any
 Multi-Arch: same
 Description: Linphone web phone's media library
- 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 shared runtime libraries for handling media
@@ -125,12 +162,13 @@ Description: Linphone web phone's media library
 
 Package: libmediastreamer-dev
 Section: libdevel
-Depends: libmediastreamer-base3 (= ${binary:Version}), ${misc:Depends},
- libortp-dev
+Depends: libmediastreamer-base3 (= ${binary:Version}),
+         libortp-dev,
+         ${misc:Depends}
 Architecture: any
 Description: Linphone web phone's media 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 
+ 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 development libraries for handling media operations.
@@ -138,7 +176,7 @@ Description: Linphone web phone's media library - development files
 Package: libortp9
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Architecture: any
 Multi-Arch: same
 Description: Real-time Transport Protocol stack
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/libmediastreamer-dev.install b/debian/libmediastreamer-dev.install
index d0d9195..ab302fb 100644
--- a/debian/libmediastreamer-dev.install
+++ b/debian/libmediastreamer-dev.install
@@ -1,4 +1,4 @@
+#usr/lib/*/libmediastreamer_*.la
 usr/include/mediastreamer2/*.h
 usr/lib/*/libmediastreamer_*.so
-#usr/lib/*/libmediastreamer_*.la
 usr/lib/*/pkgconfig/mediastreamer.pc
diff --git a/debian/libortp-dev.install b/debian/libortp-dev.install
index 185179d..b6e53ab 100644
--- a/debian/libortp-dev.install
+++ b/debian/libortp-dev.install
@@ -1,5 +1,5 @@
+#usr/lib/*/libortp.la
+#usr/share/doc/ortp/ortp-*/html usr/share/doc/libortp9-dev
 usr/include/ortp/*.h
 usr/lib/*/libortp.so
-#usr/lib/*/libortp.la
 usr/lib/*/pkgconfig/ortp.pc
-#usr/share/doc/ortp/ortp-*/html usr/share/doc/libortp9-dev
diff --git a/debian/linphone-common.install b/debian/linphone-common.install
index cc8a9e2..1c065db 100644
--- a/debian/linphone-common.install
+++ b/debian/linphone-common.install
@@ -1,6 +1,6 @@
-usr/share/sounds
 usr/share/gnome
-usr/share/pixmaps/linphone/*.png
-usr/share/linphone
 usr/share/images
+usr/share/linphone
 usr/share/locale
+usr/share/pixmaps/linphone/*.png
+usr/share/sounds
diff --git a/debian/linphone-nogtk.manpages b/debian/linphone-nogtk.manpages
index 002f827..0b44ed8 100644
--- a/debian/linphone-nogtk.manpages
+++ b/debian/linphone-nogtk.manpages
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/man/man1/linphonec.1
 debian/tmp/usr/share/man/*/man1/linphonec.1
-debian/tmp/usr/share/man/man1/linphonecsh.1
 debian/tmp/usr/share/man/*/man1/linphonecsh.1
+debian/tmp/usr/share/man/man1/linphonec.1
+debian/tmp/usr/share/man/man1/linphonecsh.1
diff --git a/debian/linphone.install b/debian/linphone.install
index 4e1da0e..6dc6432 100644
--- a/debian/linphone.install
+++ b/debian/linphone.install
@@ -1,4 +1,4 @@
+debian/linphone2.xpm            /usr/share/pixmaps/linphone
 usr/bin/linphone
 usr/bin/mediastream
 usr/share/applications/linphone.desktop
-debian/linphone2.xpm            /usr/share/pixmaps/linphone
diff --git a/debian/linphone.manpages b/debian/linphone.manpages
index 086abe7..00f3cd5 100644
--- a/debian/linphone.manpages
+++ b/debian/linphone.manpages
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/man/man1/linphone.1
 debian/tmp/usr/share/man/*/man1/linphone.1
+debian/tmp/usr/share/man/man1/linphone.1

-- 
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