[SCM] Free Firewire Audio Drivers (ffado.org) packaging branch, master, updated. upstream/2.0rc1+svn1539-17-gdac3190

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dac3190e494491948ed7520bf0912c29c9d259ce
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon May 18 10:59:22 2009 +0200

    We now have a valid SONAME, so rename the package to libffado1

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 16e4800..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-= Libffado =
-== Soname ==
-Libffado's upstream has yet to include a soname for their shared library.
-To comply with Debian packaging policy, a soname of 0.0.0 has been added with
-the intension that it will be replaced and all packages that depend on libffado
-be relinked at such time. (bzr revno: 9)
diff --git a/debian/changelog b/debian/changelog
index da78a75..681a155 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libffado (2.0~rc2-1) UNRELEASED; urgency=low
+
+  * New Upstream Version
+
+ -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Mon, 18 May 2009 10:54:08 +0200
+
 libffado (2.0~rc1+svn1539-1) unstable; urgency=low
 
   * Initial Debian inclusion, based on Ubuntu (Closes: #501502)
diff --git a/debian/control b/debian/control
index 366e585..cba63e6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ 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>, Free Ekanayaka <freee at debian.org>
-Build-Depends: debhelper (>= 7.0), scons, libraw1394-dev (>= 1.3.0), libxml2-dev (>= 2.6.13), libiec61883-dev (>= 1.1.0), cdbs, pkg-config, dbus (>= 1.0.0), python, python-dbus, python-qt4, pyqt4-dev-tools, dh-buildinfo, libexpat1-dev, libxml++2.6-dev, libdbus-1-dev, pyqt-tools, python-qt4-dbus
+Build-Depends: debhelper (>= 7.0), scons, libraw1394-dev (>= 1.3.0), libxml2-dev (>= 2.6.13), libiec61883-dev (>= 1.1.0), cdbs, pkg-config, dbus (>= 1.0.0), python, python-dbus, python-qt4, pyqt4-dev-tools, dh-buildinfo, libexpat1-dev, libxml++2.6-dev, libdbus-1-dev, pyqt-tools, python-qt4-dbus, autotools-dev
 Standards-Version: 3.8.1
 Section: libs
 Homepage: http://www.ffado.org
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffado.git;a=summary
 Package: libffado-dev
 Section: libdevel
 Architecture: i386 amd64 powerpc 
-Depends: libffado0 (= ${binary:Version}),  ${misc:Depends}, libxml2-dev, ${shlibs:Depends}
+Depends: libffado1 (= ${binary:Version}),  ${misc:Depends}, libxml2-dev, ${shlibs:Depends}
 Description: FFADO API - development files
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -22,7 +22,7 @@ Description: FFADO API - development files
  .
  This package holds the development files.
 
-Package: libffado0
+Package: libffado1
 Section: libs
 Architecture: i386 amd64 powerpc
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -37,7 +37,7 @@ Description: FFADO API
 Package: ffado-tools
 Section: sound
 Architecture: i386 amd64 powerpc
-Depends: libffado0 (= ${binary:Version}), dbus (>= 1.0.0), python, ${misc:Depends}, ${shlibs:Depends}
+Depends: libffado1 (= ${binary:Version}), dbus (>= 1.0.0), python, ${misc:Depends}, ${shlibs:Depends}
 Description: FFADO tools
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
@@ -50,7 +50,7 @@ Description: FFADO tools
 Package: ffado-dbus-server
 Section: sound
 Architecture: i386 amd64 powerpc
-Depends: libffado0 (= ${binary:Version}), dbus (>= 1.0.0), ${misc:Depends}, ${shlibs:Depends}
+Depends: libffado1 (= ${binary:Version}), dbus (>= 1.0.0), ${misc:Depends}, ${shlibs:Depends}
 Description: FFADO D-Bus server
  FFADO is a Linux driver for FireWire (IEEE1394) audio devices.
  .
diff --git a/debian/libffado-dev.links b/debian/libffado-dev.links
index be7f572..fed44f1 100644
--- a/debian/libffado-dev.links
+++ b/debian/libffado-dev.links
@@ -1 +1 @@
-usr/lib/libffado.so.0.0.0u usr/lib/libffado.so
+usr/lib/libffado.so.1 usr/lib/libffado.so
diff --git a/debian/libffado0.install b/debian/libffado1.install
similarity index 100%
rename from debian/libffado0.install
rename to debian/libffado1.install
diff --git a/debian/rules b/debian/rules
index 6f26bec..5ff89b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,7 @@ endif
 
 DEBIAN_FFADO_COMPATIBLE_VERSION = 1.999
 
+CFLAGS += "-fPIC"
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -77,7 +78,7 @@ endif
 
 # DEB_DH_STRIP_ARGS := --dbg-package=ardour
 
-DEB_DH_MAKESHLIBS_ARGS := --version-info="libffado0 (>=${DEBIAN_FFADO_COMPATIBLE_VERSION})"
+DEB_DH_MAKESHLIBS_ARGS := --version-info="libffado1 (>=${DEBIAN_FFADO_COMPATIBLE_VERSION})"
 
 DEB_SCONS_ENVVARS :=
 DEB_SCONS_INVOKE = $(DEB_SCONS_ENVVARS) scons 
@@ -92,8 +93,6 @@ debian/stamp-scons-build:
 		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS) \
 		install
 	touch debian/stamp-scons-build
-	mv $(DEB_DESTDIR)/usr/lib/libffado.so \
-		$(DEB_DESTDIR)/usr/lib/libffado.so.0.0.0
 
 # this is bad but the only easy way to have ardour.rc generated from
 # ardour.rc.in

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