Update cheese to 2.22.0 (including hildon patch)

Bug #185669 reported by Steve Magoun
18
Affects Status Importance Assigned to Milestone
Cheese
Fix Released
Wishlist
cheese (Ubuntu)
Fix Released
Undecided
Gary Lasker

Bug Description

Binary package hint: cheese

Cheese 2.21.5 includes a new countdown widget that's not included in the cheese.hildon.glade file we add to cheese as part of 40_hildon.patch. The glade file should be updated to include the new widget.

Related branches

Revision history for this message
Steve Magoun (smagoun) wrote :
Changed in cheese:
assignee: nobody → smagoun
status: New → In Progress
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work on that, I've uploaded the new revision

Revision history for this message
Sebastien Bacher (seb128) wrote :

the upload target is gutsy and should be hardy, could you change that?

Revision history for this message
Steve Magoun (smagoun) wrote :

Changed upload target to hardy

Revision history for this message
Loïc Minier (lool) wrote :

@Steve: there's a new upstream release of cheese, 2.21.90; would you like to prepare it here and get both changes sponsored via this bug?

Thanks!

Revision history for this message
Loïc Minier (lool) wrote :

Steve is going to be our hero again and will prepare 2.21.90 as well!

Revision history for this message
Jaap Haitsma (jaap) wrote :

Steve, why don't you submit a patch to cheese SVN? I don't see a reason why daniel and I would not want it in the tree. Please file the patch in GNOME SVN

Revision history for this message
Loïc Minier (lool) wrote :

@Jaap: We would all like to patch upstream SVN instead of doing it upstream; I think Matthew Garrett is the original author of the work, and when we rebased his 2.20 patch against 2.21.*, he mentionned that he was trying to apply it to upstream SVN as well and was wanting to send it upstream.

Revision history for this message
Jaap Haitsma (jaap) wrote :

OK I'm looking forward to receiving the patch in that case

Revision history for this message
Loïc Minier (lool) wrote :

Hey Jaap,

Quick update to the Launchpad bug: I understand the patch has been merged and will be part of 2.22.0.

Revision history for this message
Jaap Haitsma (jaap) wrote :

The patch had to be reverted because of string additions.

It will be in 2.24

Changed in cheese:
status: Unknown → Fix Released
Revision history for this message
Daniel Holbach (dholbach) wrote :

Tollef, Loïc: what's the state of things?

Revision history for this message
Loïc Minier (lool) wrote :

Daniel: Gerry Carr told me monday he would work on the 2.22.0 upload starting today and integrating the hildon patch.

Revision history for this message
Gary Lasker (gary-lasker) wrote :

Correction: That's Gary Lasker, not Gerry Carr. ;)

Revision history for this message
Loïc Minier (lool) wrote :

Gary: I'm terribly sorry, my brain keeps mixing you G*ys :-/

Revision history for this message
Loïc Minier (lool) wrote :

Unsubing ubuntu-main-sponsors as there's no debdiff to sponsor yet.

Changed in cheese:
status: Fix Released → Incomplete
Changed in cheese:
status: Incomplete → Fix Released
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Made the update to version 2.22.0 and integrated Matthew Garrett's hildonization patch from upstream. I also regenerated the autotools patch using:

         1. libtoolize --force --copy
         2. autoreconf; rm -rf autom4te.cache; true

The first was needed to fix libtool mismatch errors when attempting to build.

I'm afraid that this has resulted in a very large debdiff.

I tested the resulting .debs in both the hildon and desktop environments.

Changed in cheese:
assignee: smagoun → gary-lasker
Revision history for this message
Loïc Minier (lool) wrote :

@Gary: Please mention the changes related to the hildon patch and autotools in the debian/changelog.

Revision history for this message
Loïc Minier (lool) wrote :

As Gary noted on IRC, he also has to update b-deps for the new release:
 Cheese currently requires:
- - glib-2.0 >= 2.12.1
+ - glib-2.0 >= 2.15.4
   - gobject-2.0
   - gtk+-2.0 >= 2.10.0
- - libglade-2.0 >= 2.0.0
   - gdk-2.0
   - dbus-1
   - hal

Revision history for this message
Gary Lasker (gary-lasker) wrote :

I made the required b-dep updates to debian/control, and added more detailed information to debian/changelog per Loïc's suggestions. Uploading the diff.gz and .dsc files for review.

Revision history for this message
Gary Lasker (gary-lasker) wrote :
Revision history for this message
Gary Lasker (gary-lasker) wrote :
Revision history for this message
Loïc Minier (lool) wrote :

Looked good! Uploaded.

FYI, Debian imported the previous Ubuntu package and added these patches when preparing 2.22.0 which you might be interested in:
  * debian/patches/00_fix_crash_on_init.patch:
    + Added. Fixed crash on intialisation because of running strcmp on NULL.
      (From upstream svn)
  * debian/patches/10_fallback_on_failure.patch:
    + Added. Fallback to videotestsrc if getting information from the video
      device fails
  * debian/patches/20_dont_start_pipeline_in_init.patch:
    + Added. Don't create the gstreamer pipeline in the Webcam object
      initialisation as this is quite bad style. As a nice side-effect this
      fixes cheese not using the webcam device set in gconf.

Changed in cheese:
status: In Progress → Fix Committed
Revision history for this message
Loïc Minier (lool) wrote :

cheese (2.22.0-0ubuntu1) hardy; urgency=low
 * New upstream release (LP: #185669)
   - Replace 40_hildon.patch with latest hildon patch from Matthew Garrett
     (GNOME #519548).
   - Replace 70_autotools.patch with new version to update autotools
     generated files using:
        1. libtoolize --force --copy (to fix libtool version mismatch error)
        2. autoreconf; rm -rf autom4te.cache; true
   - Bump dependency to libglib2.0-dev (>= 2.15.5); removed
     libglade2-dev dependency; both per upstream configure.ac changes (note
     contrary to autoconf.ac changes the gnome-vfs dependency must remain
     as gnome-thumbnail still needs it - see GNOME #522189).

Changed in cheese:
status: Fix Committed → Fix Released
Changed in acton:
assignee: nobody → gary-lasker
status: New → Fix Released
Michael Terry (mterry)
tags: added: oem-services
Changed in cheese:
importance: Unknown → Wishlist
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.