r27554 - in /desktop/unstable/gnome-keyring: ./ debian/ debian/patches/

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Thu Apr 14 11:28:05 UTC 2011


Author: jordi
Date: Thu Apr 14 11:28:03 2011
New Revision: 27554

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27554
Log:
* Upload to unstable.
* Rename libgcr-dev to libgcr-3-dev, to allow for a future GTK+2-based
  build, if needed.

Added:
    desktop/unstable/gnome-keyring/debian/libgck-dev.install
      - copied unchanged from r27552, desktop/experimental/gnome-keyring/debian/libgck-dev.install
    desktop/unstable/gnome-keyring/debian/libgck0.install
      - copied unchanged from r27552, desktop/experimental/gnome-keyring/debian/libgck0.install
    desktop/unstable/gnome-keyring/debian/libgck0.symbols
      - copied unchanged from r27552, desktop/experimental/gnome-keyring/debian/libgck0.symbols
    desktop/unstable/gnome-keyring/debian/libgcr-3-0.install
      - copied unchanged from r27552, desktop/experimental/gnome-keyring/debian/libgcr-3-0.install
    desktop/unstable/gnome-keyring/debian/libgcr-3-0.symbols
      - copied, changed from r27552, desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols
    desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install
      - copied, changed from r27552, desktop/unstable/gnome-keyring/debian/libgcr-dev.install
    desktop/unstable/gnome-keyring/debian/patches/04_expand_LIBEXECDIR.patch
      - copied unchanged from r27552, desktop/experimental/gnome-keyring/debian/patches/04_expand_LIBEXECDIR.patch
Removed:
    desktop/unstable/gnome-keyring/debian/libgcr-dev.install
    desktop/unstable/gnome-keyring/debian/libgcr0.install
    desktop/unstable/gnome-keyring/debian/libgcr0.shlibs
    desktop/unstable/gnome-keyring/debian/libgcr0.symbols
    desktop/unstable/gnome-keyring/debian/libgp11-0.install
    desktop/unstable/gnome-keyring/debian/libgp11-0.shlibs
    desktop/unstable/gnome-keyring/debian/libgp11-0.symbols
    desktop/unstable/gnome-keyring/debian/libgp11-dev.install
    desktop/unstable/gnome-keyring/debian/patches/01_pam-logging-less-verbose.patch
    desktop/unstable/gnome-keyring/debian/patches/02_uidir_relocate.patch
    desktop/unstable/gnome-keyring/debian/patches/04_link-libtasns1.patch
    desktop/unstable/gnome-keyring/debian/patches/05_hurd_maxpathlen.patch
    desktop/unstable/gnome-keyring/debian/patches/06_init_timeout.patch
    desktop/unstable/gnome-keyring/debian/patches/07_keyring_encoding.patch
    desktop/unstable/gnome-keyring/debian/patches/10_debugging_output.patch
Modified:
    desktop/unstable/gnome-keyring/   (props changed)
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/control
    desktop/unstable/gnome-keyring/debian/control.in
    desktop/unstable/gnome-keyring/debian/gnome-keyring.install
    desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst
    desktop/unstable/gnome-keyring/debian/patches/series
    desktop/unstable/gnome-keyring/debian/rules

