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

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Mon Apr 12 11:16:07 UTC 2010


Author: slomo
Date: Mon Apr 12 11:16:05 2010
New Revision: 23736

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23736
Log:
* New upstream stable release:
  + debian/control.in,
    debian/libgnome-keyring*:
    - Dropped libgnome-keyring package, it has its own source package now.
  + debian/control.in:
    - Drop GConf build dependency.
  + debian/patches/04_maxpathlen_hurd.patch:
    - Dropped, merged upstream.
  + debian/patches/10_whitelist_system.patch:
    - Dropped, relevant code does not exist anymore.
  + debian/patches/04_link-libtasns1.patch:
    - Fix linking with libtasn1.

Added:
    desktop/unstable/gnome-keyring/debian/patches/04_link-libtasns1.patch
Removed:
    desktop/unstable/gnome-keyring/debian/libgnome-keyring-dev.docs
    desktop/unstable/gnome-keyring/debian/libgnome-keyring-dev.install
    desktop/unstable/gnome-keyring/debian/libgnome-keyring0.install
    desktop/unstable/gnome-keyring/debian/libgnome-keyring0.shlibs
    desktop/unstable/gnome-keyring/debian/libgnome-keyring0.symbols
    desktop/unstable/gnome-keyring/debian/patches/04_maxpathlen_hurd.patch
    desktop/unstable/gnome-keyring/debian/patches/10_whitelist_system.patch
Modified:
    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.docs
    desktop/unstable/gnome-keyring/debian/gnome-keyring.install
    desktop/unstable/gnome-keyring/debian/libgcr0.symbols
    desktop/unstable/gnome-keyring/debian/patches/series

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Mon Apr 12 11:16:05 2010
@@ -1,9 +1,24 @@
-gnome-keyring (2.28.2-2) UNRELEASED; urgency=low
-
+gnome-keyring (2.30.0-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
   * The library only suggests the daemon. Closes: #563358.
   * 03_kfreebsd.patch: new version of the patch. Closes: #558406 again.
 
- -- Josselin Mouette <joss at debian.org>  Mon, 04 Jan 2010 15:56:46 +0100
+  [ Sebastian Dröge ]
+  * New upstream stable release:
+    + debian/control.in,
+      debian/libgnome-keyring*:
+      - Dropped libgnome-keyring package, it has its own source package now.
+    + debian/control.in:
+      - Drop GConf build dependency.
+    + debian/patches/04_maxpathlen_hurd.patch:
+      - Dropped, merged upstream.
+    + debian/patches/10_whitelist_system.patch:
+      - Dropped, relevant code does not exist anymore.
+    + debian/patches/04_link-libtasns1.patch:
+      - Fix linking with libtasn1.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 12 Apr 2010 12:49:53 +0200
 
 gnome-keyring (2.28.2-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control [utf-8] Mon Apr 12 11:16:05 2010
@@ -7,7 +7,7 @@
 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>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.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>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs,
                quilt,
@@ -15,7 +15,6 @@
                intltool (>= 0.35.0),
                libgtk2.0-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.16.0),
-               libgconf2-dev (>= 2.8.0),
                libtasn1-3-dev (>= 0.3.4),
                libtasn1-3-bin,
                gtk-doc-tools (>= 1.9),
@@ -24,7 +23,7 @@
                libgcrypt11-dev (>= 1.2.2),
                libpam0g-dev,
                libglib2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: gnome-keyring
 Section: gnome
@@ -41,40 +40,6 @@
  The program can manage several keyrings, each with its own master
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
-
-Package: libgnome-keyring-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
-         libgnome-keyring0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.16)
-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
- sensitive information.
- .
- The program can manage several keyrings, each with its own master
- password, and there is also a session keyring which is never stored to
- disk, but forgotten when the session ends.
- .
- This package contains development files for GNOME.
-
-Package: libgnome-keyring0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: gnome-keyring
-Description: GNOME keyring services library
- gnome-keyring is a daemon in the session, similar to ssh-agent,
- and other applications can use it to store passwords and other
- sensitive information.
- .
- The program can manage several keyrings, each with its own master
- password, and there is also a session keyring which is never stored to
- disk, but forgotten when the session ends.
- .
- This package contains shared libraries for GNOME.
 
 Package: libgp11-dev
 Section: libdevel

Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in [utf-8] Mon Apr 12 11:16:05 2010
@@ -10,7 +10,6 @@
                intltool (>= 0.35.0),
                libgtk2.0-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.16.0),
