r10726 - in /desktop/unstable/seahorse/debian: changelog control control.in

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu May  3 18:51:56 2007
New Revision: 10726

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10726
Log:
* debian/control.in:
  + Remove the gpg-agent conflict to make it at least possible to install
    those two packages at the same time. gpg-agent will be used if both are
    installed as it starts earlier and seahorse doesn't crash the session
    anymore in that case. This is a partial fix for bug #415842.

Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/control
    desktop/unstable/seahorse/debian/control.in

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=10726&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Thu May  3 18:51:56 2007
@@ -1,7 +1,6 @@
-seahorse (1.0.1-4) UNRELEASED; urgency=low
+seahorse (1.0.1-4) unstable; urgency=low
 
   [ Sebastian Dröge ]
-  * NOT RELEASED YET
   * debian/control,
     debian/control.in,
     debian/rules:
@@ -14,7 +13,14 @@
   * Add a get-orig-source target to retrieve the upstream tarball.
   * Include full licensing information in debian/copyright.
 
- -- Loic Minier <lool at dooz.org>  Wed, 02 May 2007 08:40:47 +0200
+  [ Sebastian Dröge ]
+  * debian/control.in:
+    + Remove the gpg-agent conflict to make it at least possible to install
+      those two packages at the same time. gpg-agent will be used if both are
+      installed as it starts earlier and seahorse doesn't crash the session
+      anymore in that case. This is a partial fix for bug #415842.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu,  3 May 2007 20:49:56 +0200
 
 seahorse (1.0.1-3) unstable; urgency=low
 

Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=10726&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control (original)
+++ desktop/unstable/seahorse/debian/control Thu May  3 18:51:56 2007
@@ -3,15 +3,39 @@
 Priority: optional
 Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), libgnome2-dev (>= 2.14.0), libglade2-dev, libgnomeui-dev (>= 2.10.0), scrollkeeper, libgpgme11-dev, autotools-dev, dpatch, libxml-parser-perl, gedit-dev (>= 2.10.0), libsoup2.2-dev, libldap2-dev, libnautilus-extension-dev (>= 2.9.0), libnotify-dev, libpanel-applet2-dev (>= 2.9.4), libavahi-glib-dev, libdbus-glib-1-dev, gnome-doc-utils, libgnome-keyring-dev, libglib2.0-dev (>= 2.10.0), libgtk2.0-dev (>= 2.10.0), epiphany-browser-dev (>= 2.14), libxml2-dev (>= 2.6.0), libxul-dev (>= 1.8), gnome-pkg-tools
+Build-Depends: debhelper (>= 5),
+               libgnome2-dev (>= 2.14.0),
+               libglade2-dev,
+               libgnomeui-dev (>= 2.10.0),
+               scrollkeeper,
+               libgpgme11-dev,
+               autotools-dev,
+               dpatch,
+               libxml-parser-perl,
+               gedit-dev (>= 2.10.0),
+               libsoup2.2-dev,
+               libldap2-dev,
+               libnautilus-extension-dev (>= 2.9.0),
+               libnotify-dev,
+               libpanel-applet2-dev (>= 2.9.4),
+               libavahi-glib-dev,
+               libdbus-glib-1-dev,
+               gnome-doc-utils,
+               libgnome-keyring-dev,
+               libglib2.0-dev (>= 2.10.0),
+               libgtk2.0-dev (>= 2.10.0),
+               epiphany-browser-dev (>= 2.14),
+               libxml2-dev (>= 2.6.0),
+               libxul-dev (>= 1.8),
+               gnome-pkg-tools
 Build-Conflicts: gnupg2
 Standards-Version: 3.7.2
 
 Package: seahorse
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: openssh-client
-Conflicts: gnupg-agent
 Description: A Gnome front end for GnuPG
  Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program. It
  is a tool for secure communications and data storage.  Data encryption and

Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=10726&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Thu May  3 18:51:56 2007
@@ -36,7 +36,6 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: openssh-client
-Conflicts: gnupg-agent
 Description: A Gnome front end for GnuPG
  Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program. It
  is a tool for secure communications and data storage.  Data encryption and