[SCM] Akonadi packaging branch, master, updated. debian/1.3.1-3-39-g5c61395

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 4e3680efa21be3b3e77a4296236a937e422dad51
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Dec 21 03:35:47 2010 +0200

    Rename to akonadi-backend-postgresql, add postgresql to Recommends.
    
    Even if default configuration starts an internal PostgreSQL server instance,
    add postgresql package to Recommends because the latter package enables the
    daemon system-wide. PostgreSQL needs to be split to the -core part as MySQL
    was.
---
 debian/changelog |    7 +++++--
 debian/control   |    8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ad10f0..2cfbc60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,10 +12,13 @@ akonadi (1.4.90-0r1) UNRELEASED; urgency=low
     - akonadi-backend-mysql - a package which depends on the stuff needed for
       MySQL backend (server and Qt module) and installs a configuration file
       previously present in akonadi-server;
+    - akonadi-backend-postgresql - a package which depends on the stuff needed
+      for PostgreSQL backend. Even if default configuration starts an internal
+      PostgreSQL server instance, add postgresql package to Recommends because
+      the latter package enables the daemon system-wide. PostgreSQL needs to be
+      split to the -core part as MySQL was;
     - akonadi-backend-sqlite - a package with improved SQLite driver that is
       needed for Akonadi SQLite backend;
-    - akonadi-backend-pgsql - a package which depends on the stuff needed for
-      PostgreSQL backend.
   * Make akonadi-server on both backends with | relation preferring MySQL for
     now. Also suggest both backends.
   * Move akonadi-dbg to the end of debian/control.
diff --git a/debian/control b/debian/control
index db9fe35..51f4017 100644
--- a/debian/control
+++ b/debian/control
@@ -45,9 +45,9 @@ Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}) |
- akonadi-backend-pgsql (= ${source:Version})
+ akonadi-backend-postgresql (= ${source:Version})
 Suggests: akonadi-backend-mysql (= ${binary:Version}), akonadi-backend-sqlite (= ${binary:Version}),
- akonadi-backend-pgsql (= ${source:Version})
+ akonadi-backend-postgresql (= ${source:Version})
 Description: Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -72,11 +72,11 @@ Description: MySQL storage backend for Akonadi
  will be started for each user. Alternatively, connection to an external MySQL
  database is supported as well.
 
-Package: akonadi-backend-pqsql
+Package: akonadi-backend-postgresql
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}, libqt4-sql-psql
-Recommends: akonadi-server
+Recommends: akonadi-server, postgresql
 Replaces: akonadi-server (<< 1.3.60~)
 Breaks: akonadi-server (<< 1.3.60~)
 Description: PostgreSQL storage backend for Akonadi

-- 
Akonadi packaging