cheese new upstream releases (2.21.5)

Loïc: can you take a look at this one?

@Steve: your interdiff looks huge and is hard to read, all files are removed and then readded -- did you pass -p1?

Could you please update your interdiff with "interdiff -z -p1 old-version.diff.gz new-version.diff.gz > new-version.interdiff"? Or you can "debdiff | filterdiff -i '*/debian/*'" etc.

Hello Loïc,

here you go.

Loïc,

Started over from the beginning,

steve@k-liger:~/cheese-^$ interdiff -z -p1 cheese_0.2.4-0ubuntu3.diff.gz cheese_0.3.0-0ubuntu1.diff.gz > check.interdiff
steve@k-liger:~/cheese-^$ interdiff -z cheese_0.2.4-0ubuntu3.diff.gz cheese_0.3.0-0ubuntu1.diff.gz | gzip --best -c - > cheese_0.3.0-0ubuntu1.interdiff.gz
steve@k-liger:~/cheese-^$ combinediff -z cheese_0.3.0-0ubuntu1.interdiff.gz cheese_0.2.4-0ubuntu3.diff.gz > test.diff
steve@k-liger:~/cheese-^$ interdiff -z test.diff cheese_0.3.0-0ubuntu1.diff.gz
steve@k-liger:~//cheese-^$

resulting in the attached interdiff & debdiff

@Steve: Some minor and less minor issues with your update:
1) you drop the hildon patch, can you explain why?
2) same question for the patch fix_desktop

Even if you have a good reason to drop patches, you need to mention why in the changelog (usually the reason patches are dropped is because all the fixes they carried were merged upstream).

3) I don't understand your comment "debian/docs removed as was blank": could you clarify? I see some useful bits at the end of the upstream README which could help people setup cheese with their hardware, I think we should make sure people get the information in some way.

4) The upstream build changed a lot in 0.3.0: it wasn't autotools based in the past, which made understanding the exact build-dependencies less easy, and it seems the 0.2.4 packaging in Ubuntu was missing some build-deps; this is however relatively easy to read in the new autoconf based build, if you look at configure.ac, you should see e.g. GLIB_REQUIRED=2.10.0 and then PKG_CHECK_MODULES(CHEESE, glib-2.0 >= $GLIB_REQUIRED [...]), this means you need a libglib2.0-dev (>= 2.10.0) build-dep (this package ships glib-2.0.pc). Could you please update the build-dependencies to match the now more readable requirements in the new upstream build system?

5) This is from the extra style points department: ;)
a) as an interdiff shows nicely, you added a spurious space in debian/rules
b) your changelog lists multiple different things together: you mention a new upstream release on one line and then misc debian/control changes on another line, such as updating build-deps and Standards-Version; instead, it would be extra nice to list logical changes together, consider this:
  * New upstream release
    - Added build-deps on libxml-parser-perl and gnome-doc-utils for the documentation build
    - Added missing libglib2.0-dev (>= 2.10.0) build-dep
    - Dropped TODO from debian/docs as this file isn't shipped upstream anymore.
  * Bumped up Standards-Version to 3.7.3, no change needed.
this is just a suggestion, but I'm sure you'll find it quite natural in this way!
c) your changelog mentions "many new upstream changes, see upstream NEWS" but this isn't very helpful to readers; first, you don't actually install the NEWS file, second, this isn't very helpful since if people don't read about the upstream changes, they'll naturally look for the upstream changes!

Anyway, the 5th point is less important, it's much more about cosmetics and style.

Cheers,

@Steve: in comment #5, you call interdiff twice, the first time with -p1, the second time without; this is why your interdiff is garbled. You don't need to gzip the interdiff if it's reasonably small.

Loïc,

