Viewing all changes in revision 19.
- Committer: Bazaar Package Importer
- Date: 2008-05-31 12:01:30 UTC
- mfrom: (3.1.2 lenny)
- Revision ID: james.westby@ubuntu.com-20080531120130-ihob73zuv7mrnmdu
* Merge with Debian unstable, remaining Ubuntu changes:
- debian/{control,rules}: Don't build xfce4-mixer-oss, since
everything is ALSA-enabled in this source package (see
1:4.3.90.1svn+r21167-0ubuntu1),
- Amend debian/NEWS.Debian to note the above difference,
- Use Ubuntu's debian/patches/
0{1_volume_hotkeys,2_xfce4-mixer-panel-plugin_border}.patch,
- Readd epoch and DebianMaintainerField changes
- debian/xfce4-mixer-oss.shlibs: dropped, we don't build this variant.
- debian/rules: add "NoDisplay=true" to hide mcs desktop files.
- debian/{control,rules}: Don't build xfce4-mixer-oss, since
everything is ALSA-enabled in this source package (see
1:4.3.90.1svn+r21167-0ubuntu1),
- Amend debian/NEWS.Debian to note the above difference,
- Use Ubuntu's debian/patches/
0{1_volume_hotkeys,2_xfce4-mixer-panel-plugin_border}.patch,
- Readd epoch and DebianMaintainerField changes
- debian/xfce4-mixer-oss.shlibs: dropped, we don't build this variant.
- debian/rules: add "NoDisplay=true" to hide mcs desktop files.
- files removed:
- debian/postinst
- files modified:
- config.guess
expand all
collapse all
added
removed
