[Pkg-voip-commits] [yate] 02/03: fix lintian error pre-depends-directly-on-multiarch-support

Victor Seva Lopez maniac-guest at moszumanska.debian.org
Wed Aug 12 13:10:48 UTC 2015


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

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

commit 360a1c323270a8d973fbfd4f7756fb5022de0bc2
Author: Victor Seva <vseva at sipwise.com>
Date:   Wed Aug 12 14:17:18 2015 +0200

    fix lintian error pre-depends-directly-on-multiarch-support
    
    while at it exec wrap-and-sort -a
---
 debian/control               | 113 ++++++++++++++++-----------
 debian/yate-core.install     | 182 +++++++++++++++++++++----------------------
 debian/yate-dahdi.install    |   3 +-
 debian/yate-dev.install      |   2 +-
 debian/yate-mysql.install    |   2 +-
 debian/yate-openh323.install |   1 +
 debian/yate-pgsql.install    |   2 +-
 debian/yate-qt4.install      |   4 +-
 debian/yate-sctp.install     |   2 +-
 debian/yate.install          |   2 +-
 10 files changed, 164 insertions(+), 149 deletions(-)

diff --git a/debian/control b/debian/control
index f39972e..037e698 100644
--- a/debian/control
+++ b/debian/control
@@ -2,34 +2,40 @@ Source: yate
 Section: comm
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
-Build-Depends: debhelper (>= 9),
- dpkg-dev (>= 1.16.1~),
- autotools-dev,
- dh-autoreconf,
-# libh323plus-dev (>= 1.22.0~),
- libgsm1-dev,
- dahdi-source,
- libmysqlclient-dev,
- libpq-dev,
- libqt4-dev,
- libasound2-dev,
- libspeex-dev,
- libssl-dev,
- zlib1g-dev,
- libsctp-dev,
- python,
- libspandsp-dev (>= 0.0.5~),
- doxygen,
- pkg-config
-Standards-Version: 3.9.3
+Uploaders: Mark Purcell <msp at debian.org>,
+           Tzafrir Cohen <tzafrir at debian.org>,
+           Victor Seva <linuxmaniac at torreviejawireless.org>
+Build-Depends: autotools-dev,
+               dahdi-source,
+               debhelper (>= 9),
+               dh-autoreconf,
+               doxygen,
+               dpkg-dev (>= 1.16.1~),
+               libasound2-dev,
+               libgsm1-dev,
+               libmysqlclient-dev,
+               libpq-dev,
+               libqt4-dev,
+               libsctp-dev,
+               libspandsp-dev (>= 0.0.5~),
+               libspeex-dev,
+               libssl-dev,
+               pkg-config,
+               python,
+               zlib1g-dev
+Standards-Version: 3.9.6
 Homepage: http://yate.null.ro/
 Vcs-git: git://anonscm.debian.org/pkg-voip/yate.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-voip/yate.git
 
 Package: yate
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, yate-core (= ${binary:Version}), libcap2-bin
+Pre-Depends: ${misc:Pre-Depends}
+Depends: adduser,
+         libcap2-bin,
+         yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Yet Another Telephony Engine (YATE)
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -65,8 +71,9 @@ Description: Yet Another Telephony Engine (YATE)
 Package: libyate5.2.0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: Shared library for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -77,7 +84,9 @@ Description: Shared library for YATE
 Package: yate-core
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: YATE core modules
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -88,8 +97,10 @@ Description: YATE core modules
 Package: yate-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libyate5.2.0 (= ${binary:Version}),
- yate-qt4 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libyate5.2.0 (= ${binary:Version}),
+         yate-qt4 (= ${binary:Version}),
+         ${misc:Depends}
 Description: Development files for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -108,10 +119,11 @@ Description: Documentation for YATE
  .
  This package provides documentation for YATE.
 
-# Or maybe a separate -php and -perl packages?
 Package: yate-scripts
-Architecture: any
-Depends: ${misc:Depends}, yate (>= ${binary:Version}), php5-cli
+Architecture: all
+Depends: php5-cli,
+         yate (>= ${binary:Version}),
+         ${misc:Depends}
 Description: PHP scripts for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -121,7 +133,9 @@ Description: PHP scripts for YATE
 
 Package: yate-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+Depends: yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: PostgreSQL module for yate
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -129,23 +143,16 @@ Description: PostgreSQL module for yate
  .
  These are the modules that require PostgreSQL.
 