Thank you very much for the feedback. I hope this new revision meets the appropriate standards :)

  * New upstream release (LP #180624)
   - Added build-deps libxml-parser-perl, gnome-doc-utils, and scrollkeeper for documentation build
   - Added missing libglib2.0-dev (>= 2.10.0) build-dep
   - Added missing libgconf2-4 (>= 2.16.0) build-dep
   - Added missing libcairo2-dev (>= 1.2.4) build-dep
   - Added missing libdbus-1-dev (>= 1.0) build-dep
   - Added missing libhal-dev (>= 0.5.9) build-dep
   - Added missing libdbus-glib-1-dev (>= 0.7) build-dep
   - Removed debian/patches fixed in this release
   - Changed homepage (when referenced) to new http://www.gnome.org/projects/cheese
  * Bumped up Standards-Version to 3.7.3, no change needed

Hi Steve,

Good progress in this updated interdiff; here's an updated review:

I) I see you documented the removal of patches as "Removed debian/patches fixed in this release"; however, in my reading, the functionality of each patch is still missing from the new upstream release; could you explain why you think each one can be dropped with more details? For example, if you see what the fix_desktop patch fixed, perhaps you can explain why you think it can be completely dropped? I think the .desktop file still needs fixing in the new upstream release, as only part of the fix was merged.
Concerning the hildon patch, could you check the debian/changelog and tell me whether you understand what it is about? If you can't find out, I shall explain it and we will document it in the patch.

II) In your previous version, you dropped debian/docs, and in the new one you don't touch it at all; but upstream used to ship a TODO file and doesn't do so anymore -- does the package build if the TODO is listed in debian/docs but not present?

III) Could you please revert or explain the reasons why you changed in debian/rules:
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
and in debian/changelog:
 cheese (0.2.4-0ubuntu3) hardy; urgency=low
- * Watch file added (LP: #180380)
+ * Watch file added (closes LP #180380)

IV) You changed the watch file, but you didn't mention it in your new 0.3.0-0ubuntu1 changelog entry

V) a) I see you fixed most of the build-deps, that's nice! However, could you please recheck the required version for libglade2-dev, libgnomeui-dev?

b) Also, you added a build-dependency on libgconf2-4, I think you meant libgconf2-dev.

c) The configure.ac checks as follows:
  gstreamer-0.10 >= $GSTREAMER_REQUIRED \
  gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED \
please update the libgstreamer-plugins-base0.10-dev accordingly.

VI) Very minor sugar spacing issues:
- still adding trailing space to the debian/rules shebang -- see interdiff
- "libgnomeui-dev (>=2.0)" => note missing space after >=
- Homepage control field misses a trailing /
- You use http://ftp.gnome.org in the watch file but http://www.gnome.org/ in the copyright; I'd suggest using ftp.g.o everywhere

I've unsubscribed ubuntu-universe-sponsors based on the previous request for additional changes by a sponsor. Also, please follow the status of the cheese task in bug #149275 closely, it may be that ubuntu-main-sponsors will need to be subscribed to the revised candidate.

Hi Loïc,

It seems there is a new version available. I have corrected everything except for the patches, which seem to be Ubuntu specific. How do you update patches?

Hi Steve,

Updating the first patch shouldn't be too hard; you can find information about patch systems and the way patches are added / updated at:
https://wiki.ubuntu.com/MOTU/School/PatchingSources
https://wiki.ubuntu.com/PackagingGuide/PatchSystems

There might be more complete pages for specific patch systems in:
https://wiki.ubuntu.com/?action=fullsearch&context=180&value=patch&titlesearch=Titles

I'd recommend you try updating the first patch which is the easiest; see my hints in comment #10: the patch used to change two words on the section line, but only one word was fixed upstream in the new upstream release, so you still need it for the other word.

The way to go is to either recreate the patch manually or to force it's application (despite the patch not applying) and fix the conflicts.

When you're done, just attach the updated patch and I'll help you split the other patch into smaller tasks to update it.

FYI, cheese 2.21.5 came out.

Mantas Kriaučiūnas is also interested in preparing the new upstream release, and he provided an updated diff for 2.21.5.

@Mantas: nice update; here's a review:

1) I see you updated the -good dependency, could you do the same with the other dependencies mentioned in the README like e.g. gstreamer-base and any other?

2) Concerning the fix_desktop patch, could you please mention its update in the changelog?

