lp:~vorlon/alsa-lib/multiarch-merge
- Get this branch:
- bzr branch lp:~vorlon/alsa-lib/multiarch-merge
Branch merges
- Luke Yelavich (community): Disapprove
-
Diff: 448 lines (+168/-42)17 files modifieddebian/changelog (+34/-0)
debian/compat (+1/-1)
debian/control (+13/-12)
debian/copyright (+2/-2)
debian/lib32asound2.postinst (+7/-0)
debian/lib32asound2.postrm (+7/-0)
debian/lib32asound2.preinst (+7/-0)
debian/lib64asound2.postinst (+7/-0)
debian/lib64asound2.postrm (+7/-0)
debian/lib64asound2.preinst (+7/-0)
debian/libasound2-dev.install (+5/-6)
debian/libasound2.postinst (+2/-1)
debian/libasound2.postrm (+2/-1)
debian/libasound2.preinst (+7/-0)
debian/patches/multiarch-safe-dlopen-search-path.patch (+41/-0)
debian/patches/series (+1/-0)
debian/rules (+18/-19)
Branch information
Recent revisions
- 93. By Steve Langasek
-
Spell out the plugin dir path: the build system fails to expand
substitutions, and '${libdir}' is obviously not present on the
filesystem. - 92. By Steve Langasek
-
With the plugin path corrected, drop the existing ld.so.conf snippets,
removing them on upgrade. - 91. By Steve Langasek
-
debian/
patches/ multiarch- safe-dlopen- search- path.patch: compile in
the ALSA search path instead of relying on ld.so.conf. - 90. By Steve Langasek
-
Drop the hard-coded versioned dependency on libc6-i386. If we don't need
this as a pre-depends for cycle breaking, we don't need to declare it at
all since shlibdeps will do the right thing. - 89. By Steve Langasek
-
* Merge changes from Debian svn:
- Bump to debhelper compat v8.
- Remove debian/tmp prefixes from .install file.
- Add multiarch support:
+ Build-Depend on debhelper 8.1.3.
+ Add Pre-Depends: ${misc:Pre-Depends} to libasound2.
+ Declare DEB_HOST_MULTIARCH and use it to define $libdir.
+ Add an explicit --with-plugindir argument to base plugindir on the
multiarch dir.
+ Update libasound2-dev.install.
+ Mark libasound2 Multi-Arch: same.
- Break current versions of packages providing ALSA plugins.
- Remove libasound2's .la file, as any reference will be now broken.
- Remove unneeded Suggests and Conflicts from -udeb.
- Set Section to debian-installer.
- Replace versioned conflicts with Breaks, and remove some obsolete ones.
- Bump Standards-Version to 3.9.2 (no further changes).
- Update upstream URL in copyright file.
- Use versioned pointer to LGPL 2.1 licence. - 86. By Luke Yelavich
-
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
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:alsa-lib