CMake Extras

Merge lp:~saviq/cmake-extras/sync-archive into lp:cmake-extras

  1. sync-archive
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Pete Woods
Approved revision: 12
Merged at revision: 12
Proposed branch: lp:~saviq/cmake-extras/sync-archive
Merge into: lp:cmake-extras
Diff against target: 41 lines (+12/-0)
3 files modified
UseXGettext.cmake (+1/-0)
debian/changelog (+10/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~saviq/cmake-extras/sync-archive
Reviewer Review Type Date Requested Status
Pete Woods Approve
Review via email: mp+243505@code.launchpad.net

Commit message

Sync changes from archive:

* debian/control:
  - add "Multi-Arch: foreign" to allow installing in a click
    crossbuild chroot

* UseXGettext.cmake:
  - add missing "ALL" in xgettext_create_pot_file

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UseXGettext.cmake'
2--- UseXGettext.cmake 2014-09-09 09:46:40 +0000
3+++ UseXGettext.cmake 2014-12-03 09:38:14 +0000
4@@ -85,6 +85,7 @@
5
6 xgettext_create_pot_file(
7 ${_POT_FILE}
8+ ALL
9 CPP
10 QT
11 INPUT ${_SOURCES}
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2014-09-10 08:10:44 +0000
15+++ debian/changelog 2014-12-03 09:38:14 +0000
16@@ -1,3 +1,13 @@
17+cmake-extras (0.2+14.10.20140910-0ubuntu2) vivid; urgency=low
18+
19+ * debian/control:
20+ - add "Multi-Arch: foreign" to allow installing in a click
21+ crossbuild chroot
22+ * UseXGettext.cmake:
23+ - add missing "ALL" in xgettext_create_pot_file
24+
25+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Oct 2014 11:32:25 +0100
26+
27 cmake-extras (0.2+14.10.20140910-0ubuntu1) utopic; urgency=low
28
29 [ Pete Woods ]
30
31=== modified file 'debian/control'
32--- debian/control 2014-05-27 12:01:02 +0000
33+++ debian/control 2014-12-03 09:38:14 +0000
34@@ -12,6 +12,7 @@
35
36 Package: cmake-extras
37 Architecture: all
38+Multi-Arch: foreign
39 Depends: ${misc:Depends}
40 Description: Extra CMake utility modules.
41 Includes coverage modules.

Subscribers

People subscribed via source and target branches

to all changes: