[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.20-1-5-gf188f05

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  f188f05eebcc5c28a5c3d98a35872c2e6c5d625c (commit)
       via  a764b348f70b03eb5d559ce417fc228c54996a73 (commit)
      from  6ca03e55ebc8b174a2889f97b2571a86ddc5b778 (commit)


- Shortlog ------------------------------------------------------------
f188f05 debian/rules: Fix build on arm (slightly changes target name)
a764b34 debian/copyright: Updated

Summary of changes:
 debian/changelog |    4 +++-
 debian/copyright |   16 ++++++++++++++++
 debian/rules     |    2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f188f05eebcc5c28a5c3d98a35872c2e6c5d625c
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Mon Nov 23 23:16:40 2009 +0000

    debian/rules: Fix build on arm (slightly changes target name)

diff --git a/debian/changelog b/debian/changelog
index 9c23583..c24b18e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ pulseaudio (0.9.21-1) UNRELEASED; urgency=low
   * d/p/0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch
     + Removed, merged upstream
   * debian/copyright: Updated
+  * debian/rules: Fix build on arm (slightly changes target name)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 23 Nov 2009 23:12:22 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 23 Nov 2009 23:16:05 +0000
 
 pulseaudio (0.9.20-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index eb29bc7..b5d0e3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ common-install-arch::
 
 common-configure-arch::
 ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
-	make -C src libpulsecore_0.9.21-svolume_arm.lo CFLAGS+=-march=armv6
+	make -C src libpulsecore_0.9.21_la-svolume_arm.lo CFLAGS+=-march=armv6
 endif
 
 pulseaudio-install-arch::

commit a764b348f70b03eb5d559ce417fc228c54996a73
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Mon Nov 23 23:12:32 2009 +0000

    debian/copyright: Updated

diff --git a/debian/changelog b/debian/changelog
index 6a5d432..9c23583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ pulseaudio (0.9.21-1) UNRELEASED; urgency=low
   * New upstream release
   * d/p/0002-Fix-makefiles-to-include-all-alsa-path-files-on-inst.patch
     + Removed, merged upstream
+  * debian/copyright: Updated
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 23 Nov 2009 22:39:24 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 23 Nov 2009 23:12:22 +0000
 
 pulseaudio (0.9.20-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 6625ad6..ed05c03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -121,6 +121,14 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the LGPL-2.1 can be found in
  /usr/share/common-licenses/LGPL-2.1.
 
+Files: src/modules/module-device-manager.*
+Copyright:
+ Copyright 2006-2008 Lennart Poettering
+ Copyright (C) 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
 Files: src/pulsecore/dbus-*.*, src/modules/module-hal-detect.c
 Copyright:
  Copyright 2006 Lennart Poettering
@@ -219,6 +227,14 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the LGPL-2.1 can be found in
  /usr/share/common-licenses/LGPL-2.1.
 
+Files: src/pulse/ext-device-manager.*
+Copyright:
+ Copyright (C) 2008 Lennart Poettering
+ Copyright (C) 2009 Colin Guthrie
+License: LGPL-2.1+
+ On Debian systems, the complete text of the LGPL-2 can be found in
+ /usr/share/common-licenses/LGPL-2.1.
+
 File: src/pulsecore/ffmpeg/avcodec.h
 Copyright:
  Copyright (c) 2001 Fabrice Bellard

-- 
pulseaudio packaging