-
Committer:
Lionel Le Folgoc
-
Date:
2010-01-15 21:16:00 UTC
-
mfrom:
(2.2.3 sid)
-
Revision ID:
mrpouit@ubuntu.com-20100115211600-k4pirwswody7dcca
* Merge from debian testing, remaining Ubuntu changes:
- debian/control: use our Vcs-* fields.
- debian/patches:
+ 01_add-xubuntu-in-config-dirs.patch: append "/etc/xdg/xubuntu" to the
list of config directories
+ 02_add-mythbuntu-in-config-dirs.patch: append "/etc/xdg/mythbuntu" to
the list of config directories
+ debian/patches/03_desktop-x-ubuntu-gettext.patch: display translations for
"X-Ubuntu-Gettext-Domain" desktop files
+ series:
. don't apply 01_add-desktop-base-in-config-dirs.patch
. refreshed.
* debian/control:
- update standards version to 3.8.3.
- add depends on ${misc:Depends}.
- add two binary packages (-bin and -common) to ease
multiple-versions installations.
* debian/xfce4-kiosk-query.8: fix typo.
* debian/rules:
- stop installing debian/xfce4-kiosk-query.8, it'll be done automagically.
- stop doing shlibs, it'll done automagically.
* debian/libxfce4util-bin.manpages: add xfce4-kiosk-query.8 to installed
manpages.
* debian/libxfce4util4.shlibs: give shlibs informations.