diff -u cheese-2.21.5/debian/changelog cheese-2.21.5/debian/changelog --- cheese-2.21.5/debian/changelog +++ cheese-2.21.5/debian/changelog @@ -1,3 +1,9 @@ +cheese (2.21.5-0ubuntu2) hardy; urgency=low + + * Rebase cheese.hildon.glade on current cheese.glade [LP: #185669] + + -- Steve Magoun Wed, 23 Jan 2008 15:01:16 -0500 + cheese (2.21.5-0ubuntu1) hardy; urgency=low [ Steve Stalcup ] diff -u cheese-2.21.5/debian/patches/40_hildon.patch cheese-2.21.5/debian/patches/40_hildon.patch --- cheese-2.21.5/debian/patches/40_hildon.patch +++ cheese-2.21.5/debian/patches/40_hildon.patch @@ -1,8 +1,6 @@ -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/cheese-config.h.in cheese-2.21.5.new/cheese-config.h.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/configure cheese-2.21.5.new/configure -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/configure.ac cheese-2.21.5.new/configure.ac ---- cheese-2.21.5/configure.ac 2008-01-23 18:31:27.000000000 +0100 -+++ cheese-2.21.5.new/configure.ac 2008-01-23 18:32:12.000000000 +0100 +diff -Nur cheese-2.21.5/configure.ac cheese-2.21.5.new/configure.ac +--- cheese-2.21.5/configure.ac 2008-01-14 12:21:27.000000000 -0500 ++++ cheese-2.21.5.new/configure.ac 2008-01-23 15:00:33.000000000 -0500 @@ -73,6 +73,24 @@ AC_SUBST(CHEESE_LIBS) @@ -28,630 +26,374 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/cheese.hildon.glade cheese-2.21.5.new/data/cheese.hildon.glade ---- cheese-2.21.5/data/cheese.hildon.glade 1970-01-01 01:00:00.000000000 +0100 -+++ cheese-2.21.5.new/data/cheese.hildon.glade 2008-01-23 18:31:37.000000000 +0100 -@@ -0,0 +1,609 @@ -+ -+ -+ +diff -Nur cheese-2.21.5/data/cheese.hildon.glade cheese-2.21.5.new/data/cheese.hildon.glade +--- cheese-2.21.5/data/cheese.hildon.glade 1969-12-31 19:00:00.000000000 -0500 ++++ cheese-2.21.5.new/data/cheese.hildon.glade 2008-01-23 15:01:00.000000000 -0500 +@@ -0,0 +1,361 @@ ++ ++ ++ + -+ -+ -+ True -+ -+ -+ -+ True -+ False -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ True -+ False -+ 0 -+ -+ -+ -+ 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 -+ -+ -+ -+ -+ -+ -+ False -+ True -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ -+ -+ 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 -+ False -+ False -+ -+ -+ -+ 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 -+ False -+ False -+ -+ -+ -+ 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 -+ _Take a photo -+ 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_AUTOMATIC -+ GTK_SHADOW_NONE -+ GTK_CORNER_TOP_LEFT -+ -+ -+ -+ -+ -+ -+ 0 -+ True -+ True -+ -+ -+ -+ -+ 0 -+ True -+ True -+ GTK_PACK_END -+ -+ -+ -+ -+ -+ ++ ++ True ++ ++ ++ True ++ ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ False ++ False ++ ++ ++ True ++ 0 ++ GTK_SHADOW_NONE ++ 1.3300000429153442 ++ False ++ ++ ++ 320 ++ 240 ++ True ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ ++ tab ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ GTK_SHADOW_NONE ++ 1.3300000429153442 ++ False ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ GTK_SHADOW_NONE ++ 1.3300000429153442 ++ False ++ ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ False ++ False ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ camera-photo ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Photo ++ True ++ True ++ button_photo ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ camera-video ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Video ++ True ++ True ++ button_video ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-media-record ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ _Take a photo ++ True ++ True ++ take_picture ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ 16 ++ 1 ++ ++ ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 0 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 2 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ applications-graphics ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ _Effects ++ True ++ True ++ button_effects ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 40 ++ GTK_PACK_END ++ 2 ++ ++ ++ ++ ++ ++ ++ ++ tab ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ tab ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK ++ GTK_POLICY_NEVER ++ GTK_POLICY_AUTOMATIC ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ + -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/effects/Makefile.in cheese-2.21.5.new/data/effects/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/16x16/Makefile.in cheese-2.21.5.new/data/icons/16x16/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/22x22/Makefile.in cheese-2.21.5.new/data/icons/22x22/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/24x24/Makefile.in cheese-2.21.5.new/data/icons/24x24/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/32x32/Makefile.in cheese-2.21.5.new/data/icons/32x32/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/48x48/Makefile.in cheese-2.21.5.new/data/icons/48x48/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/Makefile.in cheese-2.21.5.new/data/icons/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/icons/scalable/Makefile.in cheese-2.21.5.new/data/icons/scalable/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/Makefile.am cheese-2.21.5.new/data/Makefile.am ---- cheese-2.21.5/data/Makefile.am 2008-01-23 18:31:27.000000000 +0100 -+++ cheese-2.21.5.new/data/Makefile.am 2008-01-23 18:31:37.000000000 +0100 +diff -Nur cheese-2.21.5/data/Makefile.am cheese-2.21.5.new/data/Makefile.am +--- cheese-2.21.5/data/Makefile.am 2008-01-14 12:21:26.000000000 -0500 ++++ cheese-2.21.5.new/data/Makefile.am 2008-01-23 15:00:33.000000000 -0500 @@ -15,6 +15,10 @@ cheese.glade \ cheese-ui.xml @@ -663,14 +405,9 @@ EXTRA_DIST = \ $(desktop_in_files) \ $(schema_in_files) \ -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/Makefile.in cheese-2.21.5.new/data/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/pixmaps/Makefile.in cheese-2.21.5.new/data/pixmaps/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/data/sounds/Makefile.in cheese-2.21.5.new/data/sounds/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/help/Makefile.in cheese-2.21.5.new/help/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/Makefile.in cheese-2.21.5.new/Makefile.in -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/src/cheese-fileutil.c cheese-2.21.5.new/src/cheese-fileutil.c ---- cheese-2.21.5/src/cheese-fileutil.c 2008-01-23 18:31:27.000000000 +0100 -+++ cheese-2.21.5.new/src/cheese-fileutil.c 2008-01-23 18:31:37.000000000 +0100 +diff -Nur cheese-2.21.5/src/cheese-fileutil.c cheese-2.21.5.new/src/cheese-fileutil.c +--- cheese-2.21.5/src/cheese-fileutil.c 2008-01-14 12:21:25.000000000 -0500 ++++ cheese-2.21.5.new/src/cheese-fileutil.c 2008-01-23 15:00:33.000000000 -0500 @@ -34,7 +34,12 @@ char *path; @@ -684,9 +421,9 @@ return path; } -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/src/cheese-thumb-view.c cheese-2.21.5.new/src/cheese-thumb-view.c ---- cheese-2.21.5/src/cheese-thumb-view.c 2008-01-23 18:31:27.000000000 +0100 -+++ cheese-2.21.5.new/src/cheese-thumb-view.c 2008-01-23 18:31:37.000000000 +0100 +diff -Nur cheese-2.21.5/src/cheese-thumb-view.c cheese-2.21.5.new/src/cheese-thumb-view.c +--- cheese-2.21.5/src/cheese-thumb-view.c 2008-01-14 12:21:25.000000000 -0500 ++++ cheese-2.21.5.new/src/cheese-thumb-view.c 2008-01-23 15:00:33.000000000 -0500 @@ -364,7 +364,11 @@ gnome_vfs_uri_unref (uri); @@ -699,9 +436,9 @@ gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (thumb_view), GDK_BUTTON1_MASK, target_table, G_N_ELEMENTS (target_table), -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/src/cheese-window.c cheese-2.21.5.new/src/cheese-window.c ---- cheese-2.21.5/src/cheese-window.c 2008-01-23 18:31:27.000000000 +0100 -+++ cheese-2.21.5.new/src/cheese-window.c 2008-01-23 18:31:37.000000000 +0100 +diff -Nur cheese-2.21.5/src/cheese-window.c cheese-2.21.5.new/src/cheese-window.c +--- cheese-2.21.5/src/cheese-window.c 2008-01-14 12:21:25.000000000 -0500 ++++ cheese-2.21.5.new/src/cheese-window.c 2008-01-23 15:00:33.000000000 -0500 @@ -30,6 +30,10 @@ #include #include @@ -784 +520,0 @@ -diff -Nur -x '*.orig' -x '*~' cheese-2.21.5/src/Makefile.in cheese-2.21.5.new/src/Makefile.in