Hi!
Please find attached the debdiff for an updated ffado package. If you
agree, I'll finalize the changelog and upload it to unstable.
If you have suggestions, improvements or simply things we should change,
I'm happy to incorporate them.
TIA
--
mail: a...@thur.de http://adi.thur.de PGP/GPG: key via keyserver
diff -Nru libffado-2.0.1+svn1856/debian/changelog
libffado-2.0.1+svn1856/debian/changelog
--- libffado-2.0.1+svn1856/debian/changelog 2010-09-16 10:47:22.000000000
+0200
+++ libffado-2.0.1+svn1856/debian/changelog 2010-09-27 23:13:00.000000000
+0200
@@ -1,3 +1,17 @@
+libffado (2.0.1+svn1856-3) UNRELEASED; urgency=low
+
+ [ Jonas Smedegaard ]
+ * Fix have ffado-tools replace older ffado-mixer-qt4.
+ * Tighten build-dependency on cdbs slightly.
+ * Simplify resolving parallel compilation using example code snippet
+ from Debian Policy.
+
+ [ Adrian Knoth ]
+ * Drop ffado-python-support and provide the files in ffado-tools instead.
+ * Make ffado-mixer-qt4 depend on ffado-tools.
+
+ -- Jonas Smedegaard <d...@jones.dk> Tue, 21 Sep 2010 01:10:04 +0200
+
libffado (2.0.1+svn1856-2) unstable; urgency=low
* Fix homepage entry. (drop Ubuntu)
diff -Nru libffado-2.0.1+svn1856/debian/control
libffado-2.0.1+svn1856/debian/control
--- libffado-2.0.1+svn1856/debian/control 2010-09-15 18:03:27.000000000
+0200
+++ libffado-2.0.1+svn1856/debian/control 2010-09-27 23:42:34.000000000
+0200
@@ -5,9 +5,9 @@
Free Ekanayaka <fr...@debian.org>
Build-Depends: autotools-dev,
debhelper (>= 7.0.1),
- devscripts (>= 2.10.7~),
- cdbs (>= 0.4.67~),
dh-buildinfo,
+ cdbs (>= 0.4.69~),
+ devscripts (>= 2.10.7~),
scons,
libraw1394-dev (>= 1.3.0),
libxml2-dev (>= 2.6.13),
@@ -64,11 +64,14 @@
Section: sound
Architecture: i386 amd64 powerpc
Depends: libffado2 (= ${binary:Version}),
- ffado-python-support,
dbus (>= 1.0.0),
python,
${misc:Depends},
${shlibs:Depends}
+Replaces: ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
+ ffado-python-support (<= 2.0.1+svn1856-2)
+Breaks: ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
+ ffado-python-support (<= 2.0.1+svn1856-2)
Description: FFADO debugging and firmware tools
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
@@ -106,7 +109,7 @@
Section: sound
Architecture: all
Depends: ffado-dbus-server (>= ${source:Version}),
- ffado-python-support,
+ ffado-tools (>= ${source:Version}),
${python:Depends},
python,
python-dbus,
@@ -122,19 +125,3 @@
.
This package holds the mixer and control applications that
communicate with ffado-dbus-server. (Qt4 version)
-
-Package: ffado-python-support
-Section: sound
-Architecture: all
-Depends: ${python:Depends},
- python,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: FFADO python support modules
- FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
- .
- The FFADO library permits discovering and configuring such
- devices and provides an API for streaming clients.
- .
- This package contains the python support modules used by
- ffado-tools and ffado-mixer-qt4.
diff -Nru libffado-2.0.1+svn1856/debian/control.in
libffado-2.0.1+svn1856/debian/control.in
--- libffado-2.0.1+svn1856/debian/control.in 2010-09-15 18:03:27.000000000
+0200
+++ libffado-2.0.1+svn1856/debian/control.in 2010-09-27 23:29:44.000000000
+0200
@@ -60,11 +60,14 @@
Section: sound
Architecture: i386 amd64 powerpc
Depends: libffado2 (= ${binary:Version}),
- ffado-python-support,
dbus (>= 1.0.0),
python,
${misc:Depends},
${shlibs:Depends}
+Replaces: ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
+ ffado-python-support (<= 2.0.1+svn1856-2)
+Breaks: ffado-mixer-qt4 (<< 2.0.1+svn1856-2~),
+ ffado-python-support (<= 2.0.1+svn1856-2)
Description: FFADO debugging and firmware tools
FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
.
@@ -102,7 +105,7 @@
Section: sound
Architecture: all
Depends: ffado-dbus-server (>= ${source:Version}),
- ffado-python-support,
+ ffado-tools (>= ${source:Version}),
${python:Depends},
python,
python-dbus,
@@ -118,19 +121,3 @@
.
This package holds the mixer and control applications that
communicate with ffado-dbus-server. (Qt4 version)
-
-Package: ffado-python-support
-Section: sound
-Architecture: all
-Depends: ${python:Depends},
- python,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: FFADO python support modules
- FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
- .
- The FFADO library permits discovering and configuring such
- devices and provides an API for streaming clients.
- .
- This package contains the python support modules used by
- ffado-tools and ffado-mixer-qt4.
diff -Nru libffado-2.0.1+svn1856/debian/ffado-python-support.install
libffado-2.0.1+svn1856/debian/ffado-python-support.install
--- libffado-2.0.1+svn1856/debian/ffado-python-support.install 2010-09-15
18:03:27.000000000 +0200
+++ libffado-2.0.1+svn1856/debian/ffado-python-support.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/libffado2/python/*
diff -Nru libffado-2.0.1+svn1856/debian/ffado-tools.install
libffado-2.0.1+svn1856/debian/ffado-tools.install
--- libffado-2.0.1+svn1856/debian/ffado-tools.install 2010-09-15
18:03:27.000000000 +0200
+++ libffado-2.0.1+svn1856/debian/ffado-tools.install 2010-09-27
23:13:00.000000000 +0200
@@ -5,3 +5,4 @@
debian/tmp/usr/bin/ffado-test-isorecv
debian/tmp/usr/bin/ffado-test-isoxmit
debian/tmp/usr/bin/ffado-diag
+debian/tmp/usr/share/libffado2/python/*
diff -Nru libffado-2.0.1+svn1856/debian/gbp.conf
libffado-2.0.1+svn1856/debian/gbp.conf
--- libffado-2.0.1+svn1856/debian/gbp.conf 2010-09-15 18:03:27.000000000
+0200
+++ libffado-2.0.1+svn1856/debian/gbp.conf 2010-09-27 23:15:40.000000000
+0200
@@ -3,4 +3,5 @@
debian-branch = master
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s
-pristine-tar = False
+pristine-tar = True
+compression = gzip
diff -Nru libffado-2.0.1+svn1856/debian/rules
libffado-2.0.1+svn1856/debian/rules
--- libffado-2.0.1+svn1856/debian/rules 2010-09-15 18:03:27.000000000 +0200
+++ libffado-2.0.1+svn1856/debian/rules 2010-09-27 23:13:00.000000000 +0200
@@ -8,7 +8,6 @@
# of the GNU General Public License, incorporated herein by reference.
#
-include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
@@ -20,17 +19,9 @@
CFLAGS += "-fPIC"
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
- PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
- sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
- ifeq ($(DEB_BUILD_OPTIONS),$(PARALLEL_JOBS))
- PARALLEL_JOBS := $(shell if [ -f /proc/cpuinfo ]; \
- then echo `cat /proc/cpuinfo | grep 'processor' | wc
-l`; \
- else echo 1; fi)
- endif
- NJOBS := -j$(PARALLEL_JOBS)
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NJOBS += -j$(NUMJOBS)
endif
ifneq (,$(findstring power,$(DEB_BUILD_ARCH)))
@@ -85,5 +76,5 @@
binary-install/ffado-mixer-qt4::
dh_pysupport -pffado-mixer-qt4
-binary-install/ffado-python-support::
- dh_pysupport -pffado-python-support
+binary-install/ffado-tools::
+ dh_pysupport -pffado-tools
