r25857 - in /desktop/experimental/nautilus/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sat Dec 11 13:45:19 UTC 2010
Author: sjoerd
Date: Sat Dec 11 13:45:18 2010
New Revision: 25857
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25857
Log:
First round of nautilus packaging
Added:
desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install
desktop/experimental/nautilus/debian/patches/20-rename-extensions-directory.patch
desktop/experimental/nautilus/debian/patches/30-fix-compilation.patch
Removed:
desktop/experimental/nautilus/debian/patches/03_deprecated.patch
desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch
desktop/experimental/nautilus/debian/patches/12_list-view_expand.patch
desktop/experimental/nautilus/debian/patches/13_shortcuts.patch
desktop/experimental/nautilus/debian/patches/14_dont_show_umount.patch
desktop/experimental/nautilus/debian/patches/20_open-with_install.patch
desktop/experimental/nautilus/debian/patches/90_relibtoolize.patch
desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch
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-data.install
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=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,3 +1,34 @@
+nautilus (2.91.3-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/control: Add Gsettings schemas to nautilus-data
+ * debian/control: Add gir1.0-nautilus-3.0
+ * debian/control: Add the nautilus gir to libnautilus-extension-dev.install
+ * debian/patches/13_shortcuts.patch
+ - Removed, Fixed upstream
+ * debian/patches/20_open-with_install.patch
+ - Removed, open with is now handled by GtkAppChooser
+ * debian/patches/03_deprecated.patch
+ - Removed, no longer relevant
+ * debian/patches/12_list-view_expand.patch
+ - Removed, no longer applies
+ * debian/patches/10_location_titlebar.patch
+ - Removed, not relevant anymore as there is a crumtrail
+ * debian/patches/14_dont_show_umount.patch
+ - Removed, fixed upstream.
+ * debian/patches/30-fix-compilation.patch
+ - Added, fix complications with --as-needed
+ * debian/patches/20-rename-extensions-directory.patch
+ - Added, rename the extensions dir to not clash with older nautilus
+ extensions. From upstream git.
+ * debian/rules: Add list-missing and autoreconf
+ * debian/patches/99_ltmain_as-needed.patch
+ - Removed as we use dh_autoreconf now
+ * debian/patches/90_relibtoolize.patch
+ - Removed as we use dh_autoreconf now
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 11 Dec 2010 13:31:50 +0000
+
nautilus (2.30.1-2) unstable; urgency=low
* Drop type-handling usage. Closes: #587872.
Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control [utf-8] Sat Dec 11 13:45:18 2010
@@ -7,21 +7,20 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 5),
+ dh-autoreconf,
+ autotools-dev,
cdbs (>= 0.4.41),
quilt,
gnome-pkg-tools (>= 0.13),
dpkg-dev (>= 1.13.19),
- libglib2.0-dev (>= 2.24.0),
- libgnome-desktop-dev (>= 2.29.91),
- libpango1.0-dev (>= 1.1.2),
- libgtk2.0-dev (>= 2.20.0),
+ libgtk3.0-dev,
+ libgail3.0-dev,
+ libgnome-desktop-3-dev,
libxml2-dev (>= 2.4.7),
libexif-dev (>= 0.5.12),
libexempi-dev (>= 1.99.5),
- libgail-dev (>= 0.16),
- libunique-dev,
libdbus-glib-1-dev,
intltool (>= 0.40.1),
gtk-doc-tools (>= 1.4),
@@ -50,7 +49,6 @@
desktop-file-utils (>= 0.7),
gvfs (>= 1.3.2),
libglib2.0-data
-Provides: nautilus-extensions-2.0
Recommends: desktop-base (>= 0.2),
eject,
brasero (>= 2.26),
@@ -143,6 +141,18 @@
This package provides the necessary development libraries and include
files to develop and compile Nautilus extensions.
+Package: gir1.0-nautilus-3.0
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: libraries for nautilus components - gir bindings
+ Nautilus is the official file manager and graphical shell for the
+ GNOME desktop.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+
Package: nautilus-data
Architecture: all
Depends: ${misc:Depends}
Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control.in [utf-8] Sat Dec 11 13:45:18 2010
@@ -4,19 +4,18 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
+ dh-autoreconf,
+ autotools-dev,
cdbs (>= 0.4.41),
quilt,
gnome-pkg-tools (>= 0.13),
dpkg-dev (>= 1.13.19),
- libglib2.0-dev (>= 2.24.0),
- libgnome-desktop-dev (>= 2.29.91),
- libpango1.0-dev (>= 1.1.2),
- libgtk2.0-dev (>= 2.20.0),
+ libgtk3.0-dev,
+ libgail3.0-dev,
+ libgnome-desktop-3-dev,
libxml2-dev (>= 2.4.7),
libexif-dev (>= 0.5.12),
libexempi-dev (>= 1.99.5),
- libgail-dev (>= 0.16),
- libunique-dev,
libdbus-glib-1-dev,
intltool (>= 0.40.1),
gtk-doc-tools (>= 1.4),
@@ -44,8 +43,8 @@
shared-mime-info (>= 0.50),
desktop-file-utils (>= 0.7),
gvfs (>= 1.3.2),
- libglib2.0-data
-Provides: nautilus-extensions-2.0
+ libglib2.0-data,
+ gsettings-desktop-schemas
Recommends: desktop-base (>= 0.2),
eject,
brasero (>= 2.26),
@@ -138,6 +137,18 @@
This package provides the necessary development libraries and include
files to develop and compile Nautilus extensions.
+Package: gir1.0-nautilus-3.0
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: libraries for nautilus components - gir bindings
+ Nautilus is the official file manager and graphical shell for the
+ GNOME desktop.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+
Package: nautilus-data
Architecture: all
Depends: ${misc:Depends}
Added: desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install?rev=25857&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install (added)
+++ desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/Nautilus-3.0.typelib
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=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/libnautilus-extension-dev.install [utf-8] (original)
+++ desktop/experimental/nautilus/debian/libnautilus-extension-dev.install [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,4 +1,5 @@
debian/tmp/usr/lib/libnautilus-extension*.so
debian/tmp/usr/include
debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gir-1.0/Nautilus-3.0.gir
debian/tmp/usr/share/gtk-doc
Modified: desktop/experimental/nautilus/debian/nautilus-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/nautilus-data.install?rev=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/nautilus-data.install [utf-8] (original)
+++ desktop/experimental/nautilus/debian/nautilus-data.install [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,7 +1,8 @@
-debian/tmp/etc
debian/tmp/usr/share/icons/hicolor
debian/tmp/usr/share/nautilus
debian/tmp/usr/share/locale
debian/tmp/usr/share/mime/packages/nautilus.xml
debian/tmp/usr/share/pixmaps
+debian/tmp/usr/share/GConf
+debian/tmp/usr/share/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
debian/nautilus.xpm /usr/share/pixmaps
Added: desktop/experimental/nautilus/debian/patches/20-rename-extensions-directory.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/20-rename-extensions-directory.patch?rev=25857&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/20-rename-extensions-directory.patch (added)
+++ desktop/experimental/nautilus/debian/patches/20-rename-extensions-directory.patch [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,0 +1,116 @@
+From fdae502d65f3c40dee4d418bd9d21270940aa93d Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Fri, 3 Dec 2010 13:47:59 +0100
+Subject: [PATCH] libnautilus-extension: use a different directory for 3.0
+
+So that old extensions do not pull in GTK+2 code.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=624244
+---
+ configure.in | 2 +-
+ libnautilus-extension/Makefile.am | 12 ++++++------
+ .../libnautilus-extension-uninstalled.pc.in | 4 ++--
+ libnautilus-extension/libnautilus-extension.pc.in | 2 +-
+ libnautilus-private/Makefile.am | 2 +-
+ nautilus-sendto-extension/Makefile.am | 2 +-
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 82ce7ab..152f06b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -14,7 +14,7 @@ m4_define(exempi_minver, 1.99.5)
+ dnl 1. If the library code has changed at all since last release, then increment revision.
+ dnl 2. If any interfaces have been added, then increment current and set revision to 0.
+ dnl Interface break is not allowed.
+-m4_define(nautilus_extension_current, 3)
++m4_define(nautilus_extension_current, 4)
+ m4_define(nautilus_extension_revision, 0)
+
+ AC_INIT(nautilus, 2.91.3, http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus)
+diff --git a/libnautilus-extension/Makefile.am b/libnautilus-extension/Makefile.am
+index 7db831d..9d83014 100644
+--- a/libnautilus-extension/Makefile.am
++++ b/libnautilus-extension/Makefile.am
+@@ -68,15 +68,15 @@ if HAVE_INTROSPECTION
+ introspection_files = \
+ $(libnautilus_extension_include_HEADERS) \
+ $(libnautilus_extension_la_SOURCES)
+-Nautilus-2.0.gir: libnautilus-extension.la Makefile
+-Nautilus_2_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0
+-Nautilus_2_0_gir_CFLAGS = \
++Nautilus-3.0.gir: libnautilus-extension.la Makefile
++Nautilus_3_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0
++Nautilus_3_0_gir_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(BASE_CFLAGS)
+-Nautilus_2_0_gir_LIBS = libnautilus-extension.la
+-Nautilus_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+-INTROSPECTION_GIRS += Nautilus-2.0.gir
++Nautilus_3_0_gir_LIBS = libnautilus-extension.la
++Nautilus_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
++INTROSPECTION_GIRS += Nautilus-3.0.gir
+
+ girdir = $(datadir)/gir-1.0/
+ gir_DATA = $(INTROSPECTION_GIRS)
+diff --git a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
+index f0bcdc1..eee6aae 100644
+--- a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
++++ b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
+@@ -2,11 +2,11 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-extensiondir=@libdir@/nautilus/extensions-2.0
++extensiondir=@libdir@/nautilus/extensions-3.0
+
+ Name: libnautilus-extension
+ Description: A library to create Nautilus view extensions
+ Version: @VERSION@
+-Requires: glib-2.0 gtk+-3.0
++Requires: glib-2.0 gio-2.0 gtk+-3.0
+ Libs: ${pc_top_builddir}/${pcfiledir}/libnautilus-extension.la
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/..
+diff --git a/libnautilus-extension/libnautilus-extension.pc.in b/libnautilus-extension/libnautilus-extension.pc.in
+index 65f8e4b..1da3585 100644
+--- a/libnautilus-extension/libnautilus-extension.pc.in
++++ b/libnautilus-extension/libnautilus-extension.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-extensiondir=@libdir@/nautilus/extensions-2.0
++extensiondir=@libdir@/nautilus/extensions-3.0
+
+ Name: libnautilus-extension
+ Description: A library to create Nautilus view extensions
+diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
+index f147b64..b1500de 100644
+--- a/libnautilus-private/Makefile.am
++++ b/libnautilus-private/Makefile.am
+@@ -16,7 +16,7 @@ INCLUDES = \
+ -DDATADIR=\""$(datadir)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
+- -DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-2.0"\" \
++ -DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-3.0"\" \
+ $(NULL)
+
+ BUILT_SOURCES = \
+diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
+index 7f8300c..f4cf9e9 100644
+--- a/nautilus-sendto-extension/Makefile.am
++++ b/nautilus-sendto-extension/Makefile.am
+@@ -9,7 +9,7 @@ INCLUDES=\
+ -DDATADIR=\""$(datadir)"\" \
+ $(NULL)
+
+-nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
++nautilus_extensiondir = $(libdir)/nautilus/extensions-3.0
+ nautilus_extension_LTLIBRARIES = libnautilus-sendto.la
+ libnautilus_sendto_la_SOURCES = \
+ nautilus-nste.c \
+--
+1.7.2.3
+
Added: desktop/experimental/nautilus/debian/patches/30-fix-compilation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/30-fix-compilation.patch?rev=25857&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/30-fix-compilation.patch (added)
+++ desktop/experimental/nautilus/debian/patches/30-fix-compilation.patch [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,0 +1,25 @@
+From 7436c891c90ffa0c77a0fd1334dfc636c2808914 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 5 Dec 2010 23:07:52 +0000
+Subject: [PATCH] Add base libraries so building with --as-needed works
+
+---
+ nautilus-sendto-extension/Makefile.am | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/nautilus-sendto-extension/Makefile.am b/nautilus-sendto-extension/Makefile.am
+index f4cf9e9..ed03a93 100644
+--- a/nautilus-sendto-extension/Makefile.am
++++ b/nautilus-sendto-extension/Makefile.am
+@@ -17,5 +17,6 @@ libnautilus_sendto_la_SOURCES = \
+ nautilus-sendto-module.c
+
+ libnautilus_sendto_la_LDFLAGS = -module -avoid-version -no-undefined
+-libnautilus_sendto_la_LIBADD = $(top_builddir)/libnautilus-extension/libnautilus-extension.la
+-
++libnautilus_sendto_la_LIBADD = \
++ $(top_builddir)/libnautilus-extension/libnautilus-extension.la \
++ $(BASE_LIBS)
+--
+1.7.2.3
+
Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/experimental/nautilus/debian/patches/series [utf-8] Sat Dec 11 13:45:18 2010
@@ -1,9 +1,3 @@
-#10_location_titlebar.patch
-03_deprecated.patch
10_load_session.patch
-12_list-view_expand.patch
-13_shortcuts.patch
-14_dont_show_umount.patch
-20_open-with_install.patch
-90_relibtoolize.patch
-99_ltmain_as-needed.patch
+20-rename-extensions-directory.patch
+30-fix-compilation.patch
Modified: desktop/experimental/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/rules?rev=25857&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/rules [utf-8] (original)
+++ desktop/experimental/nautilus/debian/rules [utf-8] Sat Dec 11 13:45:18 2010
@@ -8,13 +8,16 @@
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus \
--disable-update-mimedb \
--disable-packagekit
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.30)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.91)'
binary-post-install/nautilus-data::
dh_installmime -p$(cdbs_curpkg)
+
+common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list