r34151 - in /packages/unstable/nautilus-sendto/debian: changelog control control.in patches/ patches/01_fix_commandline.patch patches/02_use_g_app_info_get_executable.patch patches/03_icedove_as_thunderbird.patch patches/series rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Wed Apr 4 19:29:47 UTC 2012
Author: bigon
Date: Wed Apr 4 19:29:44 2012
New Revision: 34151
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34151
Log:
* New upstream release
- Add libedataserverui-3.0-dev to the build-dependencies
* debian/control.in: Bump Standards-Version to 3.9.3 (no further changes)
* debian/rules:
- Generate correct dependencies for modules (Closes: #666422)
- Install evolution plugin
- Regenerate autofoo files and minimize run-time dependencies
* debian/patches/01_fix_commandline.patch,
debian/patches/02_use_g_app_info_get_executable.patch:
Fix mail client invocation
* debian/patches/03_icedove_as_thunderbird.patch: Treat icedove like
thunderbird
Added:
packages/unstable/nautilus-sendto/debian/patches/
packages/unstable/nautilus-sendto/debian/patches/01_fix_commandline.patch
packages/unstable/nautilus-sendto/debian/patches/02_use_g_app_info_get_executable.patch
packages/unstable/nautilus-sendto/debian/patches/03_icedove_as_thunderbird.patch
packages/unstable/nautilus-sendto/debian/patches/series
Modified:
packages/unstable/nautilus-sendto/debian/changelog
packages/unstable/nautilus-sendto/debian/control
packages/unstable/nautilus-sendto/debian/control.in
packages/unstable/nautilus-sendto/debian/rules
Modified: packages/unstable/nautilus-sendto/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/changelog?rev=34151&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/changelog [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/changelog [utf-8] Wed Apr 4 19:29:44 2012
@@ -1,3 +1,20 @@
+nautilus-sendto (3.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - Add libedataserverui-3.0-dev to the build-dependencies
+ * debian/control.in: Bump Standards-Version to 3.9.3 (no further changes)
+ * debian/rules:
+ - Generate correct dependencies for modules (Closes: #666422)
+ - Install evolution plugin
+ - Regenerate autofoo files and minimize run-time dependencies
+ * debian/patches/01_fix_commandline.patch,
+ debian/patches/02_use_g_app_info_get_executable.patch:
+ Fix mail client invocation
+ * debian/patches/03_icedove_as_thunderbird.patch: Treat icedove like
+ thunderbird
+
+ -- Laurent Bigonville <bigon at debian.org> Wed, 04 Apr 2012 21:27:52 +0200
+
nautilus-sendto (3.0.1-2) unstable; urgency=low
* Upload to unstable.
Modified: packages/unstable/nautilus-sendto/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/control?rev=34151&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/control [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/control [utf-8] Wed Apr 4 19:29:44 2012
@@ -9,6 +9,8 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 8.1.3~),
cdbs (>= 0.4.94~),
+ dh-autoreconf,
+ gtk-doc-tools,
intltool (>= 0.35.0),
dh-buildinfo,
gnome-pkg-tools,
@@ -16,6 +18,7 @@
libgtk-3-dev (>= 3.0.0),
libnautilus-extension-dev (>= 2.31.3),
libebook1.2-dev (>= 1.5.3),
+ libedataserverui-3.0-dev,
libdbus-1-dev (>= 1.0),
libdbus-glib-1-dev (>= 0.60),
libgupnp-1.0-dev (>= 0.13),
@@ -23,7 +26,7 @@
Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/
VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/nautilus-sendto/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Package: nautilus-sendto
Architecture: any
Modified: packages/unstable/nautilus-sendto/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/control.in?rev=34151&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/control.in [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/control.in [utf-8] Wed Apr 4 19:29:44 2012
@@ -4,6 +4,8 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 8.1.3~),
cdbs (>= 0.4.94~),
+ dh-autoreconf,
+ gtk-doc-tools,
intltool (>= 0.35.0),
dh-buildinfo,
gnome-pkg-tools,
@@ -11,6 +13,7 @@
libgtk-3-dev (>= 3.0.0),
libnautilus-extension-dev (>= 2.31.3),
libebook1.2-dev (>= 1.5.3),
+ libedataserverui-3.0-dev,
libdbus-1-dev (>= 1.0),
libdbus-glib-1-dev (>= 0.60),
libgupnp-1.0-dev (>= 0.13),
@@ -18,7 +21,7 @@
Uploaders: @GNOME_TEAM@
VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/
VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/nautilus-sendto/
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Package: nautilus-sendto
Architecture: any
Added: packages/unstable/nautilus-sendto/debian/patches/01_fix_commandline.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/01_fix_commandline.patch?rev=34151&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/01_fix_commandline.patch (added)
+++ packages/unstable/nautilus-sendto/debian/patches/01_fix_commandline.patch [utf-8] Wed Apr 4 19:29:44 2012
@@ -1,0 +1,27 @@
+From b3d0c6123b8161fbcae333d8294e1828b06038d5 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Wed, 4 Apr 2012 14:34:46 +0200
+Subject: [PATCH] Fix command line used to call the mail client
+
+g_strdup_printf() requires a format string like printf()
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673465
+---
+ src/plugins/evolution/evolution.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c
+index e8679a6..a2c0b36 100644
+--- a/src/plugins/evolution/evolution.c
++++ b/src/plugins/evolution/evolution.c
+@@ -330,7 +330,7 @@ send_files (NstPlugin *plugin,
+ get_evo_mailto (contact_widget, mailto, file_list);
+ }
+
+- cmd = g_strdup_printf (mail_cmd, mailto->str);
++ cmd = g_strdup_printf ("%s %s", mail_cmd, mailto->str);
+ g_string_free (mailto, TRUE);
+
+ g_message ("Mailer type: %d", type);
+--
+1.7.9.5
Added: packages/unstable/nautilus-sendto/debian/patches/02_use_g_app_info_get_executable.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/02_use_g_app_info_get_executable.patch?rev=34151&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/02_use_g_app_info_get_executable.patch (added)
+++ packages/unstable/nautilus-sendto/debian/patches/02_use_g_app_info_get_executable.patch [utf-8] Wed Apr 4 19:29:44 2012
@@ -1,0 +1,30 @@
+From 234b7aaab9c57a01b807564e811a5cc73417b886 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Wed, 4 Apr 2012 15:02:35 +0200
+Subject: [PATCH] Call g_app_info_get_executable() instead of
+ g_app_info_get_commandline()
+
+It seems that g_app_info_get_commandline() is adding the arguments
+placeholder from the .desktop file. We don't want this because
+nautilus-sendto is building the arguments list itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673467
+---
+ src/plugins/evolution/evolution.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c
+index a2c0b36..585963b 100644
+--- a/src/plugins/evolution/evolution.c
++++ b/src/plugins/evolution/evolution.c
+@@ -86,7 +86,7 @@ init (NstPlugin *plugin)
+
+ app_info = g_app_info_get_default_for_uri_scheme ("mailto");
+ if (app_info) {
+- mail_cmd = g_strdup (g_app_info_get_commandline (app_info));
++ mail_cmd = g_strdup (g_app_info_get_executable (app_info));
+ g_object_unref (app_info);
+ } else {
+ mail_cmd = NULL;
+--
+1.7.9.5
Added: packages/unstable/nautilus-sendto/debian/patches/03_icedove_as_thunderbird.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/03_icedove_as_thunderbird.patch?rev=34151&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/03_icedove_as_thunderbird.patch (added)
+++ packages/unstable/nautilus-sendto/debian/patches/03_icedove_as_thunderbird.patch [utf-8] Wed Apr 4 19:29:44 2012
@@ -1,0 +1,25 @@
+From 76322a1d1bf969221a7cf8012d7dd3f0c57358f2 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Wed, 4 Apr 2012 17:16:39 +0200
+Subject: [PATCH] Treat icedove as thunderbird
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673511
+---
+ src/plugins/evolution/evolution.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c
+index 585963b..3e425b5 100644
+--- a/src/plugins/evolution/evolution.c
++++ b/src/plugins/evolution/evolution.c
+@@ -100,7 +100,7 @@ init (NstPlugin *plugin)
+ /* Find what the default mailer is */
+ if (strstr (mail_cmd, "balsa"))
+ type = MAILER_BALSA;
+- else if (strstr (mail_cmd, "thunder") || strstr (mail_cmd, "seamonkey")) {
++ else if (strstr (mail_cmd, "thunder") || strstr (mail_cmd, "seamonkey") || strstr (mail_cmd, "icedove")) {
+ char **strv;
+
+ type = MAILER_THUNDERBIRD;
+--
+1.7.9.5
Added: packages/unstable/nautilus-sendto/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/series?rev=34151&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/series (added)
+++ packages/unstable/nautilus-sendto/debian/patches/series [utf-8] Wed Apr 4 19:29:44 2012
@@ -1,0 +1,3 @@
+01_fix_commandline.patch
+02_use_g_app_info_get_executable.patch
+03_icedove_as_thunderbird.patch
Modified: packages/unstable/nautilus-sendto/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/rules?rev=34151&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/rules [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/rules [utf-8] Wed Apr 4 19:29:44 2012
@@ -5,16 +5,17 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_DH_AUTORECONF_ARGS = --as-needed
DEB_DH_MAKESHLIBS_ARGS += --no-act
-DEB_DH_SHLIBDEPS_ARGS_ALL += -X/usr/lib/nautilus-sendto/plugins \
- -X/usr/lib/pidgin \
- -X/usr/lib/evolution
binary-post-install/nautilus-sendto::
# Remove unnecessary libtool library files
find debian/nautilus-sendto -type f -name "*.la" | xargs rm -fv
# Remove the extension, it's been moved to nautilus
rm -r debian/nautilus-sendto/usr/lib/nautilus
- # Temporarily remove the evolution plugin, it's broken
- rm debian/nautilus-sendto/usr/lib/nautilus-sendto/plugins/libnstevolution.so
More information about the pkg-gnome-commits
mailing list