[SCM] ffado/master: wrap-and-sort -ast

Fri Nov 10 23:40:39 UTC 2017

The following commit has been merged in the master branch:
commit 9f6d240fd1525da84c90b4b0ce9a5707c48af04d
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Nov 10 20:23:26 2017 +0100

    wrap-and-sort -ast
    
    Gbp-Dch: Ignore
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index fa2cc7b..760b98b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,19 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders:
  Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Free Ekanayaka <freee at debian.org>,
- Jonas Smedegaard <dr at jones.dk>
+ Jonas Smedegaard <dr at jones.dk>,
 Build-Depends:
- cdbs,
  autotools-dev,
+ cdbs,
+ dbus (>= 1.0.0),
  debhelper,
- dh-buildinfo,
  devscripts,
- dbus (>= 1.0.0),
+ dh-buildinfo,
+ dh-python,
  libconfig++-dev,
  libdbus-1-dev,
- libdbus-c++-dev,
  libdbus-c++-bin,
+ libdbus-c++-dev,
  libexpat1-dev,
  libiec61883-dev (>= 1.1.0),
  libraw1394-dev (>= 1.3.0),
@@ -27,8 +28,7 @@ Build-Depends:
  python-dbus,
  python-qt4,
  python-qt4-dbus,
- dh-python,
- scons
+ scons,
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://www.ffado.org/
@@ -42,7 +42,7 @@ Depends:
  libffado2 (= ${binary:Version}),
  libxml2-dev,
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO API - development files
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -55,7 +55,7 @@ Package: libffado2
 Architecture: linux-any
 Depends:
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO API
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -72,13 +72,13 @@ Depends:
  libffado2 (= ${binary:Version}),
  python,
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Replaces:
- ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
+ ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
 Breaks:
  ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
  jackd1-firewire (<< 1:0.121.3+20120418git75e3e20b-1),
- jackd2-firewire (<< 1.9.8~dfsg.3+20120418gitf82ec715-1)
+ jackd2-firewire (<< 1.9.8~dfsg.3+20120418gitf82ec715-1),
 Description: FFADO debugging and firmware tools
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -102,7 +102,7 @@ Depends:
  dbus (>= 1.0.0),
  libffado2 (= ${binary:Version}),
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO D-Bus server
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -124,7 +124,7 @@ Depends:
  python-qt4-dbus,
  ${misc:Depends},
  ${python:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO D-Bus mixer applets (QT4)
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
diff --git a/debian/control.in b/debian/control.in
index 44ec25c..fcc0974 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,14 +4,14 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders:
  Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Free Ekanayaka <freee at debian.org>,
- Jonas Smedegaard <dr at jones.dk>
+ Jonas Smedegaard <dr at jones.dk>,
 Build-Depends:
- @cdbs@,
  dbus (>= 1.0.0),
+ dh-python,
  libconfig++-dev,
  libdbus-1-dev,
- libdbus-c++-dev,
  libdbus-c++-bin,
+ libdbus-c++-dev,
  libexpat1-dev,
  libiec61883-dev (>= 1.1.0),
  libraw1394-dev (>= 1.3.0),
@@ -23,8 +23,8 @@ Build-Depends:
  python-dbus,
  python-qt4,
  python-qt4-dbus,
- dh-python,
- scons
+ scons,
+ @cdbs@,
 Standards-Version: 3.9.8
 Section: libs
 Homepage: http://www.ffado.org/
@@ -38,7 +38,7 @@ Depends:
  libffado2 (= ${binary:Version}),
  libxml2-dev,
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO API - development files
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -51,7 +51,7 @@ Package: libffado2
 Architecture: linux-any
 Depends:
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO API
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -68,13 +68,13 @@ Depends:
  libffado2 (= ${binary:Version}),
  python,
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Replaces:
- ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
+ ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
 Breaks:
  ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
  jackd1-firewire (<< 1:0.121.3+20120418git75e3e20b-1),
- jackd2-firewire (<< 1.9.8~dfsg.3+20120418gitf82ec715-1)
+ jackd2-firewire (<< 1.9.8~dfsg.3+20120418gitf82ec715-1),
 Description: FFADO debugging and firmware tools
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -98,7 +98,7 @@ Depends:
  dbus (>= 1.0.0),
  libffado2 (= ${binary:Version}),
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO D-Bus server
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -120,7 +120,7 @@ Depends:
  python-qt4-dbus,
  ${misc:Depends},
  ${python:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
 Description: FFADO D-Bus mixer applets (QT4)
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
diff --git a/debian/ffado-dbus-server.install b/debian/ffado-dbus-server.install
index b21f8f4..6fd2f56 100644
--- a/debian/ffado-dbus-server.install
+++ b/debian/ffado-dbus-server.install
@@ -1,2 +1 @@
-
 debian/tmp/usr/bin/ffado-dbus-server
diff --git a/debian/ffado-tools.manpages b/debian/ffado-tools.manpages
index 8e9d2ac..f666f44 100644
--- a/debian/ffado-tools.manpages
+++ b/debian/ffado-tools.manpages
@@ -1,8 +1,8 @@
-debian/ffado-diag.1
-debian/ffado-test.1
-debian/ffado-test-streaming.1
-debian/ffado-test-isoxmit.1
-debian/ffado-test-isorecv.1
 debian/ffado-bridgeco-downloader.1
+debian/ffado-diag.1
 debian/ffado-fireworks-downloader.1
+debian/ffado-test-isorecv.1
+debian/ffado-test-isoxmit.1
+debian/ffado-test-streaming.1
+debian/ffado-test.1
 debian/ffado-tools.1
diff --git a/debian/libffado2.install b/debian/libffado2.install
index c77bdd4..898c36b 100644
--- a/debian/libffado2.install
+++ b/debian/libffado2.install
@@ -1,5 +1,5 @@
-debian/tmp/lib/*
 debian/ffado-debug usr/bin/
 debian/tmp/dbg/usr/lib/lib*.so.* usr/lib/libffado2/
+debian/tmp/lib/*
 debian/tmp/usr/lib/lib*.so.*
 debian/tmp/usr/share/libffado2/configuration

-- 
Free Firewire Audio Drivers (ffado.org) packaging

