r40134 - in /desktop/unstable/gnome-panel: ./ debian/control debian/control.in debian/patches/fix-gweather-crash.patch

[pixelpapst-guest at users.alioth.debian.org]

Author: pixelpapst-guest
Date: Sun Oct 27 16:20:41 2013
New Revision: 40134

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40134
Log:
correctly record the merge of 3.4.2.1-6 done in r39864 by biebl

(so history of patches/fix-gweather-crash.patch doesn't get lost)


Added:
    desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch
      - copied unchanged from r39823, desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch
Modified:
    desktop/unstable/gnome-panel/   (props changed)
    desktop/unstable/gnome-panel/debian/control
    desktop/unstable/gnome-panel/debian/control.in

Propchange: desktop/unstable/gnome-panel/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/unstable/gnome-panel:38477-39823

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=40134&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control	[utf-8] Sun Oct 27 16:20:41 2013
@@ -12,7 +12,7 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
-               evolution-data-server-dev,
+               evolution-data-server-dev (>= 3.5.3),
                gnome-pkg-tools (>= 0.14),
                gobject-introspection (>= 0.9.12-4~),
                gtk-doc-tools (>= 1.0),

Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=40134&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in	[utf-8] Sun Oct 27 16:20:41 2013
@@ -7,7 +7,7 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
-               evolution-data-server-dev,
+               evolution-data-server-dev (>= 3.5.3),
                gnome-pkg-tools (>= 0.14),
                gobject-introspection (>= 0.9.12-4~),
                gtk-doc-tools (>= 1.0),