diff -Nru gnome-utils-3.2.1/debian/changelog gnome-utils-3.2.1/debian/changelog --- gnome-utils-3.2.1/debian/changelog 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/changelog 2012-02-06 18:57:02.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-utils (3.2.1-0ubuntu4) precise; urgency=low + + * Dropped gnome-screenshot binary, it's shipped in a new source + starting this cycle + + -- Sebastien Bacher Mon, 06 Feb 2012 19:53:50 +0100 + gnome-utils (3.2.1-0ubuntu3) precise; urgency=low * debian/gnome-system-log.gsettings-override: diff -Nru gnome-utils-3.2.1/debian/control gnome-utils-3.2.1/debian/control --- gnome-utils-3.2.1/debian/control 2012-01-25 11:24:05.000000000 +0000 +++ gnome-utils-3.2.1/debian/control 2012-02-06 18:57:04.000000000 +0000 @@ -108,19 +108,6 @@ . It also contains a GNOME panel applet for that effect. -Package: gnome-screenshot -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gnome-utils-common (>= ${gnome:Version}), - gnome-utils-common (<< ${gnome:NextVersion}) -Recommends: nautilus -Conflicts: gnome-utils (<< 2.30.0-2) -Replaces: gnome-utils (<< 2.30.0-2) -Description: screenshot application for GNOME - This tool takes a picture of the desktop or of a window and saves it - into a file. - Package: gnome-search-tool Architecture: any Depends: ${shlibs:Depends}, diff -Nru gnome-utils-3.2.1/debian/control.in gnome-utils-3.2.1/debian/control.in --- gnome-utils-3.2.1/debian/control.in 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/control.in 2012-02-06 18:57:02.000000000 +0000 @@ -103,19 +103,6 @@ . It also contains a GNOME panel applet for that effect. -Package: gnome-screenshot -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gnome-utils-common (>= ${gnome:Version}), - gnome-utils-common (<< ${gnome:NextVersion}) -Recommends: nautilus -Conflicts: gnome-utils (<< 2.30.0-2) -Replaces: gnome-utils (<< 2.30.0-2) -Description: screenshot application for GNOME - This tool takes a picture of the desktop or of a window and saves it - into a file. - Package: gnome-search-tool Architecture: any Depends: ${shlibs:Depends}, diff -Nru gnome-utils-3.2.1/debian/gnome-screenshot.install gnome-utils-3.2.1/debian/gnome-screenshot.install --- gnome-utils-3.2.1/debian/gnome-screenshot.install 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/gnome-screenshot.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -debian/tmp/usr/bin/gnome*-screenshot -debian/tmp/usr/share/applications/gnome-screenshot.desktop -debian/tmp/usr/share/gnome-screenshot -debian/tmp/usr/share/man/man1/gnome-screenshot.1 -debian/tmp/usr/share/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml -debian/tmp/usr/share/GConf/gsettings/gnome-screenshot.convert diff -Nru gnome-utils-3.2.1/debian/gnome-screenshot.menu gnome-utils-3.2.1/debian/gnome-screenshot.menu --- gnome-utils-3.2.1/debian/gnome-screenshot.menu 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/gnome-screenshot.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -?package(gnome-screenshot):needs="X11" \ - section="Applications/Graphics" \ - title="GNOME Screenshot Tool" command="/usr/bin/gnome-panel-screenshot" \ - hints="Gnome" - diff -Nru gnome-utils-3.2.1/debian/patches/02_add_unity_quicklist_support.patch gnome-utils-3.2.1/debian/patches/02_add_unity_quicklist_support.patch --- gnome-utils-3.2.1/debian/patches/02_add_unity_quicklist_support.patch 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/patches/02_add_unity_quicklist_support.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Add Unity static quicklist support to gnome-screenshot -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=642567 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/720610 -Author: Didier Roche - -Index: gnome-utils-2.32.0/gnome-screenshot/gnome-screenshot.desktop.in -=================================================================== ---- gnome-utils-2.32.0.orig/gnome-screenshot/gnome-screenshot.desktop.in 2011-02-17 13:47:36.332538207 +0100 -+++ gnome-utils-2.32.0/gnome-screenshot/gnome-screenshot.desktop.in 2011-02-17 13:55:09.014782941 +0100 -@@ -12,3 +12,14 @@ - X-GNOME-Bugzilla-Product=gnome-utils - X-GNOME-Bugzilla-Component=screenshot - X-GNOME-Bugzilla-OtherBinaries=gnome-panel-screenshot -+X-Ayatana-Desktop-Shortcuts=Screen;Window -+ -+[Screen Shortcut Group] -+_Name=Take a screenshot of the whole screen -+Exec=gnome-screenshot -+TargetEnvironment=Unity -+ -+[Window Shortcut Group] -+_Name=Take a screenshot of the current window -+Exec=gnome-screenshot -w -+TargetEnvironment=Unity diff -Nru gnome-utils-3.2.1/debian/patches/08_use-ubuntu-help.patch gnome-utils-3.2.1/debian/patches/08_use-ubuntu-help.patch --- gnome-utils-3.2.1/debian/patches/08_use-ubuntu-help.patch 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/patches/08_use-ubuntu-help.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Use Ubuntu Help -Author: Jeremy Bicha -Index: gnome-utils-3.2.1/gnome-screenshot/gnome-screenshot.c -=================================================================== ---- gnome-utils-3.2.1.orig/gnome-screenshot/gnome-screenshot.c 2011-10-17 16:10:18.000000000 +0200 -+++ gnome-utils-3.2.1/gnome-screenshot/gnome-screenshot.c 2011-10-17 18:20:08.698565386 +0200 -@@ -128,7 +128,7 @@ - GError *error = NULL; - - gtk_show_uri (gtk_window_get_screen (parent), -- "help:gnome-help/screen-shot-record", -+ "help:ubuntu-help/screen-shot-record", - gtk_get_current_event_time (), &error); - - if (error) diff -Nru gnome-utils-3.2.1/debian/patches/series gnome-utils-3.2.1/debian/patches/series --- gnome-utils-3.2.1/debian/patches/series 2012-01-25 11:24:04.000000000 +0000 +++ gnome-utils-3.2.1/debian/patches/series 2012-02-06 18:57:02.000000000 +0000 @@ -1,9 +1,8 @@ 01_maintainer_mode.patch -02_add_unity_quicklist_support.patch 04_lpi.patch 05_menu_changes.patch fix_armel_cast_align_warning.patch 07_es.dict.org-isdead.patch -08_use-ubuntu-help.patch 09_deprecated_g_thread_init.patch 10_build_freetype_fix.patch +