r46196 - in /desktop/unstable/gnome-keyring: ./ debian/README.Debian debian/changelog debian/control debian/control.in debian/rules
mitya57 at users.alioth.debian.org
mitya57 at users.alioth.debian.org
Mon Sep 28 17:39:46 UTC 2015
Author: mitya57
Date: Mon Sep 28 17:39:46 2015
New Revision: 46196
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46196
Log:
* New upstream release.
* Drop fix_test_import_segfault.patch, applied upstream.
* Replace Xvfb with dbus-run-session, it much better fits our needs.
* Fix segmentation fault in test-import (fix_test_import_segfault.patch).
* New upstream beta release.
* Drop libdbus-1-dev build-dependency, no longer needed.
* Drop --disable-gpg-agent option, GPG agent has been dropped upstream.
* Also drop code to remove gnome-keyring-gpg.desktop.
* Remove outdated information from README.Debian.
* Run tests in Xvfb to make them really run (and not hang because of
missing D-Bus). Still ignore the result because two tests fail.
Modified:
desktop/unstable/gnome-keyring/ (props changed)
desktop/unstable/gnome-keyring/debian/README.Debian
desktop/unstable/gnome-keyring/debian/changelog
desktop/unstable/gnome-keyring/debian/control
desktop/unstable/gnome-keyring/debian/control.in
desktop/unstable/gnome-keyring/debian/rules
Propchange: desktop/unstable/gnome-keyring/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 17:39:46 2015
@@ -1 +1 @@
-/desktop/experimental/gnome-keyring:25353-27552,44232-44298
+/desktop/experimental/gnome-keyring:25353-27552,44232-44298,45835-46195
Modified: desktop/unstable/gnome-keyring/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/README.Debian?rev=46196&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/README.Debian [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/README.Debian [utf-8] Mon Sep 28 17:39:46 2015
@@ -18,17 +18,12 @@
for a password for the "Default" keyring.
If you change your authentication password (using passwd or
-gnome-about-me for example), the password for the login keyring should
-be updated automatically.
+gnome-control-center for example), the password for the login keyring
+should be updated automatically.
- SSH and GPG agents
- ------------------
-The GNOME keyring includes the functionality of the SSH and GPG agents,
-and it can break some setups, especially if ssh-agent and/or gpg-agent
-is started by hand.
-
-You can disable a specific component by removing the gnome-keyring-gpg
-and gnome-keyring-ssh elements from the startup applications. The
-interface depends on your session manager; for GNOME you can use
-gnome-session-properties. You can also simply edit
-/etc/xdg/autostart/gnome-keyring-*.desktop.
+ SSH agent
+ ---------
+The GNOME keyring includes the functionality of the SSH agent, and it
+can break some setups, especially if ssh-agent is started by hand.
+You can disable it by removing the gnome-keyring-ssh element from the
+startup applications.
Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=46196&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Mon Sep 28 17:39:46 2015
@@ -1,3 +1,29 @@
+gnome-keyring (3.18.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop fix_test_import_segfault.patch, applied upstream.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 28 Sep 2015 20:39:19 +0300
+
+gnome-keyring (3.17.91-2) experimental; urgency=medium
+
+ * Replace Xvfb with dbus-run-session, it much better fits our needs.
+ * Fix segmentation fault in test-import (fix_test_import_segfault.patch).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 06 Sep 2015 12:30:14 +0300
+
+gnome-keyring (3.17.91-1) experimental; urgency=medium
+
+ * New upstream beta release.
+ * Drop libdbus-1-dev build-dependency, no longer needed.
+ * Drop --disable-gpg-agent option, GPG agent has been dropped upstream.
+ * Also drop code to remove gnome-keyring-gpg.desktop.
+ * Remove outdated information from README.Debian.
+ * Run tests in Xvfb to make them really run (and not hang because of
+ missing D-Bus). Still ignore the result because two tests fail.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 05 Sep 2015 10:29:00 +0300
+
gnome-keyring (3.16.0-4) unstable; urgency=medium
* Fix the removal of /etc/xdg/autostart/gnome-keyring-gpg.desktop. This file
Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=46196&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control [utf-8] Mon Sep 28 17:39:46 2015
@@ -6,17 +6,17 @@
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>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 9),
cdbs,
ca-certificates,
+ dbus,
dh-autoreconf,
docbook-xml,
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.9),
intltool (>= 0.35.0),
libcap-ng-dev [linux-any],
- libdbus-1-dev (>= 1.1.1),
libgck-1-dev (>= 3.3.4),
libgcr-3-dev (>= 3.5.3),
libgcrypt11-dev (>= 1.2.2),
@@ -28,8 +28,8 @@
libtasn1-bin,
libglib2.0-doc
Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-keyring/
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-keyring/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-keyring/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/gnome-keyring/
Homepage: https://wiki.gnome.org/GnomeKeyring
Package: gnome-keyring
Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=46196&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in [utf-8] Mon Sep 28 17:39:46 2015
@@ -6,13 +6,13 @@
Build-Depends: debhelper (>= 9),
cdbs,
ca-certificates,
+ dbus,
dh-autoreconf,
docbook-xml,
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.9),
intltool (>= 0.35.0),
libcap-ng-dev [linux-any],
- libdbus-1-dev (>= 1.1.1),
libgck-1-dev (>= 3.3.4),
libgcr-3-dev (>= 3.5.3),
libgcrypt11-dev (>= 1.2.2),
@@ -24,8 +24,8 @@
libtasn1-bin,
libglib2.0-doc
Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-keyring/
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-keyring/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-keyring/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/gnome-keyring/
Homepage: https://wiki.gnome.org/GnomeKeyring
Package: gnome-keyring
Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=46196&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules [utf-8] Mon Sep 28 17:39:46 2015
@@ -10,21 +10,14 @@
export DEB_LDFLAGS_MAINT_APPEND := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
include /usr/share/dpkg/buildflags.mk
-ifeq (,$(filter $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64))
-DEB_MAKE_CHECK_TARGET := -k check || true
-endif
+debian/stamp-makefile-check:
+ -dbus-run-session -- $(MAKE) check -j1
+ touch $@
DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/security \
--enable-gtk-doc \
- --disable-update-mime \
- --disable-gpg-agent
+ --disable-update-mime
DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
-# The gpg autostart file is installed unconditionally, even when compiled with
-# --disable-gpg-agent. So remove the file manually. This has been fixed
-# upstream and can be dropped again with 3.18.
-binary-install/gnome-keyring::
- rm -f debian/$(cdbs_curpkg)/etc/xdg/autostart/gnome-keyring-gpg.desktop
-
common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list