r45836 - in /desktop/experimental/gnome-keyring/debian: changelog control rules

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Sat Sep  5 07:37:06 2015
New Revision: 45836

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45836
Log:
* 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.

Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/control
    desktop/experimental/gnome-keyring/debian/rules

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=45836&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog	[utf-8] Sat Sep  5 07:37:06 2015
@@ -1,3 +1,12 @@
+gnome-keyring (3.17.91-1) UNRELEASED; 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.
+
+ -- 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/experimental/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control?rev=45836&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/control	[utf-8] Sat Sep  5 07:37:06 2015
@@ -16,7 +16,6 @@
                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 +27,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/experimental/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/rules?rev=45836&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/rules	[utf-8] Sat Sep  5 07:37:06 2015
@@ -16,15 +16,8 @@
 
 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