Unity Settings Panels

Merge lp:~seb128/gnome-control-center-unity/gettext-and-intltool into lp:gnome-control-center-unity

  1. gettext-and-intltool
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 33
Merged at revision: 33
Proposed branch: lp:~seb128/gnome-control-center-unity/gettext-and-intltool
Merge into: lp:gnome-control-center-unity
Diff against target: 14 lines (+1/-3)
1 file modified
configure.ac (+1/-3)
To merge this branch: bzr merge lp:~seb128/gnome-control-center-unity/gettext-and-intltool
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Łukasz Zemczak Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+196545@code.launchpad.net

Commit message

don't use gettext and intltool together, they are conflicting

Description of the change

don't use gettext and intltool together, they are conflicting

that's similar to e.g https://bugzilla.gnome.org/show_bug.cgi?id=679607

(without that building from the vcs was failing for me on trusty)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gnome-control-center-unity-trusty-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gnome-control-center-unity-ci/7/rebuild

review: Approve (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks ok, CI says it's ok as well so +1!

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Sounds good to me as per linked bug :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-11-16 18:50:01 +0000
3+++ configure.ac 2013-11-25 15:04:24 +0000
4@@ -25,9 +25,7 @@
5 GETTEXT_PACKAGE="$PACKAGE"
6 AC_SUBST(GETTEXT_PACKAGE)
7 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext domain])
8-AM_GNU_GETTEXT([external])
9-AM_GNU_GETTEXT_VERSION([0.17])
10-IT_PROG_INTLTOOL([0.37],[no-xml])
11+IT_PROG_INTLTOOL([0.40.4],[no-xml])
12
13 # Check dependencies.
14 PKG_CHECK_MODULES(APPEARANCE_PANEL,

Subscribers

People subscribed via source and target branches

to all changes: