r26090 - in /desktop/experimental/gnome-keyring/debian: changelog gnome-keyring.install libgck0.symbols libgcr-3-0.symbols patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch patches/series rules

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sat Dec 25 17:35:35 UTC 2010


Author: sjoerd
Date: Sat Dec 25 17:35:20 2010
New Revision: 26090

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26090
Log:
Package new upstream release

Added:
    desktop/experimental/gnome-keyring/debian/patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch
Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/gnome-keyring.install
    desktop/experimental/gnome-keyring/debian/libgck0.symbols
    desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols
    desktop/experimental/gnome-keyring/debian/patches/series
    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=26090&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog [utf-8] Sat Dec 25 17:35:20 2010
@@ -1,8 +1,17 @@
-gnome-keyring (2.91.3-2) UNRELEASED; urgency=low
-
+gnome-keyring (2.91.4-1) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
   * Install gnome-keyring-prompt-3. Closes: #607192.
 
- -- Josselin Mouette <joss at debian.org>  Fri, 17 Dec 2010 22:42:24 +0100
+  [ Sjoerd Simons ]
+  * New upstream release
+  * patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch
+    + Added. Fix build with -Wl,--as-needed
+  * gnome-keyring.install: Install pkcs11 modules and config files
+  * libgck0.symbols, libgcr-3-0.symbols: Update symbols file
+  * debian/rules: Add quilt patchsys and use list-missing
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 25 Dec 2010 18:32:41 +0100
 
 gnome-keyring (2.91.3-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-keyring/debian/gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/gnome-keyring.install?rev=26090&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/gnome-keyring.install [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/gnome-keyring.install [utf-8] Sat Dec 25 17:35:20 2010
@@ -2,11 +2,11 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/dbus-1/services
 debian/tmp/usr/lib/gnome-keyring/gnome-keyring-prompt*
-debian/tmp/usr/lib/gnome-keyring/*.so
 debian/tmp/usr/lib/gnome-keyring/devel/*.so
-debian/tmp/usr/lib/gnome-keyring/standalone/*.so
 debian/tmp/usr/share/glib-2.0/schemas/*
 debian/tmp/usr/share/GConf/gsettings/*
 debian/tmp/etc/xdg/autostart /usr/share/gnome
 debian/tmp/usr/share/gnome-keyring-3/ui
 debian/tmp/usr/share/gnome-keyring/introspect
+debian/tmp/usr/lib/pkcs11/*.so
+debian/tmp/etc/xdg/pkcs11.conf.defaults

Modified: desktop/experimental/gnome-keyring/debian/libgck0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgck0.symbols?rev=26090&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgck0.symbols [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/libgck0.symbols [utf-8] Sat Dec 25 17:35:20 2010
@@ -26,6 +26,7 @@
  _gck_ulong_equal at Base 2.91.1
  _gck_ulong_hash at Base 2.91.1
  gck_attribute_clear at Base 2.91.1
+ gck_attribute_dump at Base 2.91.4
  gck_attribute_dup at Base 2.91.1
  gck_attribute_equal at Base 2.91.1
  gck_attribute_free at Base 2.91.1
@@ -61,6 +62,7 @@
  gck_attributes_at at Base 2.91.1
  gck_attributes_contains at Base 2.91.1
  gck_attributes_count at Base 2.91.1
+ gck_attributes_dump at Base 2.91.4
  gck_attributes_find at Base 2.91.1
  gck_attributes_find_boolean at Base 2.91.1
  gck_attributes_find_date at Base 2.91.1
@@ -205,6 +207,7 @@
  gck_slot_open_session_finish at Base 2.91.1
  gck_slot_open_session_full at Base 2.91.1
  gck_slot_open_session_full_async at Base 2.91.1
+ gck_slots_enumerate_objects at Base 2.91.4
  gck_string_from_chars at Base 2.91.1
  gck_token_info_free at Base 2.91.1
  gck_uri_build at Base 2.91.1

Modified: desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols?rev=26090&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols [utf-8] Sat Dec 25 17:35:20 2010
@@ -9,7 +9,6 @@
  _gcr_display_view_new at Base 2.91.1
  _gcr_display_view_set_stock_image at Base 2.91.1
  _gcr_display_view_start_details at Base 2.91.1
- _gcr_get_pkcs11_modules at Base 2.91.1
  _gcr_icons_register at Base 2.91.1
  _gcr_import_dialog_get_password at Base 2.91.1
  _gcr_import_dialog_get_primary_text at Base 2.91.1
@@ -29,7 +28,21 @@
  _gcr_initialize at Base 2.91.1
  _gcr_marshal_BOOLEAN__INT at Base 2.91.1
  _gcr_marshal_VOID__STRING_BOXED at Base 2.91.1
+ _gcr_set_pkcs11_config_dir at Base 2.91.4
  egg_libgcrypt_initialize at Base 2.91.1
+ gcr_certificate_chain_add at Base 2.91.4
+ gcr_certificate_chain_build at Base 2.91.4
+ gcr_certificate_chain_build_async at Base 2.91.4
+ gcr_certificate_chain_build_finish at Base 2.91.4
+ gcr_certificate_chain_flags_get_type at Base 2.91.4
+ gcr_certificate_chain_get_anchor at Base 2.91.4
+ gcr_certificate_chain_get_certificate at Base 2.91.4
+ gcr_certificate_chain_get_endpoint at Base 2.91.4
+ gcr_certificate_chain_get_length at Base 2.91.4
+ gcr_certificate_chain_get_status at Base 2.91.4
+ gcr_certificate_chain_get_type at Base 2.91.4
+ gcr_certificate_chain_new at Base 2.91.4
+ gcr_certificate_chain_status_get_type at Base 2.91.4
  gcr_certificate_get_der_data at Base 2.91.1
  gcr_certificate_get_expiry_date at Base 2.91.1
  gcr_certificate_get_fingerprint at Base 2.91.1
@@ -38,13 +51,16 @@
  gcr_certificate_get_issuer_cn at Base 2.91.1
  gcr_certificate_get_issuer_dn at Base 2.91.1
  gcr_certificate_get_issuer_part at Base 2.91.1
+ gcr_certificate_get_issuer_raw at Base 2.91.4
  gcr_certificate_get_key_size at Base 2.91.1
  gcr_certificate_get_serial_number at Base 2.91.1
  gcr_certificate_get_serial_number_hex at Base 2.91.1
  gcr_certificate_get_subject_cn at Base 2.91.1
  gcr_certificate_get_subject_dn at Base 2.91.1
  gcr_certificate_get_subject_part at Base 2.91.1
+ gcr_certificate_get_subject_raw at Base 2.91.4
  gcr_certificate_get_type at Base 2.91.1
+ gcr_certificate_is_issuer at Base 2.91.4
  gcr_certificate_renderer_get_attributes at Base 2.91.1
  gcr_certificate_renderer_get_certificate at Base 2.91.1
  gcr_certificate_renderer_get_type at Base 2.91.1
@@ -58,6 +74,7 @@
  gcr_certificate_widget_set_attributes at Base 2.91.1
  gcr_certificate_widget_set_certificate at Base 2.91.1
  gcr_data_error_get_domain at Base 2.91.1
+ gcr_error_get_domain at Base 2.91.4
  gcr_importer_get_prompt_behavior at Base 2.91.1
  gcr_importer_get_slot at Base 2.91.1
  gcr_importer_get_type at Base 2.91.1
@@ -90,6 +107,21 @@
  gcr_parser_parse_stream at Base 2.91.1
  gcr_parser_parse_stream_async at Base 2.91.1
  gcr_parser_parse_stream_finish at Base 2.91.1
+ gcr_pkcs11_add_module at Base 2.91.4
+ gcr_pkcs11_add_module_from_file at Base 2.91.4
+ gcr_pkcs11_certificate_get_attributes at Base 2.91.4
+ gcr_pkcs11_certificate_get_type at Base 2.91.4
+ gcr_pkcs11_certificate_lookup_issuer at Base 2.91.4
+ gcr_pkcs11_certificate_lookup_issuer_async at Base 2.91.4
+ gcr_pkcs11_certificate_lookup_issuer_finish at Base 2.91.4
+ gcr_pkcs11_get_modules at Base 2.91.4
+ gcr_pkcs11_get_trust_lookup_slots at Base 2.91.4
+ gcr_pkcs11_get_trust_lookup_uris at Base 2.91.4
+ gcr_pkcs11_get_trust_store_slot at Base 2.91.4
+ gcr_pkcs11_get_trust_store_uri at Base 2.91.4
+ gcr_pkcs11_set_modules at Base 2.91.4
+ gcr_pkcs11_set_trust_lookup_uris at Base 2.91.4
+ gcr_pkcs11_set_trust_store_uri at Base 2.91.4
  gcr_renderer_create at Base 2.91.1
  gcr_renderer_emit_data_changed at Base 2.91.1
  gcr_renderer_get_type at Base 2.91.1
@@ -98,6 +130,18 @@
  gcr_simple_certificate_get_type at Base 2.91.1
  gcr_simple_certificate_new at Base 2.91.1
  gcr_simple_certificate_new_static at Base 2.91.1
+ gcr_trust_add_pinned_certificate at Base 2.91.4
+ gcr_trust_add_pinned_certificate_async at Base 2.91.4
+ gcr_trust_add_pinned_certificate_finish at Base 2.91.4
+ gcr_trust_is_certificate_anchored at Base 2.91.4
+ gcr_trust_is_certificate_anchored_async at Base 2.91.4
+ gcr_trust_is_certificate_anchored_finish at Base 2.91.4
+ gcr_trust_is_certificate_pinned at Base 2.91.4
+ gcr_trust_is_certificate_pinned_async at Base 2.91.4
+ gcr_trust_is_certificate_pinned_finish at Base 2.91.4
+ gcr_trust_remove_pinned_certificate at Base 2.91.4
+ gcr_trust_remove_pinned_certificate_async at Base 2.91.4
+ gcr_trust_remove_pinned_certificate_finish at Base 2.91.4
  gcr_unlock_options_widget_get_choice at Base 2.91.1
  gcr_unlock_options_widget_get_label at Base 2.91.1
  gcr_unlock_options_widget_get_sensitive at Base 2.91.1

Added: desktop/experimental/gnome-keyring/debian/patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch?rev=26090&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch (added)
+++ desktop/experimental/gnome-keyring/debian/patches/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch [utf-8] Sat Dec 25 17:35:20 2010
@@ -1,0 +1,122 @@
+From 595573e2c15b0ee5648cf210621e0d7db2290c56 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sat, 25 Dec 2010 17:59:39 +0100
+Subject: [PATCH] Link directly to gmodule for the modules that need it
+
+---
+ configure.in                    |    4 ++++
+ pkcs11/roots-store/Makefile.am  |    7 +++++--
+ pkcs11/secret-store/Makefile.am |    4 +++-
+ pkcs11/ssh-store/Makefile.am    |    4 +++-
+ pkcs11/xdg-store/Makefile.am    |    4 +++-
+ 5 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 13a9018..30aa88f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -69,6 +69,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0)
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
++PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
++AC_SUBST(GLIB_CFLAGS)
++AC_SUBST(GLIB_LIBS)
++
+ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0)
+ AC_SUBST(GTHREAD_CFLAGS)
+ AC_SUBST(GTHREAD_LIBS)
+diff --git a/pkcs11/roots-store/Makefile.am b/pkcs11/roots-store/Makefile.am
+index 1e507ca..034a463 100644
+--- a/pkcs11/roots-store/Makefile.am
++++ b/pkcs11/roots-store/Makefile.am
+@@ -5,7 +5,9 @@ INCLUDES = \
+     	-I$(top_srcdir)/pkcs11 \
+     	$(GOBJECT_CFLAGS) \
+ 	$(LIBGCRYPT_CFLAGS) \
+-	$(GLIB_CFLAGS)
++	$(GLIB_CFLAGS) \
++	$(GMODULE_CFLAGS)
++
+ 
+ 
+ # ------------------------------------------------------------------------------
+@@ -41,7 +43,8 @@ gkm_roots_store_standalone_la_LIBADD = \
+ 	$(GOBJECT_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GLIB_LIBS) \
+-	$(LIBGCRYPT_LIBS)
++	$(LIBGCRYPT_LIBS) \
++	$(GMODULE_LIBS)
+ 
+ 
+ # -------------------------------------------------------------------------------
+diff --git a/pkcs11/secret-store/Makefile.am b/pkcs11/secret-store/Makefile.am
+index 1a6008c..3bb3e89 100644
+--- a/pkcs11/secret-store/Makefile.am
++++ b/pkcs11/secret-store/Makefile.am
+@@ -4,7 +4,8 @@ INCLUDES = \
+     	-I$(top_srcdir) \
+     	-I$(top_srcdir)/pkcs11 \
+     	$(GOBJECT_CFLAGS) \
+-	$(GLIB_CFLAGS)
++	$(GLIB_CFLAGS) \
++	$(GMODULE_CFLAGS)
+ 
+ # ------------------------------------------------------------------------------
+ # The secret store component code
+@@ -47,6 +48,7 @@ gkm_secret_store_standalone_la_LIBADD = \
+ 	$(GOBJECT_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(GMODULE_LIBS) \
+ 	$(LIBGCRYPT_LIBS)
+ 
+ # -------------------------------------------------------------------------------
+diff --git a/pkcs11/ssh-store/Makefile.am b/pkcs11/ssh-store/Makefile.am
+index 3626a44..811c8d4 100644
+--- a/pkcs11/ssh-store/Makefile.am
++++ b/pkcs11/ssh-store/Makefile.am
+@@ -5,7 +5,8 @@ INCLUDES = \
+     	-I$(top_srcdir)/pkcs11 \
+     	$(GOBJECT_CFLAGS) \
+ 	$(LIBGCRYPT_CFLAGS) \
+-	$(GLIB_CFLAGS)
++	$(GLIB_CFLAGS) \
++	$(GMODULE_CFLAGS)
+ 
+ 
+ # ------------------------------------------------------------------------------
+@@ -42,6 +43,7 @@ gkm_ssh_store_standalone_la_LIBADD = \
+ 	$(GOBJECT_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(GMODULE_LIBS) \
+ 	$(LIBGCRYPT_LIBS)
+ 
+ 
+diff --git a/pkcs11/xdg-store/Makefile.am b/pkcs11/xdg-store/Makefile.am
+index 25c092a..4bdce1f 100644
+--- a/pkcs11/xdg-store/Makefile.am
++++ b/pkcs11/xdg-store/Makefile.am
+@@ -5,7 +5,8 @@ INCLUDES = \
+ 	-I$(top_srcdir)/pkcs11 \
+ 	$(GOBJECT_CFLAGS) \
+ 	$(LIBGCRYPT_CFLAGS) \
+-	$(GLIB_CFLAGS)
++	$(GLIB_CFLAGS) \
++	$(GMODULE_CFLAGS)
+ 
+ # ------------------------------------------------------------------------------
+ # The xdg-store component code
+@@ -50,6 +51,7 @@ gkm_xdg_store_standalone_la_LIBADD = \
+ 	$(GOBJECT_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(GMODULE_LIBS) \
+ 	$(LIBGCRYPT_LIBS)
+ 
+ 
+-- 
+1.7.2.3
+

Modified: desktop/experimental/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/series?rev=26090&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/patches/series [utf-8] Sat Dec 25 17:35:20 2010
@@ -1,4 +1,1 @@
-01_pam-logging-less-verbose.patch
-03_kfreebsd.patch
-04_link-libtasns1.patch
-99_ltmain_as-needed.patch
+0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch

Modified: desktop/experimental/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/rules?rev=26090&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/rules [utf-8] Sat Dec 25 17:35:20 2010
@@ -4,6 +4,9 @@
 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/check-dist.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
@@ -16,3 +19,5 @@
 DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
 DEB_DH_MAKESHLIBS_ARGS_libgcr-3-0 += -- -c4
 DEB_DH_MAKESHLIBS_ARGS_libgck0 += -- -c4
+
+common-binary-post-install-arch:: list-missing




More information about the pkg-gnome-commits mailing list