[Pkg-voip-commits] [twinkle] 47/73: Wrap-and-sort

[Peter Colberg]

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

pc-guest pushed a commit to branch master
in repository twinkle.

commit b31db85867caba0a330acfe58a9d434a6ccce6c0
Author: Peter Colberg <peter at colberg.org>
Date:   Mon Dec 28 23:10:14 2015 -0500

    Wrap-and-sort
---
 debian/control         | 31 +++++++++++++++++++++----------
 debian/copyright       | 25 ++++++++++++-------------
 debian/dirs            |  2 +-
 debian/twinkle.install |  6 +++---
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 59e9168..2ec17f6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,31 @@ Source: twinkle
 Section: comm
 Priority: optional
 Maintainer: Clint Adams <clint at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, help2man,
- autotools-dev, dh-autoreconf,
- libcommoncpp2-dev (>= 1.4.2), libccrtp-dev, libzrtpcpp-dev (>= 1.4.0),
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libgsm1-dev, libsndfile1-dev, libspeex-dev, libspeexdsp-dev,
- libreadline-dev,
- libboost-regex-dev, libxml2-dev, libxpm-dev, libmagic-dev
- , libncurses-dev
+Build-Depends: autotools-dev,
+               cdbs,
+               debhelper (>= 7),
+               dh-autoreconf,
+               help2man,
+               libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libboost-regex-dev,
+               libccrtp-dev,
+               libcommoncpp2-dev (>= 1.4.2),
+               libgsm1-dev,
+               libmagic-dev,
+               libncurses-dev,
+               libreadline-dev,
+               libsndfile1-dev,
+               libspeex-dev,
+               libspeexdsp-dev,
+               libxml2-dev,
+               libxpm-dev,
+               libzrtpcpp-dev (>= 1.4.0)
 Standards-Version: 3.9.5
 Homepage: http://www.twinklephone.com/
 
 Package: twinkle
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Voice over Internet Protocol (VoIP) SIP Phone
  Soft-phone for making telephone calls using SIP over an IP network.
  .
@@ -87,7 +98,7 @@ Description: Voice over Internet Protocol (VoIP) SIP Phone
   G.726 (16, 24, 32 or 40 kbps payload, 8 kHz sampling rate)
  .
  For all codecs the following preprocessing options are available to improve
- quality at the far end of a call. 
+ quality at the far end of a call.
   Automatic gain control (AGC) (new)
   Noise reduction (new)
   Voice activity detection (VAD) (new)
diff --git a/debian/copyright b/debian/copyright
index dbcea69..111fe37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Sun, 29 May 2005 09:40:22 +0100.
 It was downloaded from http://www.twinklephone.com/
 
 In order to make twinkle DFSG compliant the audio/ilbc portion of code
-has been removed and the package as been built with 
+has been removed and the package as been built with
 	./configure --without-ilbc
 
-Copyright Holder: 
- 
+Copyright Holder:
+
 Author of Twinkle.
 
 Michel de Boer <michel at twinklephone.com> designed and implemented Twinkle.
@@ -69,22 +69,22 @@ in your product implementation.
 
 src/stun/stun.*
 /* ====================================================================
- * The Vovida Software License, Version 1.0 
- * 
+ * The Vovida Software License, Version 1.0
+ *
  * Copyright (c) 2000 Vovida Networks, Inc.  All rights reserved.
- * 
+ *
  * 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.
- * 
+ *
  * 3. The names "VOCAL", "Vovida Open Communication Application Library",
  *    and "Vovida Open Communication Application Library (VOCAL)" must
  *    not be used to endorse or promote products derived from this
@@ -94,7 +94,7 @@ src/stun/stun.*
  * 4. Products derived from this software may not be called "VOCAL", nor
  *    may "VOCAL" appear in their name, without prior written
  *    permission of Vovida Networks, Inc.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
@@ -108,9 +108,9 @@ src/stun/stun.*
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
- * 
+ *
  * ====================================================================
- * 
+ *
  * This software consists of voluntary contributions made by Vovida
  * Networks, Inc. and many individuals on behalf of Vovida Networks,
  * Inc.  For more information on Vovida Networks, Inc., please see
@@ -122,4 +122,3 @@ src/sockets/dnssrv.cpp:
    This software is copyrighted (c) 2002 Rick van Rein, the Netherlands.
 
    This software has been modified by Michel de Boer. 2005
-
diff --git a/debian/dirs b/debian/dirs
index d237bbc..533a62d 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,4 @@
 usr/bin
 usr/share/applications
-usr/share/services
 usr/share/bug/twinkle
+usr/share/services
diff --git a/debian/twinkle.install b/debian/twinkle.install
index de783a0..d2f60f2 100644
--- a/debian/twinkle.install
+++ b/debian/twinkle.install
@@ -1,5 +1,5 @@
-debian/twinkle-32x32.xpm usr/share/pixmaps/
-debian/twinkle-16x16.xpm usr/share/pixmaps/
 debian/bug/* usr/share/bug/twinkle/
-twinkle.desktop usr/share/applications
+debian/twinkle-16x16.xpm usr/share/pixmaps/
+debian/twinkle-32x32.xpm usr/share/pixmaps/
 sip.protocol usr/share/services
+twinkle.desktop usr/share/applications

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