- 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.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
debian
|
2 | 20 years ago | Bazaar Package Importer | * New upstream release * Update upstream's libtool |
|
||
|
include
|
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha |
|
||
|
lib
|
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha |
|
||
|
panel-plugin
|
1 | 20 years ago | Bazaar Package Importer | Import upstream version 4.0.5 |
|
||
|
po
|
1 | 20 years ago | Bazaar Package Importer | Import upstream version 4.0.5 |
|
||
|
settings
|
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha |
|
||
|
src
|
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha |
|
||
aclocal.m4 |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 309 KB |
|
|
|
AUTHORS |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 93 bytes |
|
|
|
ChangeLog |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 62.4 KB |
|
|
config.guess |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 43.8 KB |
|
|
|
config.h.in |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 3.6 KB |
|
|
|
config.sub |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 32.6 KB |
|
|
|
configure |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 830 KB |
|
|
|
configure.in |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 4.3 KB |
|
|
|
COPYING |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 17.5 KB |
|
|
|
depcomp |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 17.1 KB |
|
|
|
INSTALL |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 9.1 KB |
|
|
|
install-sh |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 12.8 KB |
|
|
|
intltool-extract.in |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 22.5 KB |
|
|
|
intltool-merge.in |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 35.5 KB |
|
|
|
intltool-update.in |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 27.5 KB |
|
|
|
ltmain.sh |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 196 KB |
|
|
|
Makefile.am |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 842 bytes |
|
|
|
Makefile.in |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 23 KB |
|
|
|
missing |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 10.8 KB |
|
|
|
mkinstalldirs |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 3.4 KB |
|
|
|
NEWS |
16 | 16 years ago | Bazaar Package Importer | * Merge with debian unstable: - debian/{control, | 693 bytes |
|
|
|
NOTES |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 300 bytes |
|
|
|
README |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 938 bytes |
|
|
|
TODO |
15 | 17 years ago | Bazaar Package Importer | * Fix mismerge by reverting to Debian packaging wi | 52 bytes |
|
|
|
xfce4-mixer.spec |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 1 KB |
|
|
|
xfce4-mixer.spec.in |
19 | 16 years ago | Bazaar Package Importer | * Merge with Debian unstable, remaining Ubuntu cha | 1.1 KB |
|
|