[SCM] ffado/master: wrap-and-sort -a -s
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Apr 17 06:53:49 UTC 2012
The following commit has been merged in the master branch:
commit 3855bf36558da59b89784aaa57a0beed7af9a2eb
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Apr 17 08:53:37 2012 +0200
wrap-and-sort -a -s
Git-Dch: Ignore
diff --git a/debian/control.in b/debian/control.in
index fbe87d3..a93bd2e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,28 +1,30 @@
Source: libffado
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>,
+Uploaders:
+ Adrian Knoth <adi at drcomp.erfurt.thur.de>,
Free Ekanayaka <freee at debian.org>,
Jonas Smedegaard <dr at jones.dk>
-Build-Depends: @cdbs@,
- scons,
+Build-Depends:
+ @cdbs@,
+ dbus (>= 1.0.0),
+ libconfig++8-dev,
+ libdbus-1-dev,
+ libdbus-c++-dev,
+ libexpat1-dev,
+ libiec61883-dev (>= 1.1.0),
libraw1394-dev (>= 1.3.0),
+ libxml++2.6-dev,
libxml2-dev (>= 2.6.13),
- libiec61883-dev (>= 1.1.0),
pkg-config,
- dbus (>= 1.0.0),
+ pyqt4-dev-tools,
python,
python-dbus,
python-qt4,
- pyqt4-dev-tools,
- python-support,
- libexpat1-dev,
- libxml++2.6-dev,
- libdbus-1-dev,
python-qt4-dbus,
- libconfig++8-dev,
- libdbus-c++-dev,
- quilt
+ python-support,
+ quilt,
+ scons
Standards-Version: 3.9.2
DM-Upload-Allowed: yes
XS-Python-Version: all
@@ -33,49 +35,54 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffado.git
Package: libffado-dev
Section: libdevel
-Architecture: i386 amd64 powerpc armel armhf
-Depends: libffado2 (= ${binary:Version}),
- ${misc:Depends},
+Architecture: amd64 armel armhf i386 powerpc
+Depends:
+ libffado2 (= ${binary:Version}),
libxml2-dev,
+ ${misc:Depends},
${shlibs:Depends}
Description: FFADO API - development files
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
- The FFADO library permits discovering and configuring such
+ The FFADO library permits discovering and configuring such
devices and provides an API for streaming clients.
.
This package holds the development files.
Package: libffado2
Section: libs
-Architecture: i386 amd64 powerpc armel armhf
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Architecture: amd64 armel armhf i386 powerpc
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: FFADO API
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
- The FFADO library permits discovering and configuring such
+ The FFADO library permits discovering and configuring such
devices and provides an API for streaming clients.
.
This package holds the shared library.
Package: ffado-tools
Section: sound
-Architecture: i386 amd64 powerpc armel armhf
-Depends: libffado2 (= ${binary:Version}),
+Architecture: amd64 armel armhf i386 powerpc
+Depends:
dbus (>= 1.0.0),
+ libffado2 (= ${binary:Version}),
python,
${misc:Depends},
${shlibs:Depends}
-Replaces: ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
-Breaks: ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
+Replaces:
+ ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
+Breaks:
+ ffado-mixer-qt4 (<< 2.0.1+svn1856-2~)
Description: FFADO debugging and firmware tools
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
- The FFADO library permits discovering and configuring such
+ The FFADO library permits discovering and configuring such
devices and provides an API for streaming clients.
.
- This package holds the following tools for firmware updating,
+ This package holds the following tools for firmware updating,
troubleshooting and debugging:
* ffado-test-streaming
* ffado-diag
@@ -87,38 +94,39 @@ Description: FFADO debugging and firmware tools
Package: ffado-dbus-server
Section: sound
-Architecture: i386 amd64 powerpc armel armhf
-Depends: libffado2 (= ${binary:Version}),
+Architecture: amd64 armel armhf i386 powerpc
+Depends:
dbus (>= 1.0.0),
+ libffado2 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: FFADO D-Bus server
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
- The FFADO library permits discovering and configuring such
+ The FFADO library permits discovering and configuring such
devices and provides an API for streaming clients.
.
- This package holds the D-Bus server that exposes the mixer
+ This package holds the D-Bus server that exposes the mixer
and control interfaces through D-Bus.
-
Package: ffado-mixer-qt4
Section: sound
Architecture: all
-Depends: ffado-dbus-server (>= ${source:Version}),
+Depends:
+ ffado-dbus-server (>= ${source:Version}),
ffado-tools (>= ${source:Version}),
- ${python:Depends},
python,
python-dbus,
python-qt4,
python-qt4-dbus,
${misc:Depends},
+ ${python:Depends},
${shlibs:Depends}
Description: FFADO D-Bus mixer applets (QT4)
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
- The FFADO library permits discovering and configuring such
+ The FFADO library permits discovering and configuring such
devices and provides an API for streaming clients.
.
- This package holds the mixer and control applications that
+ This package holds the mixer and control applications that
communicate with ffado-dbus-server. (Qt4 version)
diff --git a/debian/copyright b/debian/copyright
index 4616db1..8ec5f95 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,14 +6,14 @@ The current Ubuntu maintainer is the Ubuntu Studio Devel Team
It was downloaded from http://www.ffado.org
-Upstream Authors:
+Upstream Authors:
Pieter Palmers <pieter.palmers at ffado.org>
Daniel Wagner <wagi at monom.org>
Jonathan Woithe <jwoithe at physics.adelaide.edu.au>
Arnold Krille <arnold at arnoldarts.de>
-Copyright:
+Copyright:
<Copyright (C) 2005-2008 Pieter Palmers
<Copyright (C) 2005-2008 Daniel Wagner
diff --git a/debian/ffado-dbus-server.install b/debian/ffado-dbus-server.install
index 0780f11..b21f8f4 100644
--- a/debian/ffado-dbus-server.install
+++ b/debian/ffado-dbus-server.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/ffado-dbus-server
+debian/tmp/usr/bin/ffado-dbus-server
diff --git a/debian/ffado-mixer-qt4.install b/debian/ffado-mixer-qt4.install
index 6e6e482..ba5de36 100644
--- a/debian/ffado-mixer-qt4.install
+++ b/debian/ffado-mixer-qt4.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/share/ffado-mixer-qt4/
debian/tmp/usr/bin/ffado-mixer
+debian/tmp/usr/share/ffado-mixer-qt4/
support/mixer-qt4/ffado/*.ui usr/share/ffado-mixer-qt4/ffado
support/mixer-qt4/ffado/mixer/*.ui usr/share/ffado-mixer-qt4/ffado/mixer
support/xdg/ffado.org-ffadomixer.desktop usr/share/applications/
diff --git a/debian/ffado-tools.install b/debian/ffado-tools.install
index 28702d7..807aca8 100644
--- a/debian/ffado-tools.install
+++ b/debian/ffado-tools.install
@@ -1,8 +1,8 @@
debian/tmp/usr/bin/ffado-bridgeco-downloader
+debian/tmp/usr/bin/ffado-diag
debian/tmp/usr/bin/ffado-fireworks-downloader
debian/tmp/usr/bin/ffado-test
-debian/tmp/usr/bin/ffado-test-streaming
debian/tmp/usr/bin/ffado-test-isorecv
debian/tmp/usr/bin/ffado-test-isoxmit
-debian/tmp/usr/bin/ffado-diag
+debian/tmp/usr/bin/ffado-test-streaming
debian/tmp/usr/share/libffado2/python/*
diff --git a/debian/libffado-dev.install b/debian/libffado-dev.install
index bd7b37d..fad5560 100644
--- a/debian/libffado-dev.install
+++ b/debian/libffado-dev.install
@@ -1,3 +1,3 @@
+#debian/tmp/usr/lib/lib*.so
debian/tmp/usr/include/libffado/*
debian/tmp/usr/lib/pkgconfig/*
-#debian/tmp/usr/lib/lib*.so
diff --git a/debian/libffado2.install b/debian/libffado2.install
index 0c70013..178c021 100644
--- a/debian/libffado2.install
+++ b/debian/libffado2.install
@@ -1,5 +1,5 @@
+debian/60-ffado.rules lib/udev/rules.d/
+debian/ffado-debug usr/bin/
+debian/tmp/dbg/usr/lib/lib*.so.* usr/lib/libffado2/
debian/tmp/usr/lib/lib*.so.*
debian/tmp/usr/share/libffado2/configuration
-debian/tmp/dbg/usr/lib/lib*.so.* usr/lib/libffado2/
-debian/ffado-debug usr/bin/
-debian/60-ffado.rules lib/udev/rules.d/
--
Free Firewire Audio Drivers (ffado.org) packaging
More information about the pkg-multimedia-commits
mailing list