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

Proposed by Martin Wimpress 
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 Approve
Jeremy Bícha Approve
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.
Revision history for this message
Jeremy Bícha (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
Revision history for this message
Martin Wimpress  (flexiondotorg) wrote :

Sure.

109. By Martin Wimpress 

debian/control: Drop obsolete recommends nautilus-sendto.

Revision history for this message
Jeremy Bícha (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
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2016-05-10 03:59:11 +0000
+++ debian/changelog 2016-06-22 20:33:42 +0000
@@ -1,3 +1,11 @@
1cheese (3.20.2-0ubuntu2) yakkety; urgency=medium
2
3 * debian/control:
4 - Drop obsolete recommends nautilus-sendto. nautilus-sendto
5 hasn't been used since cheese 3.10.
6
7 -- Martin Wimpress <code@flexion.org> Wed, 22 Jun 2016 21:27:29 +0100
8
1cheese (3.20.2-0ubuntu1) yakkety; urgency=medium9cheese (3.20.2-0ubuntu1) yakkety; urgency=medium
210
3 * New upstream release11 * New upstream release
412
=== modified file 'debian/control'
--- debian/control 2016-05-10 03:59:11 +0000
+++ debian/control 2016-06-22 20:33:42 +0000
@@ -53,7 +53,6 @@
53 gnome-video-effects53 gnome-video-effects
54Recommends: gvfs,54Recommends: gvfs,
55 hicolor-icon-theme,55 hicolor-icon-theme,
56 nautilus-sendto,
57 yelp56 yelp
58Suggests: gnome-video-effects-frei0r57Suggests: gnome-video-effects-frei0r
59Description: tool to take pictures and videos from your webcam58Description: tool to take pictures and videos from your webcam
6059
=== modified file 'debian/control.in'
--- debian/control.in 2016-05-10 03:59:11 +0000
+++ debian/control.in 2016-06-22 20:33:42 +0000
@@ -49,7 +49,6 @@
49 gnome-video-effects49 gnome-video-effects
50Recommends: gvfs,50Recommends: gvfs,
51 hicolor-icon-theme,51 hicolor-icon-theme,
52 nautilus-sendto,
53 yelp52 yelp
54Suggests: gnome-video-effects-frei0r53Suggests: gnome-video-effects-frei0r
55Description: tool to take pictures and videos from your webcam54Description: tool to take pictures and videos from your webcam

Subscribers

People subscribed via source and target branches