Viewing all changes in revision 46.
- Committer: Package Import Robot
- Date: 2014-02-03 22:34:56 UTC
- mfrom: (39.1.11 sid)
- Revision ID: package-import@ubuntu.com-20140203223456-amzf73jp5qt59rrr
* Merge with Debian (LP: #1276143); remaining changes:
- debian/rules:
+ Build with dh_translations. Add dh-translations build dependency.
- Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input
Methods"
- debian/patches/ibus-no-notification.patch: Don't show the notification
if not actually upgrading from a previous version. (LP: #1255542).
* debian/patches/03_dont_run_dconf_update.patch: added
- Don't run "dconf update" if $(DESTDIR) is set
+ https://github.com/ibus/ibus/commit/e6ec45d64a32d16245770f8b80e795a63e6ad553
- debian/rules:
+ Build with dh_translations. Add dh-translations build dependency.
- Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input
Methods"
- debian/patches/ibus-no-notification.patch: Don't show the notification
if not actually upgrading from a previous version. (LP: #1255542).
* debian/patches/03_dont_run_dconf_update.patch: added
- Don't run "dconf update" if $(DESTDIR) is set
+ https://github.com/ibus/ibus/commit/e6ec45d64a32d16245770f8b80e795a63e6ad553
- files added:
- .pc/03_dont_run_dconf_update.patch
- .pc/03_dont_run_dconf_update.patch/data
- .pc/03_dont_run_dconf_update.patch/data/dconf
- .pc/999-update-po.patch
- .pc/999-update-po.patch/po
- .pc/ibus-541492-xkb.patch/bus
- .pc/ibus-xx-ctrl-space.patch
- .pc/ibus-xx-ctrl-space.patch/data
- .pc/ibus-xx-ctrl-space.patch/ui
- .pc/ibus-xx-ctrl-space.patch/ui/gtk3
- .pc/ibus-xx-f19-password-gtk3.patch
- .pc/ibus-xx-f19-password-gtk3.patch/client
- .pc/ibus-xx-f19-password-gtk3.patch/client/gtk3
- .pc/ibus-xx-f19-password.patch
- .pc/ibus-xx-f19-password.patch/client
- .pc/ibus-xx-f19-password.patch/client/gtk2
- files removed:
- .pc/ibus-HEAD.patch
- .pc/ibus-HEAD.patch/bus
- .pc/ibus-HEAD.patch/engine
- .pc/ibus-HEAD.patch/ui
- .pc/ibus-HEAD.patch/ui/gtk3
- files modified:
- .pc/02_title_update.patch/setup/main.py
expand all
collapse all
added
removed