-               libgconf2-dev (>= 2.8.0),
                libtasn1-3-dev (>= 0.3.4),
                libtasn1-3-bin,
                gtk-doc-tools (>= 1.9),
@@ -19,7 +18,7 @@
                libgcrypt11-dev (>= 1.2.2),
                libpam0g-dev,
                libglib2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: gnome-keyring
 Section: gnome
@@ -36,40 +35,6 @@
  The program can manage several keyrings, each with its own master
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
-
-Package: libgnome-keyring-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends},
-         libgnome-keyring0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.16)
-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
- sensitive information.
- .
- The program can manage several keyrings, each with its own master
- password, and there is also a session keyring which is never stored to
- disk, but forgotten when the session ends.
- .
- This package contains development files for GNOME.
-
-Package: libgnome-keyring0
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: gnome-keyring
-Description: GNOME keyring services library
- gnome-keyring is a daemon in the session, similar to ssh-agent,
- and other applications can use it to store passwords and other
- sensitive information.
- .
- The program can manage several keyrings, each with its own master
- password, and there is also a session keyring which is never stored to
- disk, but forgotten when the session ends.
- .
- This package contains shared libraries for GNOME.
 
 Package: libgp11-dev
 Section: libdevel

Modified: desktop/unstable/gnome-keyring/debian/gnome-keyring.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/gnome-keyring.docs?rev=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.docs [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.docs [utf-8] Mon Apr 12 11:16:05 2010
@@ -1,1 +1,0 @@
-keyring-intro.txt

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=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/gnome-keyring.install [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/gnome-keyring.install [utf-8] Mon Apr 12 11:16:05 2010
@@ -2,7 +2,7 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/dbus-1/services
-debian/tmp/usr/lib/gnome-keyring/gnome-keyring-ask
+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

Modified: desktop/unstable/gnome-keyring/debian/libgcr0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/libgcr0.symbols?rev=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/libgcr0.symbols [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/libgcr0.symbols [utf-8] Mon Apr 12 11:16:05 2010
@@ -66,3 +66,5 @@
  gcr_parser_parse_data at Base 2.26.0
  gcr_simple_certificate_get_type at Base 2.26.0
  gcr_simple_certificate_new at Base 2.26.0
+ gcr_unlock_options_widget_get_type at Base 2.30.0
+ gcr_unlock_options_widget_new at Base 2.30.0

Added: desktop/unstable/gnome-keyring/debian/patches/04_link-libtasns1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/04_link-libtasns1.patch?rev=23736&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/04_link-libtasns1.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/04_link-libtasns1.patch [utf-8] Mon Apr 12 11:16:05 2010
@@ -1,0 +1,22 @@
+--- a/pkcs11/secret-store/Makefile.am	2010-04-12 13:07:06.322516879 +0200
++++ b/pkcs11/secret-store/Makefile.am	2010-04-12 13:07:31.682841497 +0200
+@@ -47,6 +47,7 @@
+ 	$(GOBJECT_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(LIBTASN1_LIBS) \
+ 	$(LIBGCRYPT_LIBS)
+ 
+ # -------------------------------------------------------------------------------
+--- a/pkcs11/secret-store/Makefile.in	2010-04-12 13:07:09.090511354 +0200
++++ b/pkcs11/secret-store/Makefile.in	2010-04-12 13:08:07.187552442 +0200
+@@ -387,7 +387,8 @@
+ 	$(GOBJECT_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	$(GLIB_LIBS) \
+-	$(LIBGCRYPT_LIBS)
++	$(LIBGCRYPT_LIBS) \
++	$(LIBTASN1_LIBS)
+ 
+ @WITH_TESTS_FALSE at TESTS_DIR = 
+ 

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=23736&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series [utf-8] Mon Apr 12 11:16:05 2010
@@ -1,6 +1,5 @@
 01_pam-logging-less-verbose.patch
 02_uidir_relocate.patch
 03_kfreebsd.patch
-04_maxpathlen_hurd.patch
-10_whitelist_system.patch
+04_link-libtasns1.patch
 99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list