Propchange: desktop/unstable/gnome-keyring/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/gnome-keyring:25353-27552

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,3 +1,141 @@
+gnome-keyring (3.0.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Rename libgcr-dev to libgcr-3-dev, to allow for a future GTK+2-based
+    build, if needed.
+
+ -- Jordi Mallach <jordi at debian.org>  Thu, 14 Apr 2011 12:43:29 +0200
+
+gnome-keyring (3.0.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Drop debian/patches/01_pam-logging-less-verbose.patch,
+    debian/patches/05_use_in_xfce.patch: Applied upstream
+  * debian/libgcr-3-0.symbols: Adjust .symbols file
+  * debian/gnome-keyring.install: Also install /usr/share/applications/
+  * debian/patches/04_expand_LIBEXECDIR.patch: Correctly expand LIBEXECDIR
+    in gnome-keyring-prompt.desktop
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 10 Apr 2011 23:25:25 +0200
+
+gnome-keyring (2.91.91-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control.in:
+    - Add libcap-dev as build-dependency for linux-any
+    - Make gnome-keyring Depends against libcap2-bin for linux-any
+    - Vcs-Browser: Use viewsvn instead the horrible wsvn
+  * debian/gnome-keyring.postinst:
+    - Set CAP_IPC_LOCK capability on gnome-keyring-daemon.
+      This would permit gnome-keyring to overcome limits on locked memory
+      and prevent private keys to be swapped out.
+    - Do not cleanup .desktop files from /etc/xdg/autostart as we are shipping
+      them again in that directory
+  * debian/libgcr-3-0.symbols, debian/libgck0.symbols: Adjusts symbols files
+  * debian/patches/04_link-libtasns1.patch,
+    d/p/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch:
+    Drop patches, not needed anymore
+  * debian/patches/05_use_in_xfce.patch: Make gnome-keyring-daemon also start
+    for XFCE, taken from Ubuntu
+  * debian/gnome-keyring.install:
+    - Drop debian/tmp/usr/share/gnome-keyring/introspect,
+      debian/tmp/etc/xdg/pkcs11.conf.defaults
+    - Move back .desktop files to /etc/xdg/autostart to also startup
+      gnome-keyring-daemon for Lxde and Xfce (Closes: #599757)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 10 Mar 2011 22:20:24 +0100
+
+gnome-keyring (2.91.4-3) experimental; urgency=low
+
+  * debian/control.in:
+    - Update for the new gtk+ package names.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 19 Feb 2011 14:33:53 +0000
+
+gnome-keyring (2.91.4-2) experimental; urgency=low
+
+  * debian/rules,
+    debian/control.in:
+    - Don't add quilt support, source format 3.0 (quilt) does that for us.
+    - Build depend on ca-certificates and let the configure script
+      autodetect the certificates dir. Closes: #608003.
+  * debian/rules:
+    - Reorder includes a bit.
+  * debian/libgcr-3-0.symbols:
+    - Add a Build-Depends-Package line to get proper dependencies when a
+      package build-depends on a higher version of libgcr-dev than what
+      it gets from the used symbols.
+  * debian/libgcr-3-0.shlibs,
+    debian/libgck0.shlibs,
+    debian/rules:
+    - Generate the shlibs files at build time, and make them depend on the
+      upstream version. We have .symbols files anyway, and updating the
+      shlibs version is error prone. This puts us on the safe side.
+  * debian/control.in:
+    - Bump libgtk3.0-dev build dependency.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 12 Jan 2011 22:50:20 +0000
+
+gnome-keyring (2.91.4-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Install gnome-keyring-prompt-3. Closes: #607192.
+
+  [ 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 21:30:35 +0100
+
+gnome-keyring (2.91.3-1) experimental; urgency=low
+
+  * New upstream release
+    - Drop debian/patches/06_init_timeout.patch: Merged upstream
+  * debian/control.in:
+    - Bump Standards-Version to 3.9.1 (no further changes)
+    - Remove duplicate Section to please lintian
+    - Bump glib {build-}dependencies to 2.25.0
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 04 Dec 2010 17:34:49 +0100
+
+gnome-keyring (2.91.1-1) experimental; urgency=low
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Update soname of libgcr
+  * Update install files
+  * debian/patches/02_uidir_relocate.patch:
+    + Removed, merged upstream
+  * debian/patches/05_hurd_maxpathlen.patch:
+    + Removed, merged upstream
+  * debian/patches/10_debugging_output.patch:
+    + Removed, no longer needed
+  * debian/patches/06_init_timeout.patch
+    + Updated
+  * Drop libgp11, it has been replaced by libgck
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/rules:
+    - Drop libgp11 stuff, not needed anymore.
+    - Update libgcr package name so it has an effect.
+    - Also make the symbols check strict for libgck.
+    - Include check-dist.mk to prevent accidental uploads to unstable.
+  * debian/libgcr-3-0.shlibs:
+    - Updated for the new SONAME.
+  * debian/control,
+    debian/libgck-0.*,
+    debian/libgcr3.*:
+    - Rename libgck-0 to libgck0 so the package matches the SONAME, and
+      libgcr3 to libgcr-3-0 so it embeds the SONAME in the package name.
+  * debian/libgck0.symbols:
+    - Remove debian revision from every symbol.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 20 Nov 2010 11:25:16 +0100
+
 gnome-keyring (2.30.3-5) unstable; urgency=low
 
   * 07_keyring_encoding.patch: patch from upstream git. Correctly handle 

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control [utf-8] Thu Apr 14 11:28:03 2011
@@ -7,13 +7,14 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl 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>, Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
+               dh-autoreconf,
                cdbs,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
-               libgtk2.0-dev (>= 2.20.0),
-               libglib2.0-dev (>= 2.16.0),
+               libgtk-3-dev (>= 3.0.0),
+               libglib2.0-dev (>= 2.25.0),
                libtasn1-3-dev (>= 0.3.4),
                libtasn1-3-bin,
                gtk-doc-tools (>= 1.9),
@@ -21,18 +22,20 @@
                libdbus-1-dev (>= 1.0),
                libgcrypt11-dev (>= 1.2.2),
                libpam0g-dev,
-               libglib2.0-doc
-Standards-Version: 3.9.0
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/
+               ca-certificates,
+               libglib2.0-doc,
+               libcap-dev [linux-any]
+Standards-Version: 3.9.1
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-keyring/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-keyring/
 Homepage: http://live.gnome.org/GnomeKeyring
 
 Package: gnome-keyring
-Section: gnome
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         dbus-x11
+         dbus-x11,
+         libcap2-bin [linux-any]
 Breaks: libgnome-keyring0 (<< 2.30)
 Recommends: libpam-gnome-keyring
 Description: GNOME keyring services (daemon and tools)
@@ -44,31 +47,31 @@
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
-Package: libgp11-dev
+Package: libgck-dev
 Section: libdevel
 Architecture: any
 Replaces: libgnome-keyring-dev (<< 2.25)
 Depends: ${misc:Depends},
-         libgp11-0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.16)
+         libgck0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.25.0)
 Description: GLib wrapper library for PKCS#11 - development
- GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) 
+ GCK 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.
+ This package contains the static libraries, header files and
+ documentation needed to build applications using the GCK library.
 
-Package: libgp11-0
+Package: libgck0
 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) 
+ GCK 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.
+ This package contains the shared libraries needed to run programs
+ built against the GCK library.
 
 Package: libpam-gnome-keyring
 Section: admin
@@ -85,31 +88,33 @@
  and other applications can use it to store passwords and other
  sensitive information.
  .
- This package contains a PAM module that will automatically unlock the 
- keyrings using your login password, making gnome-keyring usage 
+ This package contains a PAM module that will automatically unlock the
+ keyrings using your login password, making gnome-keyring usage
  transparent without losing its security benefits.
  .
- When installed, this module will automatically be used by GDM and 
- gnome-screensaver to unlock your keyrings when logging in and when 
+ When installed, this module will automatically be used by GDM and
+ gnome-screensaver to unlock your keyrings when logging in and when
  unlocking the screen saver.
 
-Package: libgcr-dev
+Package: libgcr-3-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libgcr0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.16.0),
-         libgp11-dev (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.20.0),
+         libgcr-3-0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.25.0),
+         libgck-dev (= ${binary:Version}),
+         libgtk-3-dev (>= 3.0.0),
          libtasn1-3-dev (>= 0.3.4),
          libtasn1-3-bin
