diff -Nru alsa-lib-1.0.24.1/debian/changelog alsa-lib-1.0.24.1/debian/changelog --- alsa-lib-1.0.24.1/debian/changelog 2011-04-20 19:27:28.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/changelog 2011-05-14 13:14:52.000000000 +0000 @@ -1,8 +1,28 @@ -alsa-lib (1.0.24.1-0ubuntu5~lucid.) lucid; urgency=low +alsa-lib (1.0.24.1-0ubuntu6~lucid1) lucid; urgency=low * Build for Lucid. - -- Aron Xu Thu, 21 Apr 2011 03:26:43 +0800 + -- Aron Xu Sat, 14 May 2011 21:14:43 +0800 + +alsa-lib (1.0.24.1-0ubuntu6) oneiric; urgency=low + + * debian/control: Update Vcs-Bzr field + * debian/rules, debian/libasound2.install: Change the way that smixer files + are installed, following on from the changes made in the addition of an + libasound2 udeb + + Cherry-pick changes from debian ALSA svn: + + [ Jordi Mallach ] + * Switch to architecture wildcard 'linux-any'. + + [ Elimar Riesebieter ] + * Provide libasound2-udeb based on a patch from Samuel Thibault. Thanks. + (closes: #613092) + * Added armhf to supported arch's of libasound2 and libasound2-dev + (closes: #596968) + + -- Luke Yelavich Fri, 06 May 2011 10:22:14 +1000 alsa-lib (1.0.24.1-0ubuntu5) natty; urgency=low diff -Nru alsa-lib-1.0.24.1/debian/control alsa-lib-1.0.24.1/debian/control --- alsa-lib-1.0.24.1/debian/control 2011-04-11 10:53:25.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/control 2011-05-06 00:22:42.000000000 +0000 @@ -21,10 +21,10 @@ Homepage: http://www.alsa-project.org/ XS-Debian-Vcs-Svn: svn://svn.debian.org/pkg-alsa/trunk/alsa-lib XS-Debian-Vcs-Browser: http://svn.debian.org/wsvn/pkg-alsa/trunk/alsa-lib/ -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/alsa-lib/ubuntu.natty +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/alsa-lib/ubuntu.oneiric Package: libasound2 -Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64 +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libasound2-plugins (>= 1.0.18) Conflicts: libasound2-plugins (<< 1.0.18) @@ -34,7 +34,7 @@ ALSA is the Advanced Linux Sound Architecture. Package: libasound2-dev -Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64 +Architecture: linux-any Section: libdevel Provides: libasound-dev Depends: libc6-dev | libc-dev, libasound2 (= ${binary:Version}), ${misc:Depends} @@ -93,6 +93,17 @@ . ALSA is the Advanced Linux Sound Architecture. +Package: libasound2-udeb +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: libasound2-plugins (>= 1.0.18) +Conflicts: libasound2-plugins (<< 1.0.18) +Package-Type: udeb +Description: shared library for ALSA applications + This package contains the ALSA library and its standard plugins. + . + ALSA is the Advanced Linux Sound Architecture. + Package: libasound2-doc Architecture: all Section: doc diff -Nru alsa-lib-1.0.24.1/debian/libasound2.dirs alsa-lib-1.0.24.1/debian/libasound2.dirs --- alsa-lib-1.0.24.1/debian/libasound2.dirs 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2.dirs 2011-05-06 00:22:42.000000000 +0000 @@ -0,0 +1 @@ +/usr/share diff -Nru alsa-lib-1.0.24.1/debian/libasound2.install alsa-lib-1.0.24.1/debian/libasound2.install --- alsa-lib-1.0.24.1/debian/libasound2.install 2011-04-11 10:53:25.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/libasound.so.2.0.0 -debian/tmp/usr/lib/libasound.so.2 -debian/tmp/usr/lib/alsa-lib/smixer/*.so -debian/tmp/usr/share/alsa diff -Nru alsa-lib-1.0.24.1/debian/libasound2-udeb.dirs alsa-lib-1.0.24.1/debian/libasound2-udeb.dirs --- alsa-lib-1.0.24.1/debian/libasound2-udeb.dirs 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2-udeb.dirs 2011-05-06 00:22:42.000000000 +0000 @@ -0,0 +1 @@ +/usr/share diff -Nru alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu5~lucid. alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu5~lucid. --- alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu5~lucid. 2011-04-20 19:29:01.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu5~lucid. 1970-01-01 00:00:00.000000000 +0000 @@ -1,182 +0,0 @@ -Description: Upstream changes introduced in version 1.0.24.1-0ubuntu5~lucid. - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - alsa-lib (1.0.24.1-0ubuntu5~lucid.) lucid; urgency=low - . - * Build for Lucid. - . - The person named in the Author field signed this changelog entry. -Author: Aron Xu - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- alsa-lib-1.0.24.1.orig/configure -+++ alsa-lib-1.0.24.1/configure -@@ -3579,7 +3579,7 @@ ac_clean_files="$ac_clean_files conftest - # the compiler is broken, or we cross compile. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 - $as_echo_n "checking whether we are cross compiling... " >&6; } --if false && test "$cross_compiling" != yes; then -+if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ---- alsa-lib-1.0.24.1.orig/src/ucm/main.c -+++ alsa-lib-1.0.24.1/src/ucm/main.c -@@ -75,10 +75,8 @@ static int alloc_str_list(struct list_he - int cnt; - - cnt = list_count(list) * mult; -- if (cnt == 0) { -- *result = NULL; -+ if (cnt == 0) - return cnt; -- } - res = calloc(mult, cnt * sizeof(char *)); - if (res == NULL) - return -ENOMEM; -@@ -860,7 +858,6 @@ static int add_values(struct list_head * - val = malloc(sizeof(struct myvalue)); - if (val == NULL) - return -ENOMEM; -- val->value = v->data; - list_add_tail(&val->list, list); - } - } -@@ -914,8 +911,8 @@ static int get_value_list(snd_use_case_m - goto __fail; - } - err = alloc_str_list(&mylist, 1, &res); -+ *list = (const char **)res; - if (err >= 0) { -- *list = (const char **)res; - list_for_each(pos, &mylist) { - val = list_entry(pos, struct myvalue, list); - *res = strdup(val->value); -@@ -1062,31 +1059,24 @@ static int get_value3(const char **value - * \param uc_mgr Use case manager - * \param identifier Value identifier (string) - * \param value Returned value string -- * \param item Modifier or Device name (string) -+ * \param modifier modifier name (string) - * \return Zero on success (value is filled), otherwise a negative error code - */ - static int get_value(snd_use_case_mgr_t *uc_mgr, -- const char *identifier, -- const char **value, -- const char *item) -+ const char *identifier, -+ const char **value, -+ const char *modifier) - { -- struct use_case_modifier *mod; -- struct use_case_device *dev; -+ struct use_case_modifier *mod; - int err; - -- if (item != NULL) { -- mod = find_modifier(uc_mgr, item); -+ if (modifier != NULL) { -+ mod = find_modifier(uc_mgr, modifier); - if (mod != NULL) { - err = get_value1(value, &mod->value_list, identifier); - if (err >= 0 || err != -ENOENT) - return err; - } -- dev = find_device(uc_mgr->active_verb, item); -- if (dev != NULL) { -- err = get_value1(value, &dev->value_list, identifier); -- if (err >= 0 || err != -ENOENT) -- return err; -- } - } - err = get_value1(value, &uc_mgr->active_verb->value_list, identifier); - if (err >= 0 || err != -ENOENT) ---- alsa-lib-1.0.24.1.orig/src/conf/alsa.conf -+++ alsa-lib-1.0.24.1/src/conf/alsa.conf -@@ -8,8 +8,6 @@ - { - func load - files [ -- "/usr/share/alsa/pulse.conf" -- "/usr/share/alsa/bluetooth.conf" - "/etc/asound.conf" - "~/.asoundrc" - ] -@@ -54,11 +52,11 @@ cards.@hooks [ - # - - # show all name hints also for definitions without hint {} section --defaults.namehint.showall on -+defaults.namehint.showall off - # show just basic name hints - defaults.namehint.basic on - # show extended name hints --defaults.namehint.extended on -+defaults.namehint.extended off - # - defaults.ctl.card 0 - defaults.pcm.card 0 ---- alsa-lib-1.0.24.1.orig/src/conf/cards/ICE1712.conf -+++ alsa-lib-1.0.24.1/src/conf/cards/ICE1712.conf -@@ -32,26 +32,12 @@ ICE1712.pcm.front.0 { - @args.CARD { - type string - } -- type asym -- playback.pcm { -- type route -- ttable.0.0 1 -- ttable.1.1 1 -- slave.pcm { -- type hw -- card $CARD -- } -- slave.channels 10 -- } -- capture.pcm { -- type route -- ttable.0.0 1 -- ttable.1.1 1 -- slave.pcm { -- type hw -- card $CARD -- } -- slave.channels 12 -+ type route -+ ttable.0.0 1 -+ ttable.1.1 1 -+ slave.pcm { -+ type hw -+ card $CARD - } - } - -@@ -71,7 +57,6 @@ ICE1712.pcm.surround40.0 { - type hw - card $CARD - } -- slave.channels 10 - } - - -@@ -94,7 +79,6 @@ ICE1712.pcm.surround51.0 { - type hw - card $CARD - } -- slave.channels 10 - } - - diff -Nru alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 --- alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 2011-05-14 13:15:30.000000000 +0000 @@ -0,0 +1,182 @@ +Description: Upstream changes introduced in version 1.0.24.1-0ubuntu6~lucid1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + alsa-lib (1.0.24.1-0ubuntu6~lucid1) lucid; urgency=low + . + * Build for Lucid. + . + The person named in the Author field signed this changelog entry. +Author: Aron Xu + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Forwarded: +Reviewed-By: +Last-Update: + +--- alsa-lib-1.0.24.1.orig/configure ++++ alsa-lib-1.0.24.1/configure +@@ -3579,7 +3579,7 @@ ac_clean_files="$ac_clean_files conftest + # the compiler is broken, or we cross compile. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-if false && test "$cross_compiling" != yes; then ++if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +--- alsa-lib-1.0.24.1.orig/src/ucm/main.c ++++ alsa-lib-1.0.24.1/src/ucm/main.c +@@ -75,10 +75,8 @@ static int alloc_str_list(struct list_he + int cnt; + + cnt = list_count(list) * mult; +- if (cnt == 0) { +- *result = NULL; ++ if (cnt == 0) + return cnt; +- } + res = calloc(mult, cnt * sizeof(char *)); + if (res == NULL) + return -ENOMEM; +@@ -860,7 +858,6 @@ static int add_values(struct list_head * + val = malloc(sizeof(struct myvalue)); + if (val == NULL) + return -ENOMEM; +- val->value = v->data; + list_add_tail(&val->list, list); + } + } +@@ -914,8 +911,8 @@ static int get_value_list(snd_use_case_m + goto __fail; + } + err = alloc_str_list(&mylist, 1, &res); ++ *list = (const char **)res; + if (err >= 0) { +- *list = (const char **)res; + list_for_each(pos, &mylist) { + val = list_entry(pos, struct myvalue, list); + *res = strdup(val->value); +@@ -1062,31 +1059,24 @@ static int get_value3(const char **value + * \param uc_mgr Use case manager + * \param identifier Value identifier (string) + * \param value Returned value string +- * \param item Modifier or Device name (string) ++ * \param modifier modifier name (string) + * \return Zero on success (value is filled), otherwise a negative error code + */ + static int get_value(snd_use_case_mgr_t *uc_mgr, +- const char *identifier, +- const char **value, +- const char *item) ++ const char *identifier, ++ const char **value, ++ const char *modifier) + { +- struct use_case_modifier *mod; +- struct use_case_device *dev; ++ struct use_case_modifier *mod; + int err; + +- if (item != NULL) { +- mod = find_modifier(uc_mgr, item); ++ if (modifier != NULL) { ++ mod = find_modifier(uc_mgr, modifier); + if (mod != NULL) { + err = get_value1(value, &mod->value_list, identifier); + if (err >= 0 || err != -ENOENT) + return err; + } +- dev = find_device(uc_mgr->active_verb, item); +- if (dev != NULL) { +- err = get_value1(value, &dev->value_list, identifier); +- if (err >= 0 || err != -ENOENT) +- return err; +- } + } + err = get_value1(value, &uc_mgr->active_verb->value_list, identifier); + if (err >= 0 || err != -ENOENT) +--- alsa-lib-1.0.24.1.orig/src/conf/alsa.conf ++++ alsa-lib-1.0.24.1/src/conf/alsa.conf +@@ -8,8 +8,6 @@ + { + func load + files [ +- "/usr/share/alsa/pulse.conf" +- "/usr/share/alsa/bluetooth.conf" + "/etc/asound.conf" + "~/.asoundrc" + ] +@@ -54,11 +52,11 @@ cards.@hooks [ + # + + # show all name hints also for definitions without hint {} section +-defaults.namehint.showall on ++defaults.namehint.showall off + # show just basic name hints + defaults.namehint.basic on + # show extended name hints +-defaults.namehint.extended on ++defaults.namehint.extended off + # + defaults.ctl.card 0 + defaults.pcm.card 0 +--- alsa-lib-1.0.24.1.orig/src/conf/cards/ICE1712.conf ++++ alsa-lib-1.0.24.1/src/conf/cards/ICE1712.conf +@@ -32,26 +32,12 @@ ICE1712.pcm.front.0 { + @args.CARD { + type string + } +- type asym +- playback.pcm { +- type route +- ttable.0.0 1 +- ttable.1.1 1 +- slave.pcm { +- type hw +- card $CARD +- } +- slave.channels 10 +- } +- capture.pcm { +- type route +- ttable.0.0 1 +- ttable.1.1 1 +- slave.pcm { +- type hw +- card $CARD +- } +- slave.channels 12 ++ type route ++ ttable.0.0 1 ++ ttable.1.1 1 ++ slave.pcm { ++ type hw ++ card $CARD + } + } + +@@ -71,7 +57,6 @@ ICE1712.pcm.surround40.0 { + type hw + card $CARD + } +- slave.channels 10 + } + + +@@ -94,7 +79,6 @@ ICE1712.pcm.surround51.0 { + type hw + card $CARD + } +- slave.channels 10 + } + + diff -Nru alsa-lib-1.0.24.1/debian/patches/series alsa-lib-1.0.24.1/debian/patches/series --- alsa-lib-1.0.24.1/debian/patches/series 2011-04-20 19:29:01.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/patches/series 2011-05-14 13:15:30.000000000 +0000 @@ -7,4 +7,4 @@ lp652035-use-extended-namehints.patch alsa-lib-ucm-allow-values-to-be-read-from-devices.patch lp178442-ICE1712.patch -debian-changes-1.0.24.1-0ubuntu5~lucid. +debian-changes-1.0.24.1-0ubuntu6~lucid1 diff -Nru alsa-lib-1.0.24.1/debian/rules alsa-lib-1.0.24.1/debian/rules --- alsa-lib-1.0.24.1/debian/rules 2011-04-11 10:53:25.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/rules 2011-05-06 00:22:42.000000000 +0000 @@ -151,6 +151,11 @@ dh_installdocs -plibasound2 dh_installexamples -s doc/asoundrc.txt dh_installchangelogs -plibasound2 debian/changelog.ALSA + dh_install -plibasound2 /usr/lib/libasound.so.2.0.0 /usr/lib/libasound.so.2 /usr/lib + dh_install -plibasound2-udeb /usr/lib/libasound.so.2.0.0 /usr/lib/libasound.so.2 /usr/lib + dh_install -plibasound2 /usr/lib/alsa-lib/smixer/*.so /usr/lib/alsa-lib + cp -a debian/tmp/usr/share/alsa debian/libasound2/usr/share/ + cp -a debian/tmp/usr/share/alsa debian/libasound2-udeb/usr/share/ dh_strip -s dh_link -s dh_compress -s @@ -171,7 +176,7 @@ dh_fixperms -i binary-arch: build-arch-stamp install-arch - dh_makeshlibs -plibasound2 -V'libasound2 (>> 1.0.24.1)' --exclude=usr/lib/alsa-lib/smixer + dh_makeshlibs -plibasound2 -V'libasound2 (>> 1.0.24.1)' --add-udeb=libasound2-udeb --exclude=usr/lib/alsa-lib/smixer ifneq (,$(build_biarch_stamp)) dh_makeshlibs -plib$(bi)asound2 -V'lib$(bi)asound2 (>> 1.0.24.1)' --exclude=usr/lib$(bi)/alsa-lib/smixer endif