r28099 - in /desktop/experimental/nautilus/debian: changelog control control.in patches/03_deprecated.patch patches/12_list-view_expand.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun May 29 10:01:33 UTC 2011
Author: joss
Date: Sun May 29 10:01:33 2011
New Revision: 28099
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28099
Log:
* New upstream translation and bugfix release.
* Bump libnotify requirement.
* Reintroduce some nautilus 2.x patches.
+ 03_deprecated.patch: still necessary, refreshed.
+ 12_list-view_expand.patch: still necessary, file was renamed,
refreshed.
Added:
desktop/experimental/nautilus/debian/patches/03_deprecated.patch
- copied, changed from r27781, desktop/unstable/nautilus/debian/patches/03_deprecated.patch
desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch
- copied, changed from r27781, desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/control
desktop/experimental/nautilus/debian/control.in
desktop/experimental/nautilus/debian/patches/series
Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=28099&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Sun May 29 10:01:33 2011
@@ -1,4 +1,4 @@
-nautilus (3.0.0-2) UNRELEASED; urgency=low
+nautilus (3.0.2-1) UNRELEASED; urgency=low
* Rebuild against a cdbs+debhelper with dh_installgsettings.
Closes: #627477.
@@ -9,9 +9,15 @@
+ file-roller < 3.0
+ nautilus-sendto < 3
* Replace nautilus-sendto since it is now included in nautilus.
+ * New upstream translation and bugfix release.
* 00_do_not_require_unpackage_libexif.patch: dropped, we have the
latest libexif now.
+ Bump build-dependencies accordingly.
+ * Bump libnotify requirement.
+ * Reintroduce some nautilus 2.x patches.
+ + 03_deprecated.patch: still necessary, refreshed.
+ + 12_list-view_expand.patch: still necessary, file was renamed,
+ refreshed.
-- Josselin Mouette <joss at debian.org> Fri, 20 May 2011 16:21:46 +0200
Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=28099&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control [utf-8] Sun May 29 10:01:33 2011
@@ -21,7 +21,7 @@
libexif-dev (>= 0.6.20),
libexempi-dev (>= 1.99.5),
libdbus-glib-1-dev,
- libnotify-dev (>= 0.7),
+ libnotify-dev (>= 0.7.0),
intltool (>= 0.40.1),
gtk-doc-tools (>= 1.4),
libxt-dev,
Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=28099&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control.in [utf-8] Sun May 29 10:01:33 2011
@@ -16,7 +16,7 @@
libexif-dev (>= 0.6.20),
libexempi-dev (>= 1.99.5),
libdbus-glib-1-dev,
- libnotify-dev (>= 0.7),
+ libnotify-dev (>= 0.7.0),
intltool (>= 0.40.1),
gtk-doc-tools (>= 1.4),
libxt-dev,
Copied: desktop/experimental/nautilus/debian/patches/03_deprecated.patch (from r27781, desktop/unstable/nautilus/debian/patches/03_deprecated.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/03_deprecated.patch?rev=28099&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_deprecated.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/03_deprecated.patch [utf-8] Sun May 29 10:01:33 2011
@@ -1,10 +1,10 @@
-Index: nautilus-2.30.0/configure.in
+Index: nautilus-3.0.2/configure.in
===================================================================
---- nautilus-2.30.0.orig/configure.in 2010-03-29 10:30:52.000000000 +0200
-+++ nautilus-2.30.0/configure.in 2010-04-13 22:41:28.779710364 +0200
-@@ -339,7 +339,7 @@
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
- AC_SUBST(CORE_LIBS)
+--- nautilus-3.0.2.orig/configure.in 2011-05-24 20:49:07.000000000 +0200
++++ nautilus-3.0.2/configure.in 2011-05-29 11:34:17.862190932 +0200
+@@ -302,7 +302,7 @@ PKG_CHECK_MODULES(NAUTILUS, [
+ AC_SUBST(NAUTILUS_CFLAGS)
+ AC_SUBST(NAUTILUS_LIBS)
-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+DISABLE_DEPRECATED_CFLAGS=""
Copied: desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch (from r27781, desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch?rev=28099&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch [utf-8] Sun May 29 10:01:33 2011
@@ -1,18 +1,18 @@
Revert upstream commits r12779 and r13045.
We can do this because we fix GNOME #316087 in our GTK+ packages.
-Index: nautilus-2.30.0/src/file-manager/fm-list-view.c
+Index: nautilus-3.0.2/src/nautilus-list-view.c
===================================================================
---- nautilus-2.30.0.orig/src/file-manager/fm-list-view.c 2010-03-17 11:14:05.000000000 +0100
-+++ nautilus-2.30.0/src/file-manager/fm-list-view.c 2010-04-13 23:16:30.475711298 +0200
-@@ -58,7 +58,6 @@
- #include <libnautilus-private/nautilus-view-factory.h>
+--- nautilus-3.0.2.orig/src/nautilus-list-view.c 2011-05-24 20:46:25.000000000 +0200
++++ nautilus-3.0.2/src/nautilus-list-view.c 2011-05-29 11:45:29.713475420 +0200
+@@ -59,7 +59,6 @@
+ #include <libnautilus-private/nautilus-module.h>
+ #include <libnautilus-private/nautilus-tree-view-drag-dest.h>
#include <libnautilus-private/nautilus-clipboard.h>
- #include <libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h>
-#include <libnautilus-private/nautilus-cell-renderer-text-ellipsized.h>
- struct FMListViewDetails {
- GtkTreeView *tree_view;
-@@ -1478,7 +1477,7 @@
+ #define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
+ #include <libnautilus-private/nautilus-debug.h>
+@@ -1673,7 +1672,7 @@ create_and_set_up_tree_view (NautilusLis
for (l = nautilus_columns; l != NULL; l = l->next) {
NautilusColumn *nautilus_column;
@@ -21,7 +21,7 @@
char *name;
char *label;
float xalign;
-@@ -1501,6 +1500,9 @@
+@@ -1696,6 +1695,9 @@ create_and_set_up_tree_view (NautilusLis
view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
view->details->file_name_column = gtk_tree_view_column_new ();
@@ -31,8 +31,8 @@
g_object_ref_sink (view->details->file_name_column);
view->details->file_name_column_num = column_num;
-@@ -1521,7 +1523,11 @@
- "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN,
+@@ -1715,7 +1717,11 @@ create_and_set_up_tree_view (NautilusLis
+ "pixbuf", NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN,
NULL);
- cell = nautilus_cell_renderer_text_ellipsized_new ();
Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=28099&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/series [utf-8] Sun May 29 10:01:33 2011
@@ -1,0 +1,2 @@
+03_deprecated.patch
+12_list-view_expand.patch
More information about the pkg-gnome-commits
mailing list