r22569 - in /desktop/unstable/seahorse/debian: changelog control control.in patches/02_maxpathlen_hurd.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Dec 13 23:07:27 UTC 2009
Author: pochu
Date: Sun Dec 13 23:07:26 2009
New Revision: 22569
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22569
Log:
* debian/patches/02_maxpathlen_hurd.patch:
- Fix FTBFS on the Hurd: don't hardcode the GPG homedir length to
MAXPATHLEN, use dynamic allocation instead.
* debian/control.in:
- Stop build depending on libxml2-dev, it's needed for the epiphany
plugin which is now in seahorse-plugins.
Added:
desktop/unstable/seahorse/debian/patches/02_maxpathlen_hurd.patch
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/patches/series
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=22569&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Sun Dec 13 23:07:26 2009
@@ -1,3 +1,14 @@
+seahorse (2.28.1-2) UNRELEASED; urgency=low
+
+ * debian/patches/02_maxpathlen_hurd.patch:
+ - Fix FTBFS on the Hurd: don't hardcode the GPG homedir length to
+ MAXPATHLEN, use dynamic allocation instead.
+ * debian/control.in:
+ - Stop build depending on libxml2-dev, it's needed for the epiphany
+ plugin which is now in seahorse-plugins.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 13 Dec 2009 19:18:32 +0100
+
seahorse (2.28.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=22569&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Sun Dec 13 23:07:26 2009
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: seahorse
Section: gnome
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Andrea Veri <andrea.veri89 at gmail.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
@@ -22,7 +27,6 @@
libgnome-keyring-dev (>= 2.25.5),
libglib2.0-dev (>= 2.10.0),
libgtk2.0-dev (>= 2.10.0),
- libxml2-dev (>= 2.6.0),
libgconf2-dev,
gnome-pkg-tools
Build-Conflicts: gnupg2
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=22569&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Sun Dec 13 23:07:26 2009
@@ -22,7 +22,6 @@
libgnome-keyring-dev (>= 2.25.5),
libglib2.0-dev (>= 2.10.0),
libgtk2.0-dev (>= 2.10.0),
- libxml2-dev (>= 2.6.0),
libgconf2-dev,
gnome-pkg-tools
Build-Conflicts: gnupg2
Added: desktop/unstable/seahorse/debian/patches/02_maxpathlen_hurd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/02_maxpathlen_hurd.patch?rev=22569&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/02_maxpathlen_hurd.patch (added)
+++ desktop/unstable/seahorse/debian/patches/02_maxpathlen_hurd.patch [utf-8] Sun Dec 13 23:07:26 2009
@@ -1,0 +1,42 @@
+--- a/pgp/seahorse-gpg-options.c
++++ b/pgp/seahorse-gpg-options.c
+@@ -43,7 +43,7 @@
+ #define GPG_VERSION_PREFIX1 "1."
+ #define GPG_VERSION_PREFIX2 "2."
+
+-static gchar gpg_homedir[MAXPATHLEN];
++static gchar *gpg_homedir;
+ static gboolean gpg_options_inited = FALSE;
+
+ static gboolean
+@@ -77,6 +77,9 @@
+ g_assert (gpg_options_inited);
+ g_assert (!err || !*err);
+
++ if (!gpg_homedir)
++ return NULL;
++
+ /* Check for and open ~/.gnupg/gpg.conf */
+ conf = g_strconcat (gpg_homedir, "/gpg.conf", NULL);
+ if (g_file_test (conf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS))
+@@ -208,16 +211,14 @@
+ *x = 0;
+ g_strstrip (t);
+
+- gpg_homedir[0] = 0;
++ g_free (gpg_homedir);
+
+ /* If it's not a rooted path then expand */
+ if (t[0] == '~') {
+- g_strlcpy (gpg_homedir, g_get_home_dir (),
+- sizeof (gpg_homedir));
+- t++;
++ gpg_homedir = g_strconcat (g_get_home_dir(), ++t);
++ } else {
++ gpg_homedir = g_strdup (t);
+ }
+-
+- g_strlcat (gpg_homedir, t, sizeof (gpg_homedir));
+ found = TRUE;
+ }
+ }
Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=22569&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series [utf-8] Sun Dec 13 23:07:26 2009
@@ -1,4 +1,5 @@
01_autostart_path.patch
+02_maxpathlen_hurd.patch
08_force_ssh.patch
90_autotools.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list