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

[ah at users.alioth.debian.org]

Author: ah
Date: Sat May 25 22:19:46 2013
New Revision: 38140

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38140
Log:
* Drop gnupg2 Build-Conflicts added in 1.0-1, should be fixed since
  a long time. See patch added in 1.0.1-6 and later merged upstream.
  (Previous related changes are tagged with bug #407800)
* Upload to unstable.

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=38140&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Sat May 25 22:19:46 2013
@@ -1,8 +1,15 @@
-seahorse (3.8.2-1) UNRELEASED; urgency=low
-
+seahorse (3.8.2-1) unstable; urgency=low
+
+  [ Thomas Bechtold ]
   * New upstream release
 
- -- Thomas Bechtold <thomasbechtold at jpberlin.de>  Tue, 14 May 2013 14:23:27 +0200
+  [ Andreas Henriksson ]
+  * Drop gnupg2 Build-Conflicts added in 1.0-1, should be fixed since
+    a long time. See patch added in 1.0.1-6 and later merged upstream.
+    (Previous related changes are tagged with bug #407800)
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 25 May 2013 23:52:47 +0200
 
 seahorse (3.8.0-1) experimental; urgency=low
 

Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=38140&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Sat May 25 22:19:46 2013
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
@@ -28,7 +28,6 @@
                gnome-pkg-tools,
                openssh-client,
                yelp-tools
-Build-Conflicts: gnupg2
 Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/

Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=38140&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Sat May 25 22:19:46 2013
@@ -23,7 +23,6 @@
                gnome-pkg-tools,
                openssh-client,
                yelp-tools
-Build-Conflicts: gnupg2
 Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/