Merge lp:~elementary-os/pantheon-photos/deb-packaging-cmake into lp:~elementary-os/pantheon-photos/deb-packaging

Proposed by Cody Garver
Status: Merged
Merged at revision: 24
Proposed branch: lp:~elementary-os/pantheon-photos/deb-packaging-cmake
Merge into: lp:~elementary-os/pantheon-photos/deb-packaging
Diff against target: 35 lines (+3/-5)
2 files modified
debian/control (+3/-2)
debian/rules (+0/-3)
To merge this branch: bzr merge lp:~elementary-os/pantheon-photos/deb-packaging-cmake
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+282592@code.launchpad.net
To post a comment you must log in.
27. By Cody Garver

Proper minimum dependency versions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-12-07 15:22:59 +0000
3+++ debian/control 2016-01-14 14:28:49 +0000
4@@ -3,7 +3,8 @@
5 Priority: optional
6 Maintainer: elementary OS Team <builds@elementaryos.org>
7 Build-Depends: debhelper (>= 9),
8- m4,
9+ cmake (>= 2.8),
10+ intltool,
11 valac (>= 0.18.0),
12 libgee-0.8-dev (>= 0.8.0),
13 libglib2.0-dev (>= 2.30.0),
14@@ -14,7 +15,7 @@
15 libgphoto2-dev (>= 2.5.3.1),
16 libsoup2.4-dev (>= 2.26.0),
17 libxml2 (>= 2.6.32),
18- libwebkitgtk-3.0-dev (>= 1.4.0),
19+ libwebkit2gtk-4.0-dev (>= 2.0.0),
20 libgudev-1.0-dev (>= 145),
21 libraw-dev (>= 0.14),
22 libjson-glib-dev,
23
24=== modified file 'debian/rules'
25--- debian/rules 2015-12-14 22:20:12 +0000
26+++ debian/rules 2016-01-14 14:28:49 +0000
27@@ -14,9 +14,6 @@
28 %:
29 dh $@ --dbg-package=pantheon-photos-dbg --with-scour --parallel
30
31-override_dh_auto_configure:
32- ./configure --prefix=/usr --libexec=/usr/lib/pantheon-photos --disable-schemas-compile --disable-icon-update --unity-support
33-
34 override_dh_install:
35 dh_install --fail-missing
36

Subscribers

People subscribed via source and target branches