[Pkg-voip-commits] [sflphone] 05/05: update VCS links and wrap-and-sort

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Sun Aug 16 06:05:39 UTC 2015


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

maniac-guest pushed a commit to branch master
in repository sflphone.

commit ab52c83ec315d211266dfee0beb74b9055cf9768
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Sun Aug 16 08:04:38 2015 +0200

    update VCS links and wrap-and-sort
---
 debian/control   | 116 ++++++++++++++++++++++++++++++++++++++++---------------
 debian/copyright |  36 ++++++++---------
 2 files changed, 102 insertions(+), 50 deletions(-)

diff --git a/debian/control b/debian/control
index a45aa4d..fcdbdb0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,40 +3,82 @@ Section: comm
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, chrpath, check, astyle,
-# sflphone-daemon
- libdbus-c++-dev, libdbus-c++-bin, libexpat1-dev,
- libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3), libcppunit-dev, libzrtpcpp-dev (>= 2.0.0), libsrtp0-dev,
- libssl-dev, libpcre3-dev,
- uuid-dev, libyaml-dev,
- libasound2-dev, libspeexdsp-dev, libspeex-dev, libgsm1-dev, libsndfile-dev,
- libpulse-dev, libsamplerate0-dev,
- libopencore-amrnb-dev,
- libavformat-dev, libavcodec-dev, libswscale-dev, libavdevice-dev, libavutil-dev,
-# sflphone-gnome
- gnome-common, gnome-doc-utils, libglib2.0-dev, libgnomeui-dev, rarian-compat, libx11-dev,
- libgtk-3-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev (>= 0.7),
- libatk1.0-dev, libcairo2-dev, libgconf2-dev, libgdk-pixbuf2.0-dev, libjavascriptcoregtk-3.0-dev,
- libwebkitgtk-3.0-dev, 
- libpango1.0-dev, librsvg2-dev,
- intltool, yelp-tools,
- libclutter-gtk-1.0-dev,
-# sflphone-kde
- cmake, libboost-dev,
- kdelibs5-dev, kdepimlibs5-dev, libphonon-dev, libqt4-dev, libqt4-opengl-dev, libsoprano-dev, nepomuk-core-dev,
-# sflphone-evolution
- libebook1.2-dev, libedataserver1.2-dev, libsoup2.4-dev
-#
-# liblog4c-dev,
-# libresample1-dev,
+Build-Depends: astyle,
+               autoconf,
+               automake,
+               autotools-dev,
+               check,
+               chrpath,
+               cmake,
+               debhelper (>= 9),
+               gnome-common,
+               gnome-doc-utils,
+               intltool,
+               kdelibs5-dev,
+               kdepimlibs5-dev,
+               libasound2-dev,
+               libatk1.0-dev,
+               libavcodec-dev,
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
+               libboost-dev,
+               libcairo2-dev,
+               libccrtp-dev (>= 2.0.6-3),
+               libclutter-gtk-1.0-dev,
+               libcppunit-dev,
+               libdbus-1-dev,
+               libdbus-c++-bin,
+               libdbus-c++-dev,
+               libdbus-glib-1-dev,
+               libebook1.2-dev,
+               libedataserver1.2-dev,
+               libexpat1-dev,
+               libgconf2-dev,
+               libgdk-pixbuf2.0-dev,
+               libglib2.0-dev,
+               libgnomeui-dev,
+               libgsm1-dev,
+               libgtk-3-dev,
+               libjavascriptcoregtk-3.0-dev,
+               libnotify-dev (>= 0.7),
+               libopencore-amrnb-dev,
+               libpango1.0-dev,
+               libpcre3-dev,
+               libphonon-dev,
+               libpulse-dev,
+               libqt4-dev,
+               libqt4-opengl-dev,
+               librsvg2-dev,
+               libsamplerate0-dev,
+               libsexy-dev,
+               libsndfile-dev,
+               libsoprano-dev,
+               libsoup2.4-dev,
+               libspeex-dev,
+               libspeexdsp-dev,
+               libsrtp0-dev,
+               libssl-dev,
+               libswscale-dev,
+               libtool,
+               libucommon-dev (>= 6.0.7-1.1),
+               libwebkitgtk-3.0-dev,
+               libx11-dev,
+               libyaml-dev,
+               libzrtpcpp-dev (>= 2.0.0),
+               nepomuk-core-dev,
+               rarian-compat,
+               uuid-dev,
+               yelp-tools
 Standards-Version: 3.9.4
 Homepage: http://www.sflphone.org
-Vcs-Svn: svn://anonscm.debian.org/pkg-voip/sflphone/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/sflphone/trunk/
+Vcs-git: git://anonscm.debian.org/pkg-voip/sflphone.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-voip/sflphone.git
 
 Package: sflphone-daemon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: SIP and IAX2 compatible VoIP phone - core daemon
  SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
  goal is to create a robust enterprise-class desktop phone. While it can serve
@@ -67,7 +109,11 @@ Description: SIP and IAX2 compatible VoIP phone - common data
 Package: sflphone-gnome
 Architecture: any
 Section: gnome
-Depends: ${shlibs:Depends}, ${misc:Depends}, sflphone-daemon (= ${binary:Version}), sflphone-data (= ${source:Version}), librsvg2-common
+Depends: librsvg2-common,
+         sflphone-daemon (= ${binary:Version}),
+         sflphone-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: SIP and IAX2 compatible VoIP phone - GNOME client
  SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
  goal is to create a robust enterprise-class desktop phone. While it can serve
@@ -83,7 +129,11 @@ Description: SIP and IAX2 compatible VoIP phone - GNOME client
 Package: sflphone-kde
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}, sflphone-daemon (= ${binary:Version}), sflphone-data (= ${source:Version}), librsvg2-common
+Depends: librsvg2-common,
+         sflphone-daemon (= ${binary:Version}),
+         sflphone-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: SIP and IAX2 compatible VoIP phone - KDE client
  SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
  goal is to create a robust enterprise-class desktop phone. While it can serve
@@ -98,7 +148,9 @@ Description: SIP and IAX2 compatible VoIP phone - KDE client
 
 Package: sflphone-evolution
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sflphone-gnome (= ${binary:Version})
+Depends: sflphone-gnome (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: SIP and IAX2 compatible VoIP phone - Evolution plugin
  SFLphone is a SIP/IAX2 compatible softphone for Linux. The SFLphone project's
  goal is to create a robust enterprise-class desktop phone. While it can serve
diff --git a/debian/copyright b/debian/copyright
index b66dc5e..7c70ae0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -64,27 +64,27 @@ SFLPhone also includes the following code from other projects:
   Released under the following license:
 
     Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files 
-    (cURLpp), to deal in the Software without restriction, 
+    a copy of this software and associated documentation files
+    (cURLpp), to deal in the Software without restriction,
     including without limitation the rights to use, copy, modify, merge,
     publish, distribute, sublicense, and/or sell copies of the Software,
-    and to permit persons to whom the Software is furnished to do so, 
+    and to permit persons to whom the Software is furnished to do so,
     subject to the following conditions:
-    
+
     The above copyright notice and this permission notice shall be included
     in all copies or substantial portions of the Software.
-    
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
   sflphone-common/libs/dbus-c++: D-Bus++ - C++ bindings for D-Bus
   Copyright (C) 2005-2007 Paolo Durante <shackan at gmail.com>
-  Released under the terms of the GNU Lesser General Public 
+  Released under the terms of the GNU Lesser General Public
   License 2.1 or later
   Source URL: git://anongit.freedesktop.org/git/dbus/dbus-c++/
 
@@ -123,19 +123,19 @@ the following third-party code:
     This source code is a product of Sun Microsystems, Inc. and is provided
     for unrestricted use.  Users may copy or modify this source code without
     charge.
-   
+
     SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
     THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
     PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-   
+
     Sun source code is provided with no support and without any obligation on
     the part of Sun Microsystems, Inc. to assist in its use, correction,
     modification or enhancement.
-   
+
     SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
     INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
     OR ANY PART THEREOF.
-   
+
     In no event will Sun Microsystems, Inc. be liable for any lost revenue
     or profits or other special, indirect and consequential damages, even if
     Sun has been advised of the possibility of such damages.
@@ -177,7 +177,7 @@ the following third-party code:
                 2000 Bill Schottstaedt
   Released the GNU Lesser General Public License 2.1 or later
 
-  GSM Codec 06.10 - GSM 06.10 Software Library 
+  GSM Codec 06.10 - GSM 06.10 Software Library
   third_party/gsm/
   Copyright (C) 1992-1994 Jutta Degener & Carsten Bormann, Technische Universitaet Berlin
     Any use of this software is permitted provided that this notice is not
@@ -227,19 +227,19 @@ the following third-party code:
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
     are met:
-    
+
       Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
-    
+
       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.
-    
+
       Neither the name of the Cisco Systems, Inc. nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
-    
+
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

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



More information about the Pkg-voip-commits mailing list