+Replaces: libgcr-dev
+Conflicts: libgcr-dev
 Description: Library for Crypto UI related task - development
  GCR is a library for crypto UI and related tasks.
  .
  This package contains the static libraries, header files and
  documentation needed to build applications using the GCR library.
 
-Package: libgcr0
+Package: libgcr-3-0
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},

Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in [utf-8] Thu Apr 14 11:28:03 2011
@@ -4,11 +4,12 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
+               dh-autoreconf,
                cdbs,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
-               libgtk2.0-dev (>= 2.20.0),
-               libglib2.0-dev (>= 2.16.0),
+               libgtk-3-dev (>= 3.0.0),
+               libglib2.0-dev (>= 2.25.0),
                libtasn1-3-dev (>= 0.3.4),
                libtasn1-3-bin,
                gtk-doc-tools (>= 1.9),
@@ -16,18 +17,20 @@
                libdbus-1-dev (>= 1.0),
                libgcrypt11-dev (>= 1.2.2),
                libpam0g-dev,
-               libglib2.0-doc
-Standards-Version: 3.9.0
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/
+               ca-certificates,
+               libglib2.0-doc,
+               libcap-dev [linux-any]
+Standards-Version: 3.9.1
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-keyring/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-keyring/
 Homepage: http://live.gnome.org/GnomeKeyring
 
 Package: gnome-keyring
-Section: gnome
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         dbus-x11
+         dbus-x11,
+         libcap2-bin [linux-any]
 Breaks: libgnome-keyring0 (<< 2.30)
 Recommends: libpam-gnome-keyring
 Description: GNOME keyring services (daemon and tools)
@@ -39,31 +42,31 @@
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
-Package: libgp11-dev
+Package: libgck-dev
 Section: libdevel
 Architecture: any
 Replaces: libgnome-keyring-dev (<< 2.25)
 Depends: ${misc:Depends},
-         libgp11-0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.16)
+         libgck0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.25.0)
 Description: GLib wrapper library for PKCS#11 - development
- GP11 is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) 
+ GCK 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.
+ This package contains the static libraries, header files and
+ documentation needed to build applications using the GCK library.
 
-Package: libgp11-0
+Package: libgck0
 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) 
+ GCK 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.
+ This package contains the shared libraries needed to run programs
+ built against the GCK library.
 
 Package: libpam-gnome-keyring
 Section: admin
@@ -80,31 +83,33 @@
  and other applications can use it to store passwords and other
  sensitive information.
  .