-#Package: yate-h323chan
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
-#Description: H323 module for YATE
-# YATE is a telephony engine aimed at creating a telephony server that
-# performs well enough to deal with PBX requirements and also flexible
-# enough for complex Gateway and IVR solutions.
-# .
-# This is the H.323 protocol module.
-
 Package: yate-qt4
 Conflicts: yate-core (<< 4)
 Breaks: yate-core (<< 4)
 Replaces: yate-core (<< 4)
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version}), yate-alsa (= ${binary:Version}) [linux-any]
+Depends: yate-alsa (= ${binary:Version}) [linux-any],
+         yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: YATE-based universal telephony client
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -166,7 +173,10 @@ Description: YATE-based universal telephony client
 
 Package: yate-alsa
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: ALSA module for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -176,7 +186,10 @@ Description: ALSA module for YATE
 
 Package: yate-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: MySQL support module for yate
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -186,7 +199,10 @@ Description: MySQL support module for yate
 
 Package: yate-dahdi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Dahdi support for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -196,7 +212,10 @@ Description: Dahdi support for YATE
 
 Package: yate-sctp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: yate-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: SCTP support for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
diff --git a/debian/yate-core.install b/debian/yate-core.install
index 6114034..50ecf03 100644
--- a/debian/yate-core.install
+++ b/debian/yate-core.install
@@ -1,108 +1,104 @@
-usr/lib/*/yate/*.yate
-usr/lib/*/yate/client/osschan.yate
-usr/lib/*/yate/client/jabberclient.yate
-usr/lib/*/yate/sig/
-usr/lib/*/yate/sip/*.yate
-usr/lib/*/yate/jabber/*.yate
-usr/share/yate/data/*
-
-#usr/lib/*/yate/server/*.yate   
-#exclude alsa qt4 pgsql mysql dahdi sctp
-
-usr/lib/*/yate/server/callcounters.yate
-usr/lib/*/yate/server/dbwave.yate
-usr/lib/*/yate/server/users.yate
-usr/lib/*/yate/server/cpuload.yate
-usr/lib/*/yate/server/mgcpgw.yate
-usr/lib/*/yate/server/clustering.yate
-usr/lib/*/yate/server/ciscosm.yate
-usr/lib/*/yate/server/sipfeatures.yate
-usr/lib/*/yate/server/dbpbx.yate
-usr/lib/*/yate/server/mrcpspeech.yate
-usr/lib/*/yate/server/analogdetect.yate
-usr/lib/*/yate/server/ysigchan.yate
-usr/lib/*/yate/server/lateroute.yate
-usr/lib/*/yate/server/yradius.yate
-usr/lib/*/yate/server/register.yate
-usr/lib/*/yate/server/regfile.yate
-usr/lib/*/yate/server/subscription.yate
-usr/lib/*/yate/server/queues.yate
-usr/lib/*/yate/server/analog.yate
-usr/lib/*/yate/server/mgcpca.yate
-usr/lib/*/yate/server/ysnmpagent.yate
-usr/lib/*/yate/server/park.yate
-usr/lib/*/yate/server/heartbeat.yate
-usr/lib/*/yate/server/sigtransport.yate
-usr/lib/*/yate/server/presence.yate
-usr/lib/*/yate/server/pbxassist.yate
-usr/lib/*/yate/server/ccongestion.yate
-usr/lib/*/yate/server/queuesnotify.yate
-usr/lib/*/yate/server/accfile.yate
-usr/lib/*/yate/server/cache.yate
-usr/lib/*/yate/server/monitoring.yate
-usr/lib/*/yate/server/eventlogs.yate
-
 #etc/yate/*.conf
+#etc/yate/h323chan.conf
 #exclude alsa qt4 pgsql mysql dahdi sctp
-
-etc/yate/ss7_lnp_ansi.conf
-etc/yate/pbxassist.conf
-etc/yate/sip_cnam_lnp.conf
-etc/yate/ysnmpagent.conf
-etc/yate/yradius.conf
+#exclude alsa qt4 pgsql mysql dahdi sctp
+#usr/lib/*/yate/server/*.yate
+etc/yate/accfile.conf
+etc/yate/analog.conf
 etc/yate/cache.conf
+etc/yate/callcounters.conf
+etc/yate/callfork.conf
+etc/yate/camel_map.conf
+etc/yate/ccongestion.conf
+etc/yate/cdrbuild.conf
+etc/yate/cdrfile.conf
+etc/yate/ciscosm.conf
 etc/yate/clustering.conf
-etc/yate/heartbeat.conf
+etc/yate/cpuload.conf
+etc/yate/dbpbx.conf
+etc/yate/dsoundchan.conf
 etc/yate/enumroute.conf
-#etc/yate/h323chan.conf
+etc/yate/eventlogs.conf
 etc/yate/extmodule.conf
-etc/yate/yiaxchan.conf
-etc/yate/ciscosm.conf
-etc/yate/mgcpca.conf
-etc/yate/zlibcompress.conf
-etc/yate/callfork.conf
+etc/yate/fileinfo.conf
+etc/yate/filetransfer.conf
 etc/yate/gvoice.conf
+etc/yate/heartbeat.conf
+etc/yate/isupmangler.conf
+etc/yate/jabberclient.conf
+etc/yate/jabberserver.conf
+etc/yate/javascript.conf
+etc/yate/jbfeatures.conf
+etc/yate/lateroute.conf
+etc/yate/mgcpca.conf
+etc/yate/mgcpgw.conf
+etc/yate/moh.conf
+etc/yate/monitoring.conf
+etc/yate/mux.conf
+etc/yate/openssl.conf
+etc/yate/pbxassist.conf
+etc/yate/presence.conf
+etc/yate/queues.conf
+etc/yate/queuesnotify.conf
+etc/yate/regexroute.conf
+etc/yate/regfile.conf
+etc/yate/register.conf
 etc/yate/rmanager.conf
-etc/yate/accfile.conf
-etc/yate/dbpbx.conf
+etc/yate/sigtransport.conf
+etc/yate/sip_cnam_lnp.conf
+etc/yate/sipfeatures.conf
+etc/yate/ss7_lnp_ansi.conf
+etc/yate/subscription.conf
 etc/yate/tdmcard.conf
-etc/yate/wpcard.conf
-etc/yate/camel_map.conf
 etc/yate/tonegen.conf
-etc/yate/ysipchan.conf
-etc/yate/ysigchan.conf
-etc/yate/openssl.conf
 etc/yate/users.conf
-etc/yate/dsoundchan.conf
-etc/yate/register.conf
+etc/yate/wpcard.conf
+etc/yate/yiaxchan.conf
 etc/yate/yjinglechan.conf
-etc/yate/jabberserver.conf
+etc/yate/yradius.conf
 etc/yate/yrtpchan.conf
-etc/yate/filetransfer.conf
-etc/yate/javascript.conf
-etc/yate/moh.conf
-etc/yate/subscription.conf
-etc/yate/cdrfile.conf
-etc/yate/cdrbuild.conf
-etc/yate/regexroute.conf
-etc/yate/regfile.conf
-etc/yate/analog.conf
-etc/yate/mux.conf
-etc/yate/isupmangler.conf
+etc/yate/ysigchan.conf
+etc/yate/ysipchan.conf
+etc/yate/ysnmpagent.conf
 etc/yate/ysockschan.conf
-etc/yate/lateroute.conf
-etc/yate/cpuload.conf
-etc/yate/sipfeatures.conf
-etc/yate/jbfeatures.conf
-etc/yate/callcounters.conf
-etc/yate/queuesnotify.conf
-etc/yate/jabberclient.conf
-etc/yate/mgcpgw.conf
-etc/yate/ccongestion.conf
-etc/yate/queues.conf
 etc/yate/ystunchan.conf
-etc/yate/monitoring.conf
-etc/yate/sigtransport.conf
-etc/yate/presence.conf
-etc/yate/eventlogs.conf
-etc/yate/fileinfo.conf
+etc/yate/zlibcompress.conf
+usr/lib/*/yate/*.yate
+usr/lib/*/yate/client/jabberclient.yate
+usr/lib/*/yate/client/osschan.yate
+usr/lib/*/yate/jabber/*.yate
+usr/lib/*/yate/server/accfile.yate
+usr/lib/*/yate/server/analog.yate
+usr/lib/*/yate/server/analogdetect.yate
+usr/lib/*/yate/server/cache.yate
+usr/lib/*/yate/server/callcounters.yate
+usr/lib/*/yate/server/ccongestion.yate
+usr/lib/*/yate/server/ciscosm.yate
+usr/lib/*/yate/server/clustering.yate
+usr/lib/*/yate/server/cpuload.yate
+usr/lib/*/yate/server/dbpbx.yate
+usr/lib/*/yate/server/dbwave.yate
+usr/lib/*/yate/server/eventlogs.yate
+usr/lib/*/yate/server/heartbeat.yate
+usr/lib/*/yate/server/lateroute.yate
+usr/lib/*/yate/server/mgcpca.yate
+usr/lib/*/yate/server/mgcpgw.yate
+usr/lib/*/yate/server/monitoring.yate
+usr/lib/*/yate/server/mrcpspeech.yate
+usr/lib/*/yate/server/park.yate
+usr/lib/*/yate/server/pbxassist.yate
+usr/lib/*/yate/server/presence.yate
+usr/lib/*/yate/server/queues.yate
+usr/lib/*/yate/server/queuesnotify.yate
+usr/lib/*/yate/server/regfile.yate
+usr/lib/*/yate/server/register.yate
+usr/lib/*/yate/server/sigtransport.yate
+usr/lib/*/yate/server/sipfeatures.yate
+usr/lib/*/yate/server/subscription.yate
+usr/lib/*/yate/server/users.yate
+usr/lib/*/yate/server/yradius.yate
+usr/lib/*/yate/server/ysigchan.yate
+usr/lib/*/yate/server/ysnmpagent.yate
+usr/lib/*/yate/sig/
+usr/lib/*/yate/sip/*.yate
+usr/share/yate/data/*
diff --git a/debian/yate-dahdi.install b/debian/yate-dahdi.install
index ce0c362..b84f889 100644
--- a/debian/yate-dahdi.install
+++ b/debian/yate-dahdi.install
@@ -1,3 +1,2 @@
-usr/lib/*/yate/server/zapcard.yate
 etc/yate/zapcard.conf
