r17684 - in /desktop/experimental/nautilus/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Nov 23 23:08:19 UTC 2008
Author: joss
Date: Sun Nov 23 23:08:18 2008
New Revision: 17684
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17684
Log:
* Update (build-)dependencies according to the new version.
* Add Breaks in libnautilus-extension1 against all packages that use
the old API.
* 12_list-view_expand.patch, 14_sidebar_network-protocol.patch:
refreshed.
* Update shlibs version to 2.23.1.
* Only require gvfs (>= 1.0.2), only recommend gvfs-backends.
* Stop recommending fam, gio does not support it correctly.
* Remove useless dh_strip argument overloading.
* 01_manpage.patch: fix whatis entry in nautilus-connect-server.1.
* Install upstream manpages in nautilus.
* Install the documentation for libnautilus-extension.
Added:
desktop/experimental/nautilus/debian/patches/01_manpage.patch
Removed:
desktop/experimental/nautilus/debian/nautilus-connect-server.1
desktop/experimental/nautilus/debian/nautilus-file-management-properties.1
desktop/experimental/nautilus/debian/nautilus.1
desktop/experimental/nautilus/debian/nautilus.manpages
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/control
desktop/experimental/nautilus/debian/control.in
desktop/experimental/nautilus/debian/libnautilus-extension-dev.install
desktop/experimental/nautilus/debian/nautilus.install
desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch
desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch
desktop/experimental/nautilus/debian/patches/series
desktop/experimental/nautilus/debian/rules
Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Sun Nov 23 23:08:18 2008
@@ -1,10 +1,25 @@
-nautilus (2.24.0-1) UNRELEASED; urgency=low
-
+nautilus (2.24.1-1) experimental; urgency=low
+
+ [ Gustavo Noronha Silva ]
* New upstream release
* debian/patches/20_open-with_install.patch:
- updated to the new version
- -- Gustavo Noronha Silva <kov at debian.org> Tue, 23 Sep 2008 00:05:26 -0300
+ [ Josselin Mouette ]
+ * Update (build-)dependencies according to the new version.
+ * Add Breaks in libnautilus-extension1 against all packages that use
+ the old API.
+ * 12_list-view_expand.patch, 14_sidebar_network-protocol.patch:
+ refreshed.
+ * Update shlibs version to 2.23.1.
+ * Only require gvfs (>= 1.0.2), only recommend gvfs-backends.
+ * Stop recommending fam, gio does not support it correctly.
+ * Remove useless dh_strip argument overloading.
+ * 01_manpage.patch: fix whatis entry in nautilus-connect-server.1.
+ * Install upstream manpages in nautilus.
+ * Install the documentation for libnautilus-extension.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 23 Nov 2008 23:39:28 +0100
nautilus (2.22.5.1-1) experimental; urgency=low
Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control (original)
+++ desktop/experimental/nautilus/debian/control Sun Nov 23 23:08:18 2008
@@ -6,34 +6,35 @@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
- gettext,
- libgtk2.0-dev (>= 2.11.6),
- libgnomeui-dev (>= 2.16.0-2),
- libbonobo2-dev (>= 2.15),
- libeel2-dev (>= 2.21.90),
- librsvg2-dev (>= 2.16.0-2),
- libgnome-desktop-dev (>= 2.9.91),
- libgconf2-dev (>= 2.6.1-2),
- librsvg2-common (>= 2.16.0-2),
- desktop-base (>= 0.2),
- libxml-parser-perl,
gnome-pkg-tools (>= 0.13),
dpkg-dev (>= 1.13.19),
- libxt-dev,
- libexif-dev (>= 0.6.12),
- liborbit2-dev (>= 2.4.0),
+ libbonobo2-dev (>= 2.1.0),
+ libeel2-dev (>= 2.24.0),
+ libglib2.0-dev (>= 2.17.5),
+ libgnome-desktop-dev (>= 2.9.91),
+ libgnome2-dev (>= 2.14.0),
+ libgnomeui-dev (>= 2.6.0),
+ liborbit2-dev (>= 1:2.4.0),
+ libpango1.0-dev (>= 1.1.2),
+ libgtk2.0-dev (>= 2.13.0),
+ librsvg2-dev (>= 2.16.0-2),
+ librsvg2-common (>= 2.16.0-2),
libxml2-dev (>= 2.4.7),
libstartup-notification0-dev (>= 0.8),
- docbook-utils,
+ libexif-dev (>= 0.6.12),
+ libbeagle-dev (>= 0.2.4),
+ libtrackerclient-dev (>= 0.0.1),
+ libexempi-dev (>= 1.99.5),
+ gettext,
+ intltool (>= 0.35.0),
+ libxt-dev,
+ libx11-dev,
libselinux1-dev | not+linux-gnu,
- libglib2.0-dev (>= 2.15.6),
- libgnome2-dev (>= 2.14.0),
- libpango1.0-dev (>= 1.1.2),
x11proto-core-dev,
- libtrackerclient-dev (>= 0.0.1),
- libbeagle-dev,
- libexempi-dev (>= 1.99.5),
- intltool (>= 0.35.0)
+ libgconf2-dev,
+ shared-mime-info,
+ desktop-base (>= 0.2),
+ docbook-utils
Homepage: http://www.gnome.org/projects/nautilus/
VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/
VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/nautilus/
@@ -48,20 +49,20 @@
shared-mime-info,
gnome-control-center (>= 2.6),
desktop-file-utils (>= 0.7),
- gvfs-backends
+ gvfs (>= 1.0.2)
Provides: nautilus-extensions-2.0
Recommends: desktop-base (>= 0.2),
eject,
- nautilus-cd-burner (>= 2.6),
+ nautilus-cd-burner (>= ${gnome:Version}),
librsvg2-common,
xdg-user-dirs,
synaptic,
- app-install-data
+ app-install-data,
+ gvfs-backends
Suggests: eog,
evince | pdf-viewer,
totem | mp3-decoder,
- tracker,
- fam
+ tracker
Conflicts: libnautilus2-2,
libnautilus2-dev
Replaces: libnautilus2-2
@@ -97,6 +98,14 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Conflicts: libnautilus2-2
+Breaks: gnome-mount (<< 0.8),
+ nautilus-cd-burner (<< 2.22),
+ file-roller (<< 2.24),
+ python-nautilus (<< 0.5),
+ nautilus-sendto (<< 0.14.0-2),
+ nautilus-open-terminal (<< 0.9),
+ nautilus-image-converter (<< 0.3),
+ nautilus-filename-repairer (<< 0.0.5-2)
Replaces: libnautilus2-2
Description: libraries for nautilus components - runtime version
Nautilus is the official file manager and graphical shell for the
@@ -108,8 +117,8 @@
Architecture: any
Section: libdevel
Depends: libnautilus-extension1 (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.6),
- libgtk2.0-dev (>= 2.10.0),
+ libglib2.0-dev (>= 2.17.5),
+ libgtk2.0-dev (>= 2.13.0),
${shlibs:Depends}
Conflicts: libnautilus2-dev
Replaces: libnautilus2-dev
Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in (original)
+++ desktop/experimental/nautilus/debian/control.in Sun Nov 23 23:08:18 2008
@@ -6,34 +6,35 @@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
- gettext,
- libgtk2.0-dev (>= 2.11.6),
- libgnomeui-dev (>= 2.16.0-2),
- libbonobo2-dev (>= 2.15),
- libeel2-dev (>= 2.21.90),
- librsvg2-dev (>= 2.16.0-2),
- libgnome-desktop-dev (>= 2.9.91),
- libgconf2-dev (>= 2.6.1-2),
- librsvg2-common (>= 2.16.0-2),
- desktop-base (>= 0.2),
- libxml-parser-perl,
gnome-pkg-tools (>= 0.13),
dpkg-dev (>= 1.13.19),
- libxt-dev,
- libexif-dev (>= 0.6.12),
- liborbit2-dev (>= 2.4.0),
+ libbonobo2-dev (>= 2.1.0),
+ libeel2-dev (>= 2.24.0),
+ libglib2.0-dev (>= 2.17.5),
+ libgnome-desktop-dev (>= 2.9.91),
+ libgnome2-dev (>= 2.14.0),
+ libgnomeui-dev (>= 2.6.0),
+ liborbit2-dev (>= 1:2.4.0),
+ libpango1.0-dev (>= 1.1.2),
+ libgtk2.0-dev (>= 2.13.0),
+ librsvg2-dev (>= 2.16.0-2),
+ librsvg2-common (>= 2.16.0-2),
libxml2-dev (>= 2.4.7),
libstartup-notification0-dev (>= 0.8),
- docbook-utils,
+ libexif-dev (>= 0.6.12),
+ libbeagle-dev (>= 0.2.4),
+ libtrackerclient-dev (>= 0.0.1),
+ libexempi-dev (>= 1.99.5),
+ gettext,
+ intltool (>= 0.35.0),
+ libxt-dev,
+ libx11-dev,
libselinux1-dev | not+linux-gnu,
- libglib2.0-dev (>= 2.15.6),
- libgnome2-dev (>= 2.14.0),
- libpango1.0-dev (>= 1.1.2),
x11proto-core-dev,
- libtrackerclient-dev (>= 0.0.1),
- libbeagle-dev,
- libexempi-dev (>= 1.99.5),
- intltool (>= 0.35.0)
+ libgconf2-dev,
+ shared-mime-info,
+ desktop-base (>= 0.2),
+ docbook-utils
Homepage: http://www.gnome.org/projects/nautilus/
VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/
VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/nautilus/
@@ -48,20 +49,20 @@
shared-mime-info,
gnome-control-center (>= 2.6),
desktop-file-utils (>= 0.7),
- gvfs-backends
+ gvfs (>= 1.0.2)
Provides: nautilus-extensions-2.0
Recommends: desktop-base (>= 0.2),
eject,
- nautilus-cd-burner (>= 2.6),
+ nautilus-cd-burner (>= ${gnome:Version}),
librsvg2-common,
xdg-user-dirs,
synaptic,
- app-install-data
+ app-install-data,
+ gvfs-backends
Suggests: eog,
evince | pdf-viewer,
totem | mp3-decoder,
- tracker,
- fam
+ tracker
Conflicts: libnautilus2-2,
libnautilus2-dev
Replaces: libnautilus2-2
@@ -97,6 +98,14 @@
Depends: ${misc:Depends},
${shlibs:Depends}
Conflicts: libnautilus2-2
+Breaks: gnome-mount (<< 0.8),
+ nautilus-cd-burner (<< 2.22),
+ file-roller (<< 2.24),
+ python-nautilus (<< 0.5),
+ nautilus-sendto (<< 0.14.0-2),
+ nautilus-open-terminal (<< 0.9),
+ nautilus-image-converter (<< 0.3),
+ nautilus-filename-repairer (<< 0.0.5-2)
Replaces: libnautilus2-2
Description: libraries for nautilus components - runtime version
Nautilus is the official file manager and graphical shell for the
@@ -108,8 +117,8 @@
Architecture: any
Section: libdevel
Depends: libnautilus-extension1 (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.6),
- libgtk2.0-dev (>= 2.10.0),
+ libglib2.0-dev (>= 2.17.5),
+ libgtk2.0-dev (>= 2.13.0),
${shlibs:Depends}
Conflicts: libnautilus2-dev
Replaces: libnautilus2-dev
Modified: desktop/experimental/nautilus/debian/libnautilus-extension-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/libnautilus-extension-dev.install?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/libnautilus-extension-dev.install (original)
+++ desktop/experimental/nautilus/debian/libnautilus-extension-dev.install Sun Nov 23 23:08:18 2008
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/libnautilus-extension*.so
debian/tmp/usr/include
debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc
Modified: desktop/experimental/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/nautilus.install?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/nautilus.install (original)
+++ desktop/experimental/nautilus/debian/nautilus.install Sun Nov 23 23:08:18 2008
@@ -1,2 +1,3 @@
debian/tmp/usr/bin
debian/tmp/usr/share/applications
+debian/tmp/usr/share/man
Added: desktop/experimental/nautilus/debian/patches/01_manpage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/01_manpage.patch?rev=17684&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/01_manpage.patch (added)
+++ desktop/experimental/nautilus/debian/patches/01_manpage.patch Sun Nov 23 23:08:18 2008
@@ -1,0 +1,13 @@
+Index: nautilus-2.24.1/docs/nautilus-connect-server.1
+===================================================================
+--- nautilus-2.24.1.orig/docs/nautilus-connect-server.1 2008-11-24 00:03:41.626383939 +0100
++++ nautilus-2.24.1/docs/nautilus-connect-server.1 2008-11-24 00:03:50.316281888 +0100
+@@ -16,7 +16,7 @@
+ .\" .sp <n> insert n+1 empty lines
+ .\" for manpage-specific macros, see man(7)
+ .SH NAME
+-Nautilus Connect Server \- To Access a remote server
++nautilus-connect-server \- To Access a remote server
+ .SH SYNOPSIS
+ .B nautilus-connect-server
+ .RI [ options ]
Modified: desktop/experimental/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=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch (original)
+++ desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch Sun Nov 23 23:08:18 2008
@@ -1,10 +1,10 @@
Revert upstream commits r12779 and r13045.
We can do this because we fix GNOME #316087 in our GTK+ packages.
-Index: nautilus-2.20.0/src/file-manager/fm-list-view.c
+Index: nautilus-2.24.1/src/file-manager/fm-list-view.c
===================================================================
---- nautilus-2.20.0.orig/src/file-manager/fm-list-view.c 2007-08-21 11:37:48.000000000 +0200
-+++ nautilus-2.20.0/src/file-manager/fm-list-view.c 2007-09-24 11:55:24.918925454 +0200
-@@ -69,7 +69,6 @@
+--- nautilus-2.24.1.orig/src/file-manager/fm-list-view.c 2008-10-06 19:22:18.000000000 +0200
++++ nautilus-2.24.1/src/file-manager/fm-list-view.c 2008-11-23 23:28:24.606881111 +0100
+@@ -59,7 +59,6 @@
#include <libnautilus-private/nautilus-view-factory.h>
#include <libnautilus-private/nautilus-clipboard.h>
#include <libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h>
@@ -12,7 +12,7 @@
struct FMListViewDetails {
GtkTreeView *tree_view;
-@@ -1338,7 +1337,7 @@
+@@ -1417,7 +1416,7 @@ create_and_set_up_tree_view (FMListView
for (l = nautilus_columns; l != NULL; l = l->next) {
NautilusColumn *nautilus_column;
@@ -21,7 +21,7 @@
char *name;
char *label;
float xalign;
-@@ -1361,6 +1360,9 @@
+@@ -1440,6 +1439,9 @@ create_and_set_up_tree_view (FMListView
view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
view->details->file_name_column = gtk_tree_view_column_new ();
@@ -31,7 +31,7 @@
g_object_ref (view->details->file_name_column);
gtk_object_sink (GTK_OBJECT (view->details->file_name_column));
view->details->file_name_column_num = column_num;
-@@ -1382,7 +1384,11 @@
+@@ -1461,7 +1463,11 @@ create_and_set_up_tree_view (FMListView
"pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN,
NULL);
Modified: desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch (original)
+++ desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch Sun Nov 23 23:08:18 2008
@@ -1,8 +1,10 @@
GNOME #350974
---- nautilus/src/nautilus-places-sidebar.c.old 2008-03-17 10:33:00.000000000 +0100
-+++ nautilus/src/nautilus-places-sidebar.c 2008-03-17 10:39:21.000000000 +0100
-@@ -407,6 +407,17 @@
+Index: nautilus-2.24.1/src/nautilus-places-sidebar.c
+===================================================================
+--- nautilus-2.24.1.orig/src/nautilus-places-sidebar.c 2008-10-06 19:22:18.000000000 +0200
++++ nautilus-2.24.1/src/nautilus-places-sidebar.c 2008-11-23 23:30:47.514381437 +0100
+@@ -448,6 +448,17 @@ update_places (NautilusPlacesSidebar *si
g_object_unref (volume);
}
g_list_free (volumes);
Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series (original)
+++ desktop/experimental/nautilus/debian/patches/series Sun Nov 23 23:08:18 2008
@@ -1,5 +1,6 @@
#07_desktop_file_activation.patch
#10_location_titlebar.patch
+01_manpage.patch
12_list-view_expand.patch
14_sidebar_network-protocol.patch
20_open-with_install.patch
Modified: desktop/experimental/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/rules?rev=17684&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/rules (original)
+++ desktop/experimental/nautilus/debian/rules Sun Nov 23 23:08:18 2008
@@ -10,12 +10,9 @@
include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# debug lib
-DEB_DH_STRIP_ARGS += --dbg-package=nautilus-dbg
-
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus --disable-update-mimedb
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.21.6)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.23.1)'
binary-post-install/nautilus-data::
dh_installmime -p$(cdbs_curpkg)
More information about the pkg-gnome-commits
mailing list