- This package contains a PAM module that will automatically unlock the 
- keyrings using your login password, making gnome-keyring usage 
+ This package contains a PAM module that will automatically unlock the
+ keyrings using your login password, making gnome-keyring usage
  transparent without losing its security benefits.
  .
- When installed, this module will automatically be used by GDM and 
- gnome-screensaver to unlock your keyrings when logging in and when 
+ When installed, this module will automatically be used by GDM and
+ gnome-screensaver to unlock your keyrings when logging in and when
  unlocking the screen saver.
 
-Package: libgcr-dev
+Package: libgcr-3-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libgcr0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.16.0),
-         libgp11-dev (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.20.0),
+         libgcr-3-0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.25.0),
+         libgck-dev (= ${binary:Version}),
+         libgtk-3-dev (>= 3.0.0),
          libtasn1-3-dev (>= 0.3.4),
          libtasn1-3-bin
+Replaces: libgcr-dev
+Conflicts: libgcr-dev
 Description: Library for Crypto UI related task - development
  GCR is a library for crypto UI and related tasks.
  .
  This package contains the static libraries, header files and
  documentation needed to build applications using the GCR library.
 
-Package: libgcr0
+Package: libgcr-3-0
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},

Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.install?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.install [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,11 +1,11 @@
-debian/tmp/etc/gconf/schemas
 debian/tmp/usr/bin
+debian/tmp/usr/share/applications/
 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/gnome-keyring-prompt*
 debian/tmp/usr/lib/gnome-keyring/devel/*.so
-debian/tmp/usr/lib/gnome-keyring/standalone/*.so
-debian/tmp/etc/xdg/autostart /usr/share/gnome
-debian/tmp/usr/share/gnome-keyring/ui
-debian/tmp/usr/share/gnome-keyring/introspect
+debian/tmp/usr/share/glib-2.0/schemas/*
+debian/tmp/usr/share/GConf/gsettings/*
+debian/tmp/etc/xdg/autostart
+debian/tmp/usr/share/gnome-keyring-3/ui
+debian/tmp/usr/lib/pkcs11/*.so

Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.postinst [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,8 +1,15 @@
-#! /bin/sh
+#!/bin/sh
 set -e
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" le-nl "2.26.1-1"; then
-    rm -f /etc/xdg/autostart/gnome-keyring-daemon.desktop
+PROGRAM=/usr/bin/gnome-keyring-daemon
+
+if [ "$1" = configure ]; then
+    if which setcap > /dev/null && [ -e $PROGRAM ]; then
+        if ! setcap CAP_IPC_LOCK=ep $PROGRAM; then
+            echo "Setting capabilities for gnome-keyring-daemon using Linux Capabilities failed."
+            exit 1
+        fi
+    fi
 fi
 
 #DEBHELPER#

Copied: desktop/unstable/gnome-keyring/debian/libgcr-3-0.symbols (from r27552, desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr-3-0.symbols?rev=27554&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/libgcr-3-0.symbols [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgcr-3-0.symbols [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,5 +1,5 @@
 libgcr-3.so.0 libgcr-3-0 #MINVER#
-* Build-Depends-Package: libgcr-dev
+* Build-Depends-Package: libgcr-3-dev
  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

Copied: desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install (from r27552, desktop/unstable/gnome-keyring/debian/libgcr-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgcr-dev.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgcr-3-dev.install [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/gcr
-debian/tmp/usr/lib/libgcr.a
-debian/tmp/usr/lib/libgcr.so
-debian/tmp/usr/lib/pkgconfig/gcr*.pc
-debian/tmp/usr/share/gtk-doc/html/gcr
+debian/tmp/usr/include/gcr-3
+debian/tmp/usr/lib/libgcr-3.a
+debian/tmp/usr/lib/libgcr-3.so
+debian/tmp/usr/lib/pkgconfig/gcr-3.pc
+debian/tmp/usr/share/gtk-doc/html/gcr-3

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,9 +1,3 @@
-01_pam-logging-less-verbose.patch
-02_uidir_relocate.patch
 03_kfreebsd.patch
-04_link-libtasns1.patch
-05_hurd_maxpathlen.patch
-06_init_timeout.patch
-07_keyring_encoding.patch
-10_debugging_output.patch
+04_expand_LIBEXECDIR.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=27554&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules [utf-8] Thu Apr 14 11:28:03 2011
@@ -1,15 +1,20 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.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 \
-                             --with-root-certs=/etc/ssl/certs
+                             --with-gtk=3.0 \
+                             --enable-gtk-doc
 
 DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
-DEB_DH_MAKESHLIBS_ARGS_libgcr0 += -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libgp11-0 += -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libgcr-3-0 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libgck0 += -V -- -c4
+
+common-binary-post-install-arch:: list-missing




More information about the pkg-gnome-commits mailing list