-
+usr/lib/*/yate/server/zapcard.yate
diff --git a/debian/yate-dev.install b/debian/yate-dev.install
index f327619..13a22a5 100644
--- a/debian/yate-dev.install
+++ b/debian/yate-dev.install
@@ -1,5 +1,5 @@
 usr/bin/yate-config
-usr/share/man/man8/yate-config.*
 usr/include/*
 usr/lib/*/libyate*.so
 usr/lib/*/pkgconfig/yate.pc
+usr/share/man/man8/yate-config.*
diff --git a/debian/yate-mysql.install b/debian/yate-mysql.install
index 4a76955..4b9f86e 100644
--- a/debian/yate-mysql.install
+++ b/debian/yate-mysql.install
@@ -1,2 +1,2 @@
-usr/lib/*/yate/server/mysqldb.yate
 etc/yate/mysqldb.conf
+usr/lib/*/yate/server/mysqldb.yate
diff --git a/debian/yate-openh323.install b/debian/yate-openh323.install
index e69de29..8b13789 100644
--- a/debian/yate-openh323.install
+++ b/debian/yate-openh323.install
@@ -0,0 +1 @@
+
diff --git a/debian/yate-pgsql.install b/debian/yate-pgsql.install
index b8dc977..3c839da 100644
--- a/debian/yate-pgsql.install
+++ b/debian/yate-pgsql.install
@@ -1,2 +1,2 @@
-usr/lib/*/yate/server/pgsqldb.yate
 etc/yate/pgsqldb.conf
