--- cheese-0.2.3.orig/debian/patches/hildon.patch
+++ cheese-0.2.3/debian/patches/hildon.patch
@@ -0,0 +1,786 @@
+diff -Nur cheese-0.2.3/configure.cheese cheese-0.2.3.new/configure.cheese
+--- cheese-0.2.3/configure.cheese 2007-08-29 01:37:39.000000000 +0200
++++ cheese-0.2.3.new/configure.cheese 2007-08-30 23:10:50.569351833 +0200
+@@ -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.3/data/cheese.hildon.glade cheese-0.2.3.new/data/cheese.hildon.glade
+--- cheese-0.2.3/data/cheese.hildon.glade 1970-01-01 01:00:00.000000000 +0100
++++ cheese-0.2.3.new/data/cheese.hildon.glade 2007-08-30 23:10:50.569351833 +0200
+@@ -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
++
++
++
++
++ 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.3/data/Makefile cheese-0.2.3.new/data/Makefile
+--- cheese-0.2.3/data/Makefile 2007-06-30 18:53:43.000000000 +0200
++++ cheese-0.2.3.new/data/Makefile 2007-08-30 23:10:50.569351833 +0200
+@@ -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.3/src/cheese-fileutil.c cheese-0.2.3.new/src/cheese-fileutil.c
+--- cheese-0.2.3/src/cheese-fileutil.c 2007-08-17 20:24:17.000000000 +0200
++++ cheese-0.2.3.new/src/cheese-fileutil.c 2007-08-30 23:10:50.569351833 +0200
+@@ -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.3/src/cheese-window.c cheese-0.2.3.new/src/cheese-window.c
+--- cheese-0.2.3/src/cheese-window.c 2007-08-30 12:30:07.000000000 +0200
++++ cheese-0.2.3.new/src/cheese-window.c 2007-08-30 23:10:50.569351833 +0200
+@@ -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.3/src/Makefile cheese-0.2.3.new/src/Makefile
+--- cheese-0.2.3/src/Makefile 2007-08-29 02:19:36.000000000 +0200
++++ cheese-0.2.3.new/src/Makefile 2007-08-30 23:18:40.084961179 +0200
+@@ -44,7 +44,15 @@
+ 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))
++
++ifeq (1, $(WITH_HILDON))
++ CFLAGS += -DHILDON
++endif
++
+ 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))
+
+ OBJS = $(SOURCES:%.c=%.o)
--- cheese-0.2.3.orig/debian/docs
+++ cheese-0.2.3/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
--- cheese-0.2.3.orig/debian/compat
+++ cheese-0.2.3/debian/compat
@@ -0,0 +1 @@
+5
--- cheese-0.2.3.orig/debian/rules
+++ cheese-0.2.3/debian/rules
@@ -0,0 +1,10 @@
+#!/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
+
+ifeq ($(DEB_BUILD_ARCH),lpia)
+ DEB_CONFIGURE_EXTRA_FLAGS = --enable-hildon
+endif
--- cheese-0.2.3.orig/debian/changelog
+++ cheese-0.2.3/debian/changelog
@@ -0,0 +1,76 @@
+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-0.2.3.orig/debian/copyright
+++ cheese-0.2.3/debian/copyright
@@ -0,0 +1,42 @@
+This package was debianized by Baptiste Mille-Mathias on
+Tue, 10 Jul 2007 21:15:54 +0200.
+
+It was downloaded from http://live.gnome.org/Cheese/Releases
+
+Upstream Author(s):
+
+ Daniel G. Siegel
+ Raphaël Slinckx
+
+Copyright:
+
+Copyright (C) 2000-2004 The Free Software Foundation
+
+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-0.2.3.orig/debian/control
+++ cheese-0.2.3/debian/control
@@ -0,0 +1,28 @@
+Source: cheese
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.41),
+ debhelper (>= 5),
+ gnome-pkg-tools (>= 0.10),
+ libgtk2.0-dev (>= 2.10),
+ libglade2-dev (>= 2.3.6),
+ libgstreamer0.10-dev,
+ libgstreamer-plugins-base0.10-dev,
+ libgnomevfs2-dev,
+ libgnomeui-dev,
+ libebook1.2-dev,
+ libhildon-1-dev [lpia],
+ libxxf86vm-dev
+
+Package: cheese
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gstreamer0.10-plugins-base,
+ gstreamer0.10-plugins-good
+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.