Merge lp://qastaging/~ubuntu-audio-dev/alsa-driver/ubuntu.natty into lp://qastaging/alsa-driver
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-audio-dev/alsa-driver/ubuntu.natty |
| Merge into: | lp://qastaging/alsa-driver |
| Diff against target: |
49120 lines (+48636/-0) 96 files modified
.bzr-builddeb/default.conf (+2/-0) debian/ALSA-card-list (+295/-0) debian/ALSA-module-list (+171/-0) debian/NOTES (+58/-0) debian/OSS-module-list (+72/-0) debian/PATCHES.Debian (+20/-0) debian/alsa-base.NEWS (+26/-0) debian/alsa-base.README.Debian (+135/-0) debian/alsa-base.apm (+11/-0) debian/alsa-base.bug.control (+1/-0) debian/alsa-base.bug.presubj (+9/-0) debian/alsa-base.bug.script (+27/-0) debian/alsa-base.defaultfile (+14/-0) debian/alsa-base.dirs (+9/-0) debian/alsa-base.docs (+4/-0) debian/alsa-base.init (+219/-0) debian/alsa-base.lintian-overrides (+2/-0) debian/alsa-base.modprobe (+25/-0) debian/alsa-base.postinst (+91/-0) debian/alsa-base.postrm (+26/-0) debian/alsa-base.preinst (+54/-0) debian/alsa-modules.bug.control (+1/-0) debian/alsa-modules.postinst (+16/-0) debian/alsa-modules.postrm (+4/-0) debian/alsa-source.README.Debian (+80/-0) debian/alsa-source.bug.control (+1/-0) debian/alsa-source.bug.presubj (+9/-0) debian/alsa-source.bug.script (+27/-0) debian/alsa-source.conf (+35/-0) debian/alsa-source.config (+40/-0) debian/alsa-source.control (+34/-0) debian/alsa-source.dirs (+4/-0) debian/alsa-source.lintian-overrides (+2/-0) debian/alsa-source.postinst (+52/-0) debian/alsa-source.postrm (+10/-0) debian/alsa-source.rules (+204/-0) debian/alsa-source.templates (+50/-0) debian/apport-hook.py (+12/-0) debian/changelog (+2011/-0) debian/changelog-old.Debian (+3076/-0) debian/changelog.ALSA (+13557/-0) debian/compat (+1/-0) debian/control (+66/-0) debian/copyright (+46/-0) debian/linux-sound-base.README.Debian (+7/-0) debian/linux-sound-base.config (+22/-0) debian/linux-sound-base.dirs (+4/-0) debian/linux-sound-base.postinst (+50/-0) debian/linux-sound-base.postrm (+25/-0) debian/linux-sound-base.templates (+27/-0) debian/patches/add_onda_a69g_ac97_support.patch (+11/-0) debian/patches/add_suspend_quirk_hp_nc6220_nw8240.patch (+18/-0) debian/patches/autoconf.patch (+20836/-0) debian/patches/core_oss_framepointer.patch (+17/-0) debian/patches/debian_dfsg_configure.patch (+232/-0) debian/patches/debian_makefile_depmod.patch (+53/-0) debian/patches/disable_gcc_version_check1.patch (+40/-0) debian/patches/distinguish_kernel_makefile_and_source_dirs.patch (+338/-0) debian/patches/fix_version_check.patch (+95/-0) debian/patches/hwptr_pcm_io_fixes.patch (+937/-0) debian/patches/refix_lp_68659_by_disabling_dxs_for_0x1458a002.patch (+13/-0) debian/patches/remove_maestro3.patch (+24/-0) debian/patches/series (+10/-0) debian/patches/use_kbuild_not_ac_try_compile.patch (+1399/-0) debian/po/POTFILES.in (+2/-0) debian/po/ar.po (+126/-0) debian/po/be.po (+126/-0) debian/po/bg.po (+128/-0) debian/po/ca.po (+164/-0) debian/po/cs.po (+125/-0) debian/po/da.po (+130/-0) debian/po/de.po (+167/-0) debian/po/es.po (+183/-0) debian/po/eu.po (+129/-0) debian/po/fi.po (+126/-0) debian/po/fr.po (+134/-0) debian/po/gl.po (+153/-0) debian/po/it.po (+129/-0) debian/po/ja.po (+125/-0) debian/po/ko.po (+130/-0) debian/po/ml.po (+129/-0) debian/po/nl.po (+165/-0) debian/po/pt.po (+132/-0) debian/po/pt_BR.po (+166/-0) debian/po/ru.po (+130/-0) debian/po/sk.po (+121/-0) debian/po/sv.po (+135/-0) debian/po/ta.po (+124/-0) debian/po/templates.pot (+115/-0) debian/po/tr.po (+154/-0) debian/po/vi.po (+177/-0) debian/program-wrapper (+6/-0) debian/rules (+232/-0) debian/source/format (+1/-0) debian/source/options (+2/-0) debian/watch (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-audio-dev/alsa-driver/ubuntu.natty |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel T Chen (community) | Disapprove | ||
| VCS imports | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 61. By Luke Yelavich
-
Make branch merge-mode
- 60. By Luke Yelavich
-
releasing version 1.0.24+
dfsg-0ubuntu1 - 59. By Luke Yelavich
-
* New upstream release
* Refreshed patches:
- distinguish_kernel_ makefile_ and_source_ dirs.patch
- debian_dfsg_configure. patch
* debian/control: Update Vcs-bzr field to point to new branch location
* No-change upload to drop sizable upstream changelog. - 58. By Luke Yelavich
-
debian/control: Update Vcs-Bzr field
- 57. By Luke Yelavich
-
Fix email
- 56. By Luke Yelavich
-
releasing version 1.0.23+
dfsg-2ubuntu1 - 55. By Luke Yelavich
-
* Merge from debian unstable, remaining changes:
- Script paths (/usr/sbin -> /sbin, /usr/bin -> /bin);
- debian/rules:
+ Don't install snddevices and program-wrapper
+ install alsa-base apport hook
+ Package separate USB card list file
- Vcs and maintainer fields mangling
- Rename blacklist files in /etc/modprobe.d to be consistant with the rest
of the distro
- debian/alsa-base. init:
+ create /var/run/alsa if it doesn't exist
+ Run alsactl store before force unloading modules
+ Run alsactl restore after reloading unloaded modules
- debian/linux-sound- base.postrm: Remove /etc/modprobe. d/blacklist* files
on package removal
- Add missing $CMDLINE_OPTS to all install rules.
- Replace -Q with --quiet.
- Add --use-blacklist to all rules so the blacklist still takes effect.
- debian/alsa-base. postinst: Do not run snddevices
- retain patches:
+ add_suspend_quirk_hp_ nc6220_ nw8240. patch,
+ refix_lp_68659_by_ disabling_ dxs_for_ 0x1458a002. patch.
- Drop kernel-package recommends to a suggests in order to be able to demote
kernel-package to universe
* Updated Danish translation (thanks, Joe Hansen; closes: #599839).
* Updated Catalan translation. - 54. By Luke Yelavich
-
releasing version 1.0.23+
dfsg-1ubuntu4 - 53. By Daniel T Chen
-
* debian/
alsa-base. preinst:
debian/alsa-base. postinst:
debian/linux-sound- base.postinst:
- Handle upgrades from lucid, too. Thanks, Steve Langasek!
(LP: #340873) - 52. By Daniel T Chen
-
Releasing 1.0.23+
dfsg-1ubuntu3 to Maverick
There isn't need to merge this into main trunk.