r1952 - in /unstable/evolution-data-server3/debian: changelog control

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Aug 19 19:20:35 2011
New Revision: 1952

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1952
Log:
Merge remaining changes from the experimental branch.

Modified:
    unstable/evolution-data-server3/debian/changelog
    unstable/evolution-data-server3/debian/control

Modified: unstable/evolution-data-server3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/changelog?rev=1952&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/changelog (original)
+++ unstable/evolution-data-server3/debian/changelog Fri Aug 19 19:20:35 2011
@@ -1,11 +1,16 @@
 evolution-data-server3 (3.0.2.1-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * New upstream release.
   * debian/watch updated to track 3.x versions.
   * debian/patches:
     - 01_calendar_exit dropped, included upstream.
   * debian/control:
     - update standards version to 3.9.2.
+
+  [ Josselin Mouette ]
+  * Move Conflict against libedataserverui1.2-dev from the runtime 
+    package to the development one.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 01 Aug 2011 10:45:18 +0200
 

Modified: unstable/evolution-data-server3/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/control?rev=1952&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/control (original)
+++ unstable/evolution-data-server3/debian/control Fri Aug 19 19:20:35 2011
@@ -203,22 +203,22 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-data-server-common (= ${source:Version})
+Description: GUI utility library for evolution data servers
+ The data server, called "Evolution Data Server" is responsible for managing
+ calendar and addressbook information.
+ .
+ This package is a GUI utility library for evolution-data-server.
+
+Package: libedataserverui-3.0-dev
+Section: libdevel
+Architecture: any
+Depends: libedataserverui-3.0-0 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+         libgtk-3-dev,
+         libedataserver1.2-dev,
+         libebook1.2-dev
 Conflicts: libedataserverui1.2-dev
-Description: GUI utility library for evolution data servers
- The data server, called "Evolution Data Server" is responsible for managing
- calendar and addressbook information.
- .
- This package is a GUI utility library for evolution-data-server.
-
-Package: libedataserverui-3.0-dev
-Section: libdevel
-Architecture: any
-Depends: libedataserverui-3.0-0 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-         libgtk-3-dev,
-         libedataserver1.2-dev,
-         libebook1.2-dev
 Description: GUI utility library for evolution data servers (development files)
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.