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

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

The following commit has been merged in the master branch:
commit 64a76330619821cfb535669c24fece2371b3aca0
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Apr 21 01:43:40 2009 +0200

    Lintian fixes: FSF address, unversioned GPL reference.
    
    Also:
    
       * require debhelper 7
       * drop u in libffado.so.0.0.0u
       * mention external code in the copyrights file

diff --git a/debian/changelog b/debian/changelog
index c3a3dd9..de492c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,12 @@ libffado (2.0~rc1+svn1539-1) UNRELEASED; urgency=low
 
   * Initial Debian inclusion, based on Ubuntu (Closes: #501502)
   * Bumped standards version
-  * limit architecture to i386, amd64 and powerpc
+  * Limit architecture to i386, amd64 and powerpc
+  * Add external sources to copyright file
+  * Make the source package depend on debhelper-7
+  * Remove Ubuntu's u from libname (libffado.so.0.0.0u)
+  * Fix lintian warnings about outdated FSF address and unversioned GPL
+    reference
 
  -- Adrian Knoth <adi at drcomp.erfurt.thur.de>  Thu, 12 Mar 2009 17:36:53 +0100
 
diff --git a/debian/control b/debian/control
index 3001651..58bb82a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libffado
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), 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, python-qt3
+Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+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, python-qt3
 Standards-Version: 3.8.1
 Section: libs
 Homepage: http://www.ffado.org
diff --git a/debian/copyright b/debian/copyright
index 9ba7b3c..8c7ad61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,6 +20,19 @@ Copyright:
     <Copyright (C) 2005-2008 Jonathan Woithe
     <Copyright (C) 2007-2008 Arnold Krille
 
+This software contains the following external code:
+
+    external/dbus - DBUS C++ Bindings
+    Copyright (C) 2005-2007  Paolo Durante <shackan at gmail.com>
+    License for external/dbus: LGPL-2.1 or later (at your option).
+
+    external/libconfig - A library for processing structured configuration files
+    Copyright (C) 2005-2008  Mark A Lindner
+    License for external/libconfig: LGPL-2.1 or later (at your option).
+
+    On Debian systems, the complete text of the GNU Lesser General Public
+    License, version 2.1, can be found in /usr/share/common-licenses/LPL-2.1.
+
 License:
 
     This program is free software; you can redistribute it and/or modify
@@ -34,8 +47,8 @@ License:
 
     You should have received a copy of the GNU General Public License with
     the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
-    if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-    Suite 330, Boston, MA  02111-1307  USA
+    if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+    Fifth Floor, Boston, MA  02110-1301  USA
 
     On Debian systems, the complete text of the GNU General Public
     License, version 2, can be found in /usr/share/common-licenses/GPL-2.
@@ -44,4 +57,4 @@ License:
     License, version 3, can be found in /usr/share/common-licenses/GPL-3.
 
 The Debian packaging is (C) 2008, Pieter Palmers <pieter.palmers at ffado.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/rules b/debian/rules
index c3f5eb8..6f26bec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,7 @@ debian/stamp-scons-build:
 		install
 	touch debian/stamp-scons-build
 	mv $(DEB_DESTDIR)/usr/lib/libffado.so \
-		$(DEB_DESTDIR)/usr/lib/libffado.so.0.0.0u
+		$(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