3) Here's a summary of what the hildon patch does and which should be ported to the new build system:
a) adds a ./configure flag to allow building with hildon support; this flag will set WITH_HILDON=1 and check for the hildon-1 pkg-config file
b) add a data/cheese.hildon.glade file
c) change data/Makefile to use HILDONFILE (set to cheese.hildon.glade) for GLADEFILE if WITH_HILDON is set, and to ship that file
d) change src/cheese-fileutil.c to use "%s/Mydocs/.images/" instead of "%s/.gnome2/cheese/%s" for the image path if WITH_HILDON is set
e) change src/cheese-window.c to create a hildon window instead of a gtk window and use the proper glade filename if WITH_HILDON is set
f) change src/Makefile to add HILDON_CFLAGS and HILDON_LIBS to CFLAGS and LIBS if WITH_HILDON is set

It's likely that the a, c, and f changes blow up and need to be ported to autotools; the other changes you should be able to port; could you prepare an updated patch for this part and tell me whether you need help for autotools or for the other changes?

Thanks!

here is the desktop patch... I know someone else is working on it now, but I would like still like to learn the correct process here :)

Thanks!

@Steve: heh, sure! Your patch was almost ok; two small things: it shipped a data/cheese.desktop.in~ file (probably a backup created by your editor), and it patched data/cheese.desktop.in but in fact the file was renamed with one more .in upstream (data/cheese.desktop.in.in). Thanks for the updated patch.

It seems we also missed important dependancy: gstreamer0.10-x - without this package cheese displays nothing :(
I updated diff.gz file according your lastest commend and also compiled binary packages (without hildon patch) for ubuntu hardy system.

I've tested new package little bit - it seems cheese 2.21.5 displays webcam output too dark, while cheese 0.2.4 and gstreamer-properties doesn't have such problem - it shows all in normal brightness.

Btw, I don't have free time to port hildon patch to the new build system, so, this work must be done by another person - I'm attaching fixed cheese_2.21.5-0ubuntu1.diff.gz, which compiles and installs without any problems if hildon.patch is removed :)

Hehe, I forgot to tell where I put compiled binary packages (without hildon patch) for ubuntu hardy system :)

Grab package from http://ftp.akl.lt/incoming/Baltix-stuff/cheese/

I've tested new package little bit - it seems cheese 2.21.5 displays webcam output too dark, while cheese 0.2.4 and gstreamer-properties doesn't have such problem - it shows all in normal brightness.

This bug was fixed in the package cheese - 2.21.5-0ubuntu1

---------------
cheese (2.21.5-0ubuntu1) hardy; urgency=low

  [ Steve Stalcup ]
  * New upstream release (LP: #180624)
   - Added build-deps libxml-parser-perl, gnome-doc-utils, and scrollkeeper
     for documentation build
   - Added missing build-deps on libglib2.0-dev (>= 2.10.0), libgconf2-4 (>=
     2.16.0), libcairo2-dev (>= 1.2.4), libdbus-1-dev (>= 1.0), libhal-dev (>=
     0.5.9), libdbus-glib-1-dev (>= 0.7)
   - Update homepage address

  [ Mantas Kriaučiūnas]
  * Bumped up Standards-Version to 3.7.3, no change needed
  * New upstream release
   - Added missing dependency on gstreamer0.10-x
   - Added librsvg2-dev (>= 2.18) and libpango1.0-dev (>= 1.18.0) build-deps
   - Disabled scroolkeeper help files generation by passing
     --disable-scrollkeeper to configure
   - Removed TODO from docs
   - Version gstreamer0.10-plugins-good dependency to (>= 0.10.6)
   - Updated fix_desktop patch for upstream changes and to fix
     cheese.desktop.in.in

  [ Loic Minier ]
  * Fix DEB_CONFIGURE_EXTRA_FLAGS for all architectures.
  * Cleanup control.
  * Bump up deps to gstreamer0.10-plugins-base >= 0.10.15, gstreamer0.10-x
    >= 0.10.12, following the upstream README recommendations.
  * Update hildonization patch with a new glade file and new cheese-window.c
    code by Matthew Garrett and port the build system changes to autoconf /
    automake.
  * Prepend number to patch names.
  * Split hildon patch in 40_hildon.patch and 70_autotools.patch for
    autoheader + autoconf + automake-1.10 changes.

 -- Loic Minier <email address hidden> Wed, 23 Jan 2008 17:56:09 +0100