--- cheese-2.21.5.orig/debian/copyright +++ cheese-2.21.5/debian/copyright @@ -0,0 +1,43 @@ +This package was debianized by Baptiste Mille-Mathias on +Tue, 10 Jul 2007 21:15:54 +0200. + +It was downloaded from http://www.gnome.org/projects/cheese/ + +Upstream Authors: + + Daniel G. Siegel + Raphaël Slinckx + +Copyright: + +(C) 2000-2004 Daniel G. Siegel +(C) 2000-2004 Raphaël Slinckx + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL' + +Some part of the build system are covered by the M.I.T license + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. M.I.T. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + +The Debian packaging is (C) 2007, Baptiste Mille-Mathias and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- cheese-2.21.5.orig/debian/control +++ cheese-2.21.5/debian/control @@ -0,0 +1,42 @@ +Source: cheese +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +Standards-Version: 3.7.3 +Homepage: http://www.gnome.org/projects/cheese +Build-Depends: cdbs (>= 0.4.41), + debhelper (>= 5), + gnome-pkg-tools (>= 0.10), + libglib2.0-dev (>= 2.10.0), + libpango1.0-dev (>= 1.18.0), + librsvg2-dev (>= 2.18.0), + libgtk2.0-dev (>= 2.10.0), + libgnomeui-dev (>=2.0), + libglade2-dev (>= 2.3.6), + libgconf2-4 (>= 2.16.0), + libgstreamer0.10-dev (>= 0.10.15), + libgstreamer-plugins-base0.10-dev, + libcairo2-dev (>= 1.2.4), + libgnomevfs2-dev (>= 2.18.0), + libebook1.2-dev (>= 1.12.0), + libdbus-1-dev (>= 1.0), + libhal-dev (>= 0.5.9), + libdbus-glib-1-dev (>= 0.7), + libhildon-1-dev [lpia], + libxxf86vm-dev, + libxml-parser-perl, + scrollkeeper, + gnome-doc-utils + +Package: cheese +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good (>= 0.10.6), gstreamer0.10-x +Description: A tool to take pictures and videos from your webcam + Cheese is a cheesy program to take pictures and videos from your web + cam. It also provides some graphical effects in order to please the + users play instinct. + . + http://live.gnome.org/Cheese/ --- cheese-2.21.5.orig/debian/rules +++ cheese-2.21.5/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS = --disable-scrollkeeper + +ifeq ($(DEB_BUILD_ARCH),lpia) + DEB_CONFIGURE_EXTRA_FLAGS = --enable-hildon --disable-scrollkeeper +endif --- cheese-2.21.5.orig/debian/watch +++ cheese-2.21.5/debian/watch @@ -0,0 +1,5 @@ +version=3 + +http://ftp.gnome.org/pub/GNOME/sources/cheese/([0-9].*)/cheese-([0-9].*).tar.gz debian uupdate + + --- cheese-2.21.5.orig/debian/changelog +++ cheese-2.21.5/debian/changelog @@ -0,0 +1,134 @@ +cheese (2.21.5-0ubuntu1) hardy; urgency=low + + * New upstream release + - Added missing dependancy gstreamer0.10-x to cheese binary package + - Added a librsvg2-dev (>= 2.18) and libpango1.0-dev (>= 1.18.0) build-deps + - disabled scroolkeeper help files generation - added + DEB_CONFIGURE_EXTRA_FLAGS = --disable-scrollkeeper + - removed TODO from docs + - made gstreamer0.10-plugins-good dependancy versioned (>= 0.10.6) + - modified fix_desktop.patch - cheese.desktop.in.in file should be changed + + -- Mantas Kriaučiūnas Tue, 23 Jan 2008 15:11:27 +0300 + +cheese (0.3.0-0ubuntu1) hardy; urgency=low + + * 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 + - Changed homepage (when referenced) to new http://www.gnome.org/projects/cheese + * Bumped up Standards-Version to 3.7.3, no change needed + + -- Steve Stalcup Mon, 07 Jan 2008 11:06:29 -0500 + +cheese (0.2.4-0ubuntu3) hardy; urgency=low + + * Watch file added (closes LP #180380) + + -- Steve Stalcup Fri, 04 Jan 2008 11:16:13 -0500 + +cheese (0.2.4-0ubuntu2) hardy; urgency=low + + * Fix the hildon patch to add HILDON_CFLAGS to CFLAGS and HILDON_LIBS to + LDFLAGS; fixes build on lpia; thanks Steve Magoun. + + -- Loic Minier Wed, 28 Nov 2007 22:39:28 +0100 + +cheese (0.2.4-0ubuntu1) hardy; urgency=low + + * New upstream release: + - fix #472576: cheese takes longer to start as + more pictures are stored + - fix #473560: v4l-recorded videos are zero + byte big, courtesy of Patryk Zawadzki + - Translation error in de + * debian/cheese.1: Created manpage + * debian/patches/fix_desktop.patch: Fixed desktop file + * debian/control: + - Fixed description-synopsis + - Added homepage field + * debian/copyright: Fixed listing of copyright + + -- Cody A.W. Somerville Tue, 06 Nov 2007 00:36:54 -0400 + +cheese (0.2.3-0ubuntu1) gutsy; urgency=low + + * New upstream release (LP: #135814): + - add keystrokes: + - t, T, Space for taking photos and videos + - Enter for opening an item + - Delete for deleting an item + - Left and Right for scrolling through the view + - add a flash, when taking photos, courtesy of Patryk Zawadzki + - use 25fps for video recording + - video recording did not work. fixed + - make ximagesink work with the photo pipeline + - added/updated translations: da, es, gl, it, ja + * debian/patches/05fix_video_rec.patch: + - dropped as got fixed upstream + * debian/control: + - added build-dependency libxxf86vm-dev + + -- Aron Sisak Thu, 30 Aug 2007 21:15:55 +0200 + +cheese (0.2.2-0ubuntu3) gutsy; urgency=low + + * debian/patches/05fix_video_rec.patch: + - Video recording fix from the Darcs repository + + -- Aron Sisak Sun, 26 Aug 2007 10:40:22 +0200 + +cheese (0.2.2-0ubuntu2) gutsy; urgency=low + + * Add Hildon support + + -- Matthew Garrett Fri, 24 Aug 2007 19:22:40 +0100 + +cheese (0.2.2-0ubuntu1) gutsy; urgency=low + + * New upstream release (LP #133933): + - workaround on a gstreamer-bug, which made the colors look wrong with + - activate countdown by default + - the countdown is not available in video and segfaultet. fixed + - use g_timeout_add instead of g_timeout_add_seconds + - improvement the video pipline. + - add a countdown, when taking a photo + - add a time counter to the video recording + - added the following export methods/capabilities: open the file with + gnome-open, save as dialog, delete, send by mail, export to flickr, export + to f-spot, set as account photo + - we found the bug! v4l works now + - added a popupmenu to the iconview + - added some parts of the lucas(R)-eye of gnome iconview + - if the same effects were chosen in photo and video, they wont apply. fixed + - the first item in the iconbar wasnt deleted. fixed + - updated translations: cs, de, fr, it, nl, pt + * debian/control + - Add libebook build dependency based on configure.cheese + + -- Aron Sisak Thu, 23 Aug 2007 13:14:48 +0200 + +cheese (0.2.0-0ubuntu1) gutsy; urgency=low + + * New upstream release + * debian/control: Add libgnomeui as b-d + + -- Mario Danic Thu, 16 Aug 2007 10:08:53 +0200 + +cheese (0.1.4-0ubuntu1) gutsy; urgency=low + + * New upstream release + + -- Baptiste Mille-Mathias Thu, 02 Aug 2007 18:23:08 +0200 + +cheese (0.1.3-0ubuntu1) gutsy; urgency=low + + * Initial release + + -- Baptiste Mille-Mathias Tue, 10 Jul 2007 21:15:54 +0200 + --- cheese-2.21.5.orig/debian/cheese.1 +++ cheese-2.21.5/debian/cheese.1 @@ -0,0 +1,15 @@ +.TH "cheese" "1" +.SH "NAME" +cheese \- A tool to take pictures and videos from your webcam +.SH "SYNOPSIS" +\fB +.SH "DESCRIPTION" +.B cheese +is a cheesy program to take pictures and videos from your web +cam. It also provides some graphical effects in order to please the +users play instinct. +.SH "AUTHOR" +.PP +This manual page was written by Cody A.W. Somerville +for the \fBUbuntu GNU/Linux\fP system. + --- cheese-2.21.5.orig/debian/compat +++ cheese-2.21.5/debian/compat @@ -0,0 +1 @@ +5 --- cheese-2.21.5.orig/debian/docs +++ cheese-2.21.5/debian/docs @@ -0,0 +1 @@ +README --- cheese-2.21.5.orig/debian/manpages +++ cheese-2.21.5/debian/manpages @@ -0,0 +1 @@ +debian/cheese.1 --- cheese-2.21.5.orig/debian/patches/hildon.patch +++ cheese-2.21.5/debian/patches/hildon.patch @@ -0,0 +1,789 @@ +diff -Nur cheese-0.2.4/configure.cheese cheese-0.2.4.new/configure.cheese +--- cheese-0.2.4/configure.cheese 2007-11-28 22:37:33.000000000 +0100 ++++ cheese-0.2.4.new/configure.cheese 2007-11-28 22:37:42.000000000 +0100 +@@ -68,6 +68,11 @@ + do_check libebook-1.2 + do_check xxf86vm + ++if [ x$configure_enable_hildon = x1 ]; then ++ do_check hildon-1 ++ toc2_export WITH_HILDON=1 ++fi ++ + if pkg-config --atleast-version=1.11.0 libebook-1.2; then + toc2_export LIBEBOOK_VERSION_1_12=1 + else +diff -Nur cheese-0.2.4/data/cheese.hildon.glade cheese-0.2.4.new/data/cheese.hildon.glade +--- cheese-0.2.4/data/cheese.hildon.glade 1970-01-01 01:00:00.000000000 +0100 ++++ cheese-0.2.4.new/data/cheese.hildon.glade 2007-11-28 22:37:42.000000000 +0100 +@@ -0,0 +1,616 @@ ++ ++ ++ ++ ++ ++ ++ True ++ Cheese ++ GTK_WINDOW_TOPLEVEL ++ GTK_WIN_POS_NONE ++ False ++ True ++ False ++ cheese ++ True ++ False ++ False ++ GDK_WINDOW_TYPE_HINT_NORMAL ++ GDK_GRAVITY_NORTH_WEST ++ True ++ False ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ GTK_PACK_DIRECTION_LTR ++ GTK_PACK_DIRECTION_LTR ++ ++ ++ 0 ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ 12 ++ True ++ False ++ 6 ++ ++ ++ ++ True ++ False ++ False ++ GTK_POS_TOP ++ False ++ False ++ ++ ++ ++ True ++ 0 ++ 0.5 ++ GTK_SHADOW_NONE ++ 0.5 ++ 0.5 ++ 1.33000004292 ++ False ++ ++ ++ ++ 320 ++ 240 ++ True ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ tab ++ ++ ++ ++ ++ ++ True ++ 0 ++ 0.5 ++ GTK_SHADOW_NONE ++ 0.5 ++ 0.5 ++ 1.33000004292 ++ False ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ tab ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ tab ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ tab ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ True ++ 4 ++ camera-photo ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ _Photo ++ True ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ True ++ 4 ++ camera-video ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ _Video ++ True ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ gtk-media-record ++ 4 ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ <b>_Take a photo</b> ++ True ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ ++ ++ ++ 16 ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_RELIEF_NORMAL ++ True ++ ++ ++ ++ True ++ 0.5 ++ 0.5 ++ 1 ++ 1 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ 4 ++ applications-graphics ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ _Effects ++ True ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ ++ ++ ++ 40 ++ False ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ 3 ++ False ++ False ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ True ++ True ++ GTK_POLICY_NEVER ++ GTK_POLICY_ALWAYS ++ GTK_SHADOW_IN ++ GTK_CORNER_TOP_LEFT ++ ++ ++ ++ True ++ True ++ GTK_SELECTION_SINGLE ++ GTK_ORIENTATION_HORIZONTAL ++ False ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ ++ ++ ++ +diff -Nur cheese-0.2.4/data/Makefile cheese-0.2.4.new/data/Makefile +--- cheese-0.2.4/data/Makefile 2007-11-28 22:37:33.000000000 +0100 ++++ cheese-0.2.4.new/data/Makefile 2007-11-28 22:37:42.000000000 +0100 +@@ -1,12 +1,18 @@ + #!/usr/bin/env make + +-include toc2.make + GLADEFILE = cheese.glade ++HILDONFILE = cheese.hildon.glade ++ ++include toc2.make ++ifeq (1, $(WITH_HILDON)) ++ GLADEFILE = $(HILDONFILE) ++endif ++ + DESKTOPFILE = $(wildcard *.desktop) + + package.dist_files += $(GLADEFILE) $(EFFECTS) $(DESKTOPFILE) + +-package.install.package_data += $(GLADEFILE) ++package.install.package_data += $(GLADEFILE) $(HILDONFILE) + + package.install.desktop = $(DESKTOPFILE) + $(call toc2.call.define-install-set,desktop, $(prefix)/share/applications,-m 0644) +diff -Nur cheese-0.2.4/src/cheese-fileutil.c cheese-0.2.4.new/src/cheese-fileutil.c +--- cheese-0.2.4/src/cheese-fileutil.c 2007-11-28 22:37:33.000000000 +0100 ++++ cheese-0.2.4.new/src/cheese-fileutil.c 2007-11-28 22:37:42.000000000 +0100 +@@ -43,8 +43,13 @@ + // maybe ~/cheese or on the desktop.. + //g_get_home_dir() + //gchar *path = g_strdup_printf("%s/%s", getenv("PWD"), PHOTO_FOLDER_DEFAULT); ++#ifdef HILDON ++ gchar *path = ++ g_strdup_printf ("%s/Mydocs/.images/", g_get_home_dir ()); ++#else + gchar *path = + g_strdup_printf ("%s/.gnome2/cheese/%s", g_get_home_dir (), PHOTO_FOLDER_DEFAULT); ++#endif + return path; + } + +diff -Nur cheese-0.2.4/src/cheese-window.c cheese-0.2.4.new/src/cheese-window.c +--- cheese-0.2.4/src/cheese-window.c 2007-11-28 22:37:33.000000000 +0100 ++++ cheese-0.2.4.new/src/cheese-window.c 2007-11-28 22:37:42.000000000 +0100 +@@ -29,6 +29,10 @@ + #include + #include + ++#ifdef HILDON ++#include ++#endif ++ + #include "cheese.h" + #include "cheese-command-handler.h" + #include "cheese-config.h" +@@ -37,7 +41,11 @@ + #include "cheese-thumbnails.h" + #include "cheese-window.h" + ++#ifdef HILDON ++#define GLADE_FILE CHEESE_DATA_DIR"/cheese.hildon.glade" ++#else + #define GLADE_FILE CHEESE_DATA_DIR"/cheese.glade" ++#endif + + struct _cheese_window cheese_window; + struct _thumbnails thumbnails; +@@ -394,10 +402,15 @@ + static void + create_window () + { +- GtkWidget *file_menu; +- GtkWidget *help_menu; + GtkWidget *menu; + GtkWidget *menuitem; ++#ifdef HILDON ++ HildonProgram *program = hildon_program_get_instance(); ++ GtkWidget *container; ++#else ++ GtkWidget *file_menu; ++ GtkWidget *help_menu; ++#endif + + cheese_window.gxml = glade_xml_new (GLADE_FILE, NULL, NULL); + cheese_window.window = glade_xml_get_widget (cheese_window.gxml, "cheese_window"); +@@ -428,6 +441,38 @@ + G_CALLBACK (cheese_window_button_video_cb), NULL); + + gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (thumbnails.iconview), 0); ++ ++#ifdef HILDON ++ gtk_icon_view_set_columns (GTK_ICON_VIEW (thumbnails.iconview), -1); ++ ++ program = HILDON_PROGRAM(hildon_program_get_instance()); ++ container = cheese_window.window; ++ cheese_window.window = hildon_window_new(); ++ hildon_program_add_window(program, HILDON_WINDOW(cheese_window.window)); ++ ++ g_signal_connect_swapped(cheese_window.window ,"destroy", ++ GTK_SIGNAL_FUNC(on_cheese_window_close_cb), ++ NULL); ++ hildon_program_add_window(program, HILDON_WINDOW(cheese_window.window)); ++ gtk_container_add(GTK_CONTAINER(cheese_window.window), GTK_WIDGET(container)); ++ g_set_application_name (_("Cheese")); ++ menu = gtk_menu_new(); ++ ++ menuitem = gtk_menu_item_new_with_label(_("Quit")); ++ g_signal_connect_swapped(menuitem,"activate", ++ GTK_SIGNAL_FUNC(on_cheese_window_close_cb), ++ NULL); ++ gtk_menu_append(menu, menuitem); ++ ++ menuitem = gtk_menu_item_new_with_label(_("About")); ++ g_signal_connect_swapped(menuitem,"activate", ++ GTK_SIGNAL_FUNC(on_about_cb), ++ cheese_window.window); ++ gtk_menu_append(menu, menuitem); ++ hildon_window_set_menu(HILDON_WINDOW(cheese_window.window), ++ GTK_MENU(menu)); ++ gtk_widget_show_all(GTK_WIDGET(menu)); ++#else + gtk_icon_view_set_columns (GTK_ICON_VIEW (thumbnails.iconview), G_MAXINT); + + // menubar +@@ -465,6 +510,7 @@ + gtk_menu_append (GTK_MENU (menu), menuitem); + g_signal_connect (GTK_OBJECT (menuitem), "activate", + GTK_SIGNAL_FUNC (on_about_cb), cheese_window.window); ++#endif + + g_signal_connect (G_OBJECT (cheese_window.window), "destroy", + G_CALLBACK (on_cheese_window_close_cb), NULL); +diff -Nur cheese-0.2.4/src/Makefile cheese-0.2.4.new/src/Makefile +--- cheese-0.2.4/src/Makefile 2007-11-28 22:37:33.000000000 +0100 ++++ cheese-0.2.4.new/src/Makefile 2007-11-28 22:38:10.000000000 +0100 +@@ -44,9 +44,18 @@ + LIBEBOOK_CFLAGS := $(LIBEBOK_1_2_CFLAGS) + LIBEBOOK_LIBS := $(LIBEBOK_1_2_LIBS) + ++HILDON_CFLAGS := $(HILDON_1_CFLAGS) ++HILDON_LIBS := $(HILDON_1_LIBS) ++ + CFLAGS := $(call toc2.call.remove-dupes,-g -O2 -Wall -Werror $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLADE_CFLAGS) $(GSTREAMER_CFLAGS) $(GNOME_VFS_CFLAGS) $(GDK_CFLAGS) $(LIBGNOMEUI_CFLAGS) $(LIBEBOOK_CFLAGS) $(XF86VM_CFLAGS)) ++ + LDFLAGS := $(call toc2.call.remove-dupes,-lpthread $(DBUS_LIBS) $(GTK_LIBS) $(GLADE_LIBS) $(GSTREAMER_LIBS) $(GNOME_VFS_LIBS) $(GDK_LIBS) $(LIBGNOMEUI_LIBS) $(LIBEBOOK_LIBS) $(XF86VM_LIBS)) + ++ifeq (1, $(WITH_HILDON)) ++ CFLAGS += -DHILDON $(HILDON_CFLAGS) ++ LDFLAGS += $(HILDON_LIBS) ++endif ++ + OBJS = $(SOURCES:%.c=%.o) + + package.dist_files += $(SOURCES) $(SOURCES:%.c=%.h) cheese-config.h.at --- cheese-2.21.5.orig/debian/patches/fix_desktop.patch +++ cheese-2.21.5/debian/patches/fix_desktop.patch @@ -0,0 +1,12 @@ +diff -Nur cheese-2.21.5/data/cheese.desktop cheese-2.21.5.new/data/cheese.desktop +--- cheese-2.21.5/data/cheese.desktop.in.in 2008-01-14 19:28:05.000000000 +0200 ++++ cheese-2.21.5.new/data/cheese.desktop.in.in 2008-01-22 14:21:36.923177386 +0200 +@@ -6,7 +6,7 @@ + Type=Application + StartupNotify=true + Icon=cheese +-Categories=GNOME;GTK;Utility; ++Categories=Graphics + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=cheese + X-GNOME-Bugzilla-Component=general