r17669 - in /desktop/experimental/gnome-keyring/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Nov 22 11:02:10 UTC 2008
Author: joss
Date: Sat Nov 22 11:02:10 2008
New Revision: 17669
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17669
Log:
* New upstream release.
+ Uses id_rsa.pub to read public key information. Closes: #431544.
* Bump glib build-dependency.
* Bump shlibs for libgnome-keyring0 to 2.23.5.
* 01_pam-logging-less-verbose.patch: refreshed.
* 02_dbus_crash.patch: dropped, merged upstream.
* New packages: libgp11-0 and libgp11-dev.
* libgnome-keyring-dev.docs: updated for the new source layout.
* Don’t install the .a and .la for the gnome-keyring pkcs11 module.
* Don’t run dh_makeshlibs on gnome-keyring package.
* Pass -O1 -z defs --as-needed to the linker.
* 99_ltmain_as-needed.patch: make it work on libraries.
Added:
desktop/experimental/gnome-keyring/debian/libgp11-0.install
desktop/experimental/gnome-keyring/debian/libgp11-dev.install
desktop/experimental/gnome-keyring/debian/patches/99_ltmain_as-needed.patch
Removed:
desktop/experimental/gnome-keyring/debian/patches/02_dbus_crash.patch
Modified:
desktop/experimental/gnome-keyring/debian/changelog
desktop/experimental/gnome-keyring/debian/control
desktop/experimental/gnome-keyring/debian/control.in
desktop/experimental/gnome-keyring/debian/gnome-keyring.install
desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.docs
desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.install
desktop/experimental/gnome-keyring/debian/libgnome-keyring0.shlibs
desktop/experimental/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch
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=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog (original)
+++ desktop/experimental/gnome-keyring/debian/changelog Sat Nov 22 11:02:10 2008
@@ -1,3 +1,20 @@
+gnome-keyring (2.24.1-1) experimental; urgency=low
+
+ * New upstream release.
+ + Uses id_rsa.pub to read public key information. Closes: #431544.
+ * Bump glib build-dependency.
+ * Bump shlibs for libgnome-keyring0 to 2.23.5.
+ * 01_pam-logging-less-verbose.patch: refreshed.
+ * 02_dbus_crash.patch: dropped, merged upstream.
+ * New packages: libgp11-0 and libgp11-dev.
+ * libgnome-keyring-dev.docs: updated for the new source layout.
+ * Don’t install the .a and .la for the gnome-keyring pkcs11 module.
+ * Don’t run dh_makeshlibs on gnome-keyring package.
+ * Pass -O1 -z defs --as-needed to the linker.
+ * 99_ltmain_as-needed.patch: make it work on libraries.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 22 Nov 2008 11:02:45 +0100
+
gnome-keyring (2.22.3-2) unstable; urgency=low
* 02_dbus_crash.patch: patch from upstream to fix a crash that happens
Modified: desktop/experimental/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control (original)
+++ desktop/experimental/gnome-keyring/debian/control Sat Nov 22 11:02:10 2008
@@ -2,11 +2,11 @@
Section: gnome
Priority: optional
Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Norbert Tretkowski <nobse at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
libgtk2.0-dev (>= 2.6.0),
- libglib2.0-dev (>= 2.8.0),
+ libglib2.0-dev (>= 2.16.0),
libgconf2-dev (>= 2.8.0),
libtasn1-3-dev (>= 0.3.4),
cdbs,
@@ -38,7 +38,7 @@
Architecture: any
Depends: ${misc:Depends},
libgnome-keyring0 (= ${binary:Version}),
- libglib2.0-dev
+ libglib2.0-dev (>= 2.8)
Description: Development files for GNOME keyring service
gnome-keyring is a daemon in the session, similar to ssh-agent,
and other applications can use it to store passwords and other
@@ -67,6 +67,31 @@
.
This package contains shared libraries for GNOME.
+Package: libgp11-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libgp11-0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.16)
+Description: GLib wrapper library for PKCS#11 - development
+ GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ interface.
+ .
+ This package contains the static libraries, header files and
+ documentation needed to build applications using the GP11 library.
+
+Package: libgp11-0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Description: Glib wrapper library for PKCS#11 - runtime
+ GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ interface.
+ .
+ This package contains the shared libraries needed to run programs
+ built against the GP11 library.
+
Package: libpam-gnome-keyring
Section: admin
Architecture: any
Modified: desktop/experimental/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/control.in?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/control.in (original)
+++ desktop/experimental/gnome-keyring/debian/control.in Sat Nov 22 11:02:10 2008
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
libgtk2.0-dev (>= 2.6.0),
- libglib2.0-dev (>= 2.8.0),
+ libglib2.0-dev (>= 2.16.0),
libgconf2-dev (>= 2.8.0),
libtasn1-3-dev (>= 0.3.4),
cdbs,
@@ -38,7 +38,7 @@
Architecture: any
Depends: ${misc:Depends},
libgnome-keyring0 (= ${binary:Version}),
- libglib2.0-dev
+ libglib2.0-dev (>= 2.8)
Description: Development files for GNOME keyring service
gnome-keyring is a daemon in the session, similar to ssh-agent,
and other applications can use it to store passwords and other
@@ -67,6 +67,31 @@
.
This package contains shared libraries for GNOME.
+Package: libgp11-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+ libgp11-0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.16)
+Description: GLib wrapper library for PKCS#11 - development
+ GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ interface.
+ .
+ This package contains the static libraries, header files and
+ documentation needed to build applications using the GP11 library.
+
+Package: libgp11-0
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Description: Glib wrapper library for PKCS#11 - runtime
+ GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
+ interface.
+ .
+ This package contains the shared libraries needed to run programs
+ built against the GP11 library.
+
Package: libpam-gnome-keyring
Section: admin
Architecture: any
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=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/gnome-keyring.install (original)
+++ desktop/experimental/gnome-keyring/debian/gnome-keyring.install Sat Nov 22 11:02:10 2008
@@ -2,4 +2,5 @@
debian/tmp/usr/bin
debian/tmp/usr/share/locale
debian/tmp/usr/share/dbus-1/services
-debian/tmp/usr/lib/gnome-keyring
+debian/tmp/usr/lib/gnome-keyring/gnome-keyring-ask
+debian/tmp/usr/lib/gnome-keyring/*.so
Modified: desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.docs?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.docs (original)
+++ desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.docs Sat Nov 22 11:02:10 2008
@@ -1,4 +1,4 @@
-keyrings/file-format.txt
+daemon/keyrings/file-format.txt
NEWS
README
TODO
Modified: desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.install?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.install (original)
+++ desktop/experimental/gnome-keyring/debian/libgnome-keyring-dev.install Sat Nov 22 11:02:10 2008
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/
+debian/tmp/usr/include/gnome-keyring*
debian/tmp/usr/lib/libgnome-keyring.a
debian/tmp/usr/lib/libgnome-keyring.la
debian/tmp/usr/lib/libgnome-keyring.so
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/share/gtk-doc/
+debian/tmp/usr/lib/pkgconfig/gnome-keyring*.pc
+debian/tmp/usr/share/gtk-doc/html/gnome-keyring*
Modified: desktop/experimental/gnome-keyring/debian/libgnome-keyring0.shlibs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgnome-keyring0.shlibs?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgnome-keyring0.shlibs (original)
+++ desktop/experimental/gnome-keyring/debian/libgnome-keyring0.shlibs Sat Nov 22 11:02:10 2008
@@ -1,1 +1,1 @@
-libgnome-keyring 0 libgnome-keyring0 (>= 2.22.0)
+libgnome-keyring 0 libgnome-keyring0 (>= 2.23.5)
Added: desktop/experimental/gnome-keyring/debian/libgp11-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgp11-0.install?rev=17669&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgp11-0.install (added)
+++ desktop/experimental/gnome-keyring/debian/libgp11-0.install Sat Nov 22 11:02:10 2008
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libgp11.so.*
Added: desktop/experimental/gnome-keyring/debian/libgp11-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/libgp11-dev.install?rev=17669&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgp11-dev.install (added)
+++ desktop/experimental/gnome-keyring/debian/libgp11-dev.install Sat Nov 22 11:02:10 2008
@@ -1,0 +1,5 @@
+debian/tmp/usr/include/gp11
+debian/tmp/usr/lib/libgp11.a
+debian/tmp/usr/lib/libgp11.so
+debian/tmp/usr/lib/pkgconfig/gp11*.pc
+debian/tmp/usr/share/gtk-doc/html/gp11
Modified: desktop/experimental/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch (original)
+++ desktop/experimental/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch Sat Nov 22 11:02:10 2008
@@ -1,6 +1,8 @@
---- pam/gkr-pam-module.c.old 2008-01-08 20:12:43.000000000 +0100
-+++ pam/gkr-pam-module.c 2008-01-08 20:13:27.000000000 +0100
-@@ -716,7 +716,7 @@
+Index: gnome-keyring-2.24.1/pam/gkr-pam-module.c
+===================================================================
+--- gnome-keyring-2.24.1.orig/pam/gkr-pam-module.c 2008-09-16 23:45:07.000000000 +0200
++++ gnome-keyring-2.24.1/pam/gkr-pam-module.c 2008-11-22 11:14:00.707526445 +0100
+@@ -769,7 +769,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
pwd = getpwnam (user);
if (!pwd) {
Added: desktop/experimental/gnome-keyring/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/99_ltmain_as-needed.patch?rev=17669&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/experimental/gnome-keyring/debian/patches/99_ltmain_as-needed.patch Sat Nov 22 11:02:10 2008
@@ -1,0 +1,30 @@
+--- ltmain.sh.orig 2008-10-19 10:32:18.000000000 +0200
++++ ltmain.sh 2008-11-22 11:52:34.555029690 +0100
+@@ -4189,6 +4189,11 @@
+ arg=$func_stripname_result
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -4543,6 +4548,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/experimental/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/rules?rev=17669&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/rules (original)
+++ desktop/experimental/gnome-keyring/debian/rules Sat Nov 22 11:02:10 2008
@@ -7,5 +7,9 @@
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+
DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security \
--enable-tests
+
+DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
More information about the pkg-gnome-commits
mailing list