Merge lp:~ubuntu-branches/ubuntu/oneiric/libgnome-keyring/oneiric-201109060911 into lp:ubuntu/oneiric/libgnome-keyring

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/libgnome-keyring reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/libgnome-keyring/oneiric-201109060911. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

[Colin Watson (cjwatson)]

'bzr merge' shows no conflicts, and in fact no content changes; and there's no significant extra history here either. Rejecting.

review: Disapprove

Unmerged revisions

25. By Martin Pitt on 2011-09-06

releasing version 3.1.90-0ubuntu1

24. By Martin Pitt on 2011-09-06

import upstream release 3.1.90

=== modified file 'debian/control'
--- debian/control	2011-09-06 10:25:05 +0000
+++ debian/control	2011-09-06 09:15:36 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # This file is autogenerated. DO NOT EDIT!
 # 
 # Modifications should be made to debian/control.in instead.
@@ -77,3 +78,84 @@
  libraries.
  .
  Most people should not need this package.
+=======
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: libgnome-keyring
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Jordi Mallach <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>
+Build-Depends: debhelper (>= 5),
+               cdbs,
+               gnome-pkg-tools (>= 0.10),
+               intltool (>= 0.35.0),
+               libglib2.0-dev (>= 2.16.0),
+               gtk-doc-tools (>= 1.9),
+               docbook-xml,
+               libdbus-1-dev (>= 1.0),
+               libgcrypt11-dev (>= 1.2.2),
+               libglib2.0-doc,
+               gnome-keyring
+Standards-Version: 3.9.2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgnome-keyring/
+Homepage: http://live.gnome.org/GnomeKeyring
+
+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}
+Breaks: gnome-keyring (<< 3.0)
+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: libgnome-keyring0-dbg
+Section: debug
+Architecture: any
+Depends: libgnome-keyring0 (= ${binary:Version})
+Description: GNOME keyring services library (debugging symbols)
+ 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 detached debugging symbols for the shared
+ libraries.
+ .
+ Most people should not need this package.
+>>>>>>> MERGE-SOURCE