+usr/lib/*/yate/server/pgsqldb.yate
diff --git a/debian/yate-qt4.install b/debian/yate-qt4.install
index ae61135..2fb9266 100644
--- a/debian/yate-qt4.install
+++ b/debian/yate-qt4.install
@@ -1,10 +1,10 @@
+etc/yate/providers.conf
+etc/yate/yate-qt4.conf
 usr/bin/yate-qt4
 usr/lib/*/libyateqt4.so.*
 usr/lib/*/yate/qt4/*.yate
 usr/lib/menu/yate-qt4.menu
 usr/share/applications/yate-qt4.desktop
-etc/yate/yate-qt4.conf
-etc/yate/providers.conf
 usr/share/pixmaps/*.png
 usr/share/yate/help/*.yhlp
 usr/share/yate/skins/*
diff --git a/debian/yate-sctp.install b/debian/yate-sctp.install
index f4ae6a4..d635daf 100644
--- a/debian/yate-sctp.install
+++ b/debian/yate-sctp.install
@@ -1,2 +1,2 @@
-usr/lib/*/yate/server/lksctp.yate
 etc/yate/lksctp.conf
+usr/lib/*/yate/server/lksctp.yate
diff --git a/debian/yate.install b/debian/yate.install
index 34defdb..bb722b6 100644
--- a/debian/yate.install
+++ b/debian/yate.install
@@ -1,3 +1,3 @@
+etc/yate/yate.conf
 usr/bin/yate
 usr/share/man/man8/yate.*
-etc/yate/yate.conf

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



More information about the Pkg-voip-commits mailing list