Merge lp:~ubuntu-mate-dev/cheese/caja-compatibility into lp:~ubuntu-desktop/cheese/ubuntu

Proposed by Martin Wimpress on 2016-06-22
Status: Merged
Merged at revision: 108
Proposed branch: lp:~ubuntu-mate-dev/cheese/caja-compatibility
Merge into: lp:~ubuntu-desktop/cheese/ubuntu
Diff against target: 39 lines (+8/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+0/-1)
debian/control.in (+0/-1)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/cheese/caja-compatibility
Reviewer Review Type Date Requested Status
Martin Pitt 2016-06-22 Approve on 2016-07-01
Jeremy Bicha 2016-06-22 Approve on 2016-06-23
Review via email: mp+298141@code.launchpad.net

Description of the Change

This merge proposal adds drop the obsolete nautilus-sendto recommends, which was dropped upstream in cheese 3.10.

  * https://git.gnome.org/browse/cheese/commit/?id=ca982ad034dc183d072ee1bd19ab235a5a729d07&h=gnome-3-10

To post a comment you must log in.
Jeremy Bicha (jbicha) wrote :

Actually, nautilus-sendto isn't even used any more as of cheese 3.10 so you can drop the dependency completely:

https://git.gnome.org/browse/cheese/commit/?id=ca982ad034dc183d072ee1bd19ab235a5a729d07&h=gnome-3-10

Also, please update both debian/control.in and debian/control for Debian GNOME packages.

Finally, could you update the debian/changelog too for this?

(I went ahead and made this change in the svn repo the Debian GNOME team uses so this will be fixed in Debian too eventually.)

review: Needs Fixing
Martin Wimpress (flexiondotorg) wrote :

Sure.

109. By Martin Wimpress on 2016-06-22

debian/control: Drop obsolete recommends nautilus-sendto.

Jeremy Bicha (jbicha) wrote :

Looks good. I'm not currently a member of the ~ubuntu-desktop team so you'll have to ask one of them to merge and upload.

review: Approve
Martin Pitt (pitti) wrote :

Thanks! Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-05-10 03:59:11 +0000
3+++ debian/changelog 2016-06-22 20:33:42 +0000
4@@ -1,3 +1,11 @@
5+cheese (3.20.2-0ubuntu2) yakkety; urgency=medium
6+
7+ * debian/control:
8+ - Drop obsolete recommends nautilus-sendto. nautilus-sendto
9+ hasn't been used since cheese 3.10.
10+
11+ -- Martin Wimpress <code@flexion.org> Wed, 22 Jun 2016 21:27:29 +0100
12+
13 cheese (3.20.2-0ubuntu1) yakkety; urgency=medium
14
15 * New upstream release
16
17=== modified file 'debian/control'
18--- debian/control 2016-05-10 03:59:11 +0000
19+++ debian/control 2016-06-22 20:33:42 +0000
20@@ -53,7 +53,6 @@
21 gnome-video-effects
22 Recommends: gvfs,
23 hicolor-icon-theme,
24- nautilus-sendto,
25 yelp
26 Suggests: gnome-video-effects-frei0r
27 Description: tool to take pictures and videos from your webcam
28
29=== modified file 'debian/control.in'
30--- debian/control.in 2016-05-10 03:59:11 +0000
31+++ debian/control.in 2016-06-22 20:33:42 +0000
32@@ -49,7 +49,6 @@
33 gnome-video-effects
34 Recommends: gvfs,
35 hicolor-icon-theme,
36- nautilus-sendto,
37 yelp
38 Suggests: gnome-video-effects-frei0r
39 Description: tool to take pictures and videos from your webcam

Subscribers

People subscribed via source and target branches