Contractor

Merge lp:~christriant/contractor/contractor into lp:contractor/0.2

  1. contractor
  2. Merge into trunk
Proposed by Chris Triantafillis
Status: Merged
Merged at revision: 34
Proposed branch: lp:~christriant/contractor/contractor
Merge into: lp:contractor/0.2
Diff against target: 19 lines (+2/-2)
2 files modified
data/CMakeLists.txt (+1/-1)
data/archive-compress.contract (+1/-1)
To merge this branch: bzr merge lp:~christriant/contractor/contractor
Reviewer Review Type Date Requested Status
Sergey "Shnatsel" Davidoff (community) Approve
Review via email: mp+130823@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

The compress contract doesn't show up on my machine, but approved anyway because having a file that's not installed is silly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2012-06-30 11:18:09 +0000
3+++ data/CMakeLists.txt 2012-10-22 14:29:20 +0000
4@@ -1,3 +1,3 @@
5 configure_file(org.elementary.contractor.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.elementary.contractor.service)
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.elementary.contractor.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services)
7-install(FILES archive.contract wallpaper.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
8+install(FILES archive.contract wallpaper.contract archive-compress.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
9
10=== modified file 'data/archive-compress.contract'
11--- data/archive-compress.contract 2012-09-02 20:31:10 +0000
12+++ data/archive-compress.contract 2012-10-22 14:29:20 +0000
13@@ -5,4 +5,4 @@
14 MimeType=!Archives
15 StrictCondition=false
16 Exec=file-roller --add %U
17-X-GNOME-Gettext-Domain=contractor
18\ No newline at end of file
19+X-GNOME-Gettext-Domain=contractor

Subscribers

People subscribed via source and target branches

to all changes: