[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/353670 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Review: Approve Thanks, that looks good to me! -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/353670 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/353670 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Gunnar Hjalmarsson has proposed merging ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/353670 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-control-center:use-dh_translations into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index e1fdc45..fe483da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ gnome-control-center (1:3.29.90-1~ubuntu2) UNRELEASED; urgency=medium * Fix a typo in debian/patches/52_region_language.patch which broke displaying the selected language in the language panell of gnome-control-center (LP: #1786880) + * debian/rules: +Make use of updated dh_translations; drop workarounds. -- Iain Lane Tue, 14 Aug 2018 16:19:09 +0100 diff --git a/debian/rules b/debian/rules index 89d3561..b650b4a 100755 --- a/debian/rules +++ b/debian/rules @@ -17,17 +17,5 @@ override_dh_auto_configure: override_dh_missing: dh_missing --fail-missing -override_dh_install: - for f in debian/tmp/usr/share/applications/*.desktop; do \ - sed -i -r '/[A-Z].+\[.+\]=/d' "$$f"; \ - echo X-Ubuntu-Gettext-Domain=gnome-control-center-2.0 >> "$$f"; \ - done - dh_install - override_dh_translations: - ninja -C obj-$(DEB_HOST_GNU_TYPE) gnome-control-center-2.0-pot - dh_translations - -override_dh_clean: - rm -f po/gnome-control-center-2.0.pot - dh_clean + dh_translations --domain=gnome-control-center-2.0 -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
