r51260 - in /desktop/unstable/gcr/debian: changelog compat control control.in patches/series patches/tests-fix-collection-tests-to-work-with-gpg-21.patch rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Sun Oct 9 10:46:38 UTC 2016
Author: ah
Date: Sun Oct 9 10:46:38 2016
New Revision: 51260
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51260
Log:
* Add debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch
- fixes for gpg 2.1, see https://bugzilla.gnome.org/771052
(Closes: #835737)
* Bump dh compat to 10 (automatic dh-autoreconf)
* Bump Standards-Version to 3.9.8
Added:
desktop/unstable/gcr/debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch
Modified:
desktop/unstable/gcr/debian/changelog
desktop/unstable/gcr/debian/compat
desktop/unstable/gcr/debian/control
desktop/unstable/gcr/debian/control.in
desktop/unstable/gcr/debian/patches/series
desktop/unstable/gcr/debian/rules
Modified: desktop/unstable/gcr/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/changelog?rev=51260&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/changelog [utf-8] (original)
+++ desktop/unstable/gcr/debian/changelog [utf-8] Sun Oct 9 10:46:38 2016
@@ -1,7 +1,6 @@
-gcr (3.20.0-3) UNRELEASED; urgency=medium
+gcr (3.20.0-3) unstable; urgency=medium
[ Jeremy Bicha ]
- * Team upload
* Add debian/docs to install AUTHORS, NEWS and README
[ Michael Biebl ]
@@ -11,7 +10,14 @@
Add support for the "nocheck" build profile while at it and mark dbus and
gnupg accordingly. (Closes: #835098)
- -- Jeremy Bicha <jbicha at linux.com> Tue, 24 May 2016 20:58:42 -0400
+ [ Andreas Henriksson ]
+ * Add debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch
+ - fixes for gpg 2.1, see https://bugzilla.gnome.org/771052
+ (Closes: #835737)
+ * Bump dh compat to 10 (automatic dh-autoreconf)
+ * Bump Standards-Version to 3.9.8
+
+ -- Andreas Henriksson <andreas at fatal.se> Sun, 09 Oct 2016 12:25:12 +0200
gcr (3.20.0-2) unstable; urgency=medium
Modified: desktop/unstable/gcr/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/compat?rev=51260&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/compat [utf-8] (original)
+++ desktop/unstable/gcr/debian/compat [utf-8] Sun Oct 9 10:46:38 2016
@@ -1 +1 @@
-9
+10
Modified: desktop/unstable/gcr/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/control?rev=51260&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/control [utf-8] (original)
+++ desktop/unstable/gcr/debian/control [utf-8] Sun Oct 9 10:46:38 2016
@@ -6,11 +6,9 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 9.20141010),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 10),
dpkg-dev (>= 1.17.14),
- dh-autoreconf,
- autotools-dev,
docbook-xml,
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.9),
@@ -29,7 +27,7 @@
xsltproc,
dbus <!nocheck>,
gnupg <!nocheck>
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gcr
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gcr
Homepage: https://wiki.gnome.org/Projects/GnomeKeyring
Modified: desktop/unstable/gcr/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/control.in?rev=51260&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/control.in [utf-8] (original)
+++ desktop/unstable/gcr/debian/control.in [utf-8] Sun Oct 9 10:46:38 2016
@@ -3,10 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 9.20141010),
+Build-Depends: debhelper (>= 10),
dpkg-dev (>= 1.17.14),
- dh-autoreconf,
- autotools-dev,
docbook-xml,
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.9),
@@ -25,7 +23,7 @@
xsltproc,
dbus <!nocheck>,
gnupg <!nocheck>
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gcr
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gcr
Homepage: https://wiki.gnome.org/Projects/GnomeKeyring
Modified: desktop/unstable/gcr/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/patches/series?rev=51260&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gcr/debian/patches/series [utf-8] Sun Oct 9 10:46:38 2016
@@ -1,2 +1,3 @@
0001-do-not-require-system-bus-for-running-test-suite.patch
0002-wait-longer-for-dbus-replies-in-test_watch_cancels.patch
+tests-fix-collection-tests-to-work-with-gpg-21.patch
Added: desktop/unstable/gcr/debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch?rev=51260&op=file
==============================================================================
--- desktop/unstable/gcr/debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch (added)
+++ desktop/unstable/gcr/debian/patches/tests-fix-collection-tests-to-work-with-gpg-21.patch [utf-8] Sun Oct 9 10:46:38 2016
@@ -0,0 +1,43 @@
+From 06e8fd2731e6a61be95ee3d638d42ee366e05548 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Sun, 9 Oct 2016 12:15:50 +0200
+Subject: [PATCH] tests: fix collection tests to work with gpg 2.1
+
+---
+ gcr/test-gnupg-collection.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=771052
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835737
+
+diff --git a/gcr/test-gnupg-collection.c b/gcr/test-gnupg-collection.c
+index 7aed48c..79e54fb 100644
+--- a/gcr/test-gnupg-collection.c
++++ b/gcr/test-gnupg-collection.c
+@@ -115,6 +115,14 @@ teardown (Test *test, gconstpointer unused)
+
+ g_object_unref (test->collection);
+
++ /* remove potential gpg 2.1 extras, ignore any errors. */
++ cmd = g_strdup_printf ("rm -rf %s/*.d", test->directory);
++ system(cmd);
++ g_free(cmd);
++ cmd = g_strdup_printf ("rm -f %s/.gpg-v21-migrated", test->directory);
++ system(cmd);
++ g_free(cmd);
++
+ cmd = g_strdup_printf ("rm -f %s/*", test->directory);
+ g_spawn_check_exit_status (system (cmd), &error);
+ g_assert_no_error (error);
+@@ -202,7 +210,7 @@ test_reload (Test *test, gconstpointer unused)
+ GcrGnupgKey *key;
+
+ _gcr_gnupg_collection_load_async (test->collection, NULL, on_async_ready, test);
+- egg_test_wait_until (500);
++ egg_test_wait_until (2500);
+ g_assert (test->result);
+ _gcr_gnupg_collection_load_finish (test->collection, test->result, &error);
+ g_assert_no_error (error);
+--
+2.9.3
+
Modified: desktop/unstable/gcr/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/rules?rev=51260&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/rules [utf-8] (original)
+++ desktop/unstable/gcr/debian/rules [utf-8] Sun Oct 9 10:46:38 2016
@@ -5,7 +5,7 @@
include /usr/share/dpkg/buildflags.mk
%:
- dh $@ --with autoreconf,gir,gnome
+ dh $@ --with gir,gnome
override_dh_autoreconf:
dh_autoreconf --as-needed
More information about the pkg-gnome-commits
mailing list