diff -Nru gnome-shell-3.4.1/debian/changelog gnome-shell-3.4.1/debian/changelog --- gnome-shell-3.4.1/debian/changelog 2012-04-18 04:40:20.000000000 +0000 +++ gnome-shell-3.4.1/debian/changelog 2012-05-19 10:04:07.000000000 +0000 @@ -1,11 +1,27 @@ -gnome-shell (3.4.1-0ubuntu2) precise-proposed; urgency=low +gnome-shell (3.4.1-0ubuntu2.1~stracciatellappa+precise1) precise; urgency=low + [ Ubuntu ] * 10-make-NetworkManager-optional.patch: - Disabled, it doesn't work right and isn't used for Ubuntu architectures anyway. * Refreshed patches - -- Jeremy Bicha Wed, 18 Apr 2012 00:34:57 -0400 + [ Stracciatella PPA ] + * Rebuild for gnome stracciatella ppa + * debian/patches + - disabled the following patches: + 20_revert_gcr_depend.patch, + 21_revert_evolution_gsettings.patch, + 30_use-glx-if-cogl-supports.patch, + 31_don-t-link-directly-to-libGL.patch, + 32_remove-shell-screen-grabber.patch, + 33_remove_glx_headers.patch + * debian/control + - updated build-depend to libecal1.2-dev, libedataserver1.2-dev, + libedataserverui-3.0-dev to 3.4.0 + - added Depends to gir1.2-gcr-3 + + -- Gianvito Cavasoli Fri, 11 May 2012 10:20:59 +0200 gnome-shell (3.4.1-0ubuntu1) precise-proposed; urgency=low diff -Nru gnome-shell-3.4.1/debian/control gnome-shell-3.4.1/debian/control --- gnome-shell-3.4.1/debian/control 2012-04-18 04:40:22.000000000 +0000 +++ gnome-shell-3.4.1/debian/control 2012-05-19 10:04:42.000000000 +0000 @@ -23,9 +23,9 @@ libclutter-1.0-dev (>= 1.9.11), libcroco3-dev (>= 0.6), libdbus-glib-1-dev, - libecal1.2-dev (>= 2.32.0), - libedataserver1.2-dev (>= 3.2.0), - libedataserverui-3.0-dev (>= 3.2.0), + libecal1.2-dev (>= 3.4.0), + libedataserver1.2-dev (>= 3.4.0), + libedataserverui-3.0-dev (>= 3.4.0), libfolks-dev (>= 0.5.2), libgconf2-dev, libgirepository1.0-dev (>= 1.29.15), @@ -48,7 +48,8 @@ libx11-dev, libxfixes-dev, libxml2-dev, - python (>= 2.6) + python (>= 2.6), + libgcr-3-dev (>= 3.3.90) Standards-Version: 3.9.3 Homepage: http://live.gnome.org/GnomeShell Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell @@ -79,6 +80,7 @@ gir1.2-telepathyglib-0.12, gir1.2-telepathylogger-0.2, gir1.2-upowerglib-1.0, + gir1.2-gcr-3, gjs (>= 1.30), gnome-icon-theme-symbolic (>= 2.91), gnome-settings-daemon (>= 2.91.5.1), diff -Nru gnome-shell-3.4.1/debian/control.in gnome-shell-3.4.1/debian/control.in --- gnome-shell-3.4.1/debian/control.in 2012-04-18 04:40:20.000000000 +0000 +++ gnome-shell-3.4.1/debian/control.in 2012-05-19 10:04:20.000000000 +0000 @@ -18,9 +18,9 @@ libclutter-1.0-dev (>= 1.9.11), libcroco3-dev (>= 0.6), libdbus-glib-1-dev, - libecal1.2-dev (>= 2.32.0), - libedataserver1.2-dev (>= 3.2.0), - libedataserverui-3.0-dev (>= 3.2.0), + libecal1.2-dev (>= 3.4.0), + libedataserver1.2-dev (>= 3.4.0), + libedataserverui-3.0-dev (>= 3.4.0), libfolks-dev (>= 0.5.2), libgconf2-dev, libgirepository1.0-dev (>= 1.29.15), @@ -43,7 +43,8 @@ libx11-dev, libxfixes-dev, libxml2-dev, - python (>= 2.6) + python (>= 2.6), + libgcr-3-dev (>= 3.3.90) Standards-Version: 3.9.3 Homepage: http://live.gnome.org/GnomeShell Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell @@ -74,6 +75,7 @@ gir1.2-telepathyglib-0.12, gir1.2-telepathylogger-0.2, gir1.2-upowerglib-1.0, + gir1.2-gcr-3, gjs (>= 1.30), gnome-icon-theme-symbolic (>= 2.91), gnome-settings-daemon (>= 2.91.5.1), diff -Nru gnome-shell-3.4.1/debian/patches/31_don-t-link-directly-to-libGL.patch gnome-shell-3.4.1/debian/patches/31_don-t-link-directly-to-libGL.patch --- gnome-shell-3.4.1/debian/patches/31_don-t-link-directly-to-libGL.patch 2012-04-18 04:40:20.000000000 +0000 +++ gnome-shell-3.4.1/debian/patches/31_don-t-link-directly-to-libGL.patch 2012-05-12 09:20:39.000000000 +0000 @@ -9,10 +9,10 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/935124 Forwarded: not-needed -Index: gnome-shell-3.3.92/configure.ac +Index: gnome-shell-3.4.1/configure.ac =================================================================== ---- gnome-shell-3.3.92.orig/configure.ac 2012-03-23 19:16:57.906433028 -0300 -+++ gnome-shell-3.3.92/configure.ac 2012-03-23 19:17:24.762566200 -0300 +--- gnome-shell-3.4.1.orig/configure.ac 2012-05-12 11:19:08.680669096 +0200 ++++ gnome-shell-3.4.1/configure.ac 2012-05-12 11:19:47.281186524 +0200 @@ -50,7 +50,7 @@ AC_MSG_RESULT(yes) build_recorder=true @@ -22,7 +22,7 @@ else AC_MSG_RESULT(no) fi -@@ -81,7 +81,6 @@ +@@ -82,7 +82,6 @@ gjs-internals-1.0 >= $GJS_MIN_VERSION libgnome-menu-3.0 $recorder_modules gdk-x11-3.0 libsoup-2.4 diff -Nru gnome-shell-3.4.1/debian/patches/32_remove-shell-screen-grabber.patch gnome-shell-3.4.1/debian/patches/32_remove-shell-screen-grabber.patch --- gnome-shell-3.4.1/debian/patches/32_remove-shell-screen-grabber.patch 2012-04-18 04:40:20.000000000 +0000 +++ gnome-shell-3.4.1/debian/patches/32_remove-shell-screen-grabber.patch 2012-05-12 09:23:09.000000000 +0000 @@ -22,8 +22,8 @@ Index: gnome-shell-3.4.1/src/shell-recorder.c =================================================================== ---- gnome-shell-3.4.1.orig/src/shell-recorder.c 2012-04-18 00:32:10.401009216 -0400 -+++ gnome-shell-3.4.1/src/shell-recorder.c 2012-04-18 00:32:42.185166830 -0400 +--- gnome-shell-3.4.1.orig/src/shell-recorder.c 2012-03-01 17:19:56.000000000 +0100 ++++ gnome-shell-3.4.1/src/shell-recorder.c 2012-05-12 11:22:55.157837742 +0200 @@ -12,7 +12,6 @@ #include "shell-recorder-src.h" @@ -77,7 +77,7 @@ GST_BUFFER_SIZE(buffer) = size; Index: gnome-shell-3.4.1/src/shell-screen-grabber.c =================================================================== ---- gnome-shell-3.4.1.orig/src/shell-screen-grabber.c 2012-04-18 00:32:10.421009317 -0400 +--- gnome-shell-3.4.1.orig/src/shell-screen-grabber.c 2012-03-02 13:28:41.000000000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,210 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ @@ -292,7 +292,7 @@ -} Index: gnome-shell-3.4.1/src/shell-screen-grabber.h =================================================================== ---- gnome-shell-3.4.1.orig/src/shell-screen-grabber.h 2012-04-18 00:32:10.409009257 -0400 +--- gnome-shell-3.4.1.orig/src/shell-screen-grabber.h 2012-01-31 16:47:19.000000000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ @@ -341,8 +341,8 @@ -#endif /* __SHELL_SCREEN_GRABBER_H__ */ Index: gnome-shell-3.4.1/src/shell-screenshot.c =================================================================== ---- gnome-shell-3.4.1.orig/src/shell-screenshot.c 2012-04-18 00:32:10.437009394 -0400 -+++ gnome-shell-3.4.1/src/shell-screenshot.c 2012-04-18 00:32:42.189166844 -0400 +--- gnome-shell-3.4.1.orig/src/shell-screenshot.c 2012-04-10 20:14:57.000000000 +0200 ++++ gnome-shell-3.4.1/src/shell-screenshot.c 2012-05-12 11:22:55.158837730 +0200 @@ -1,5 +1,8 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ @@ -404,15 +404,3 @@ } static void -Index: gnome-shell-3.4.1/src/Makefile.am -=================================================================== ---- gnome-shell-3.4.1.orig/src/Makefile.am 2012-04-18 00:31:34.000000000 -0400 -+++ gnome-shell-3.4.1/src/Makefile.am 2012-04-18 00:33:14.033324755 -0400 -@@ -164,7 +164,6 @@ - shell-polkit-authentication-agent.h \ - shell-polkit-authentication-agent.c \ - shell-screenshot.c \ -- shell-screen-grabber.c \ - shell-slicer.c \ - shell-stack.c \ - shell-tp-client.c \ diff -Nru gnome-shell-3.4.1/debian/patches/series gnome-shell-3.4.1/debian/patches/series --- gnome-shell-3.4.1/debian/patches/series 2012-04-18 04:40:20.000000000 +0000 +++ gnome-shell-3.4.1/debian/patches/series 2012-05-13 16:40:09.000000000 +0000 @@ -1,8 +1,8 @@ #10-make-NetworkManager-optional.patch 11-no-gettext.patch -20_revert_gcr_depend.patch -21_revert_evolution_gsettings.patch -30_use-glx-if-cogl-supports.patch -31_don-t-link-directly-to-libGL.patch -32_remove-shell-screen-grabber.patch -33_remove_glx_headers.patch +#20_revert_gcr_depend.patch +#21_revert_evolution_gsettings.patch +#30_use-glx-if-cogl-supports.patch +#31_don-t-link-directly-to-libGL.patch +#32_remove-shell-screen-grabber.patch +#33_remove_glx_headers.patch