[SCM] Akonadi packaging branch, master, updated. debian/1.5.1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit d637d881b17ec42863e35249b2b38075cbdb0af2
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 13 19:53:03 2011 +0200

    Install README.Debian to akonadi-server and all backend packages.
---
 debian/changelog |    1 +
 debian/control   |   30 +++++++++++++++---------------
 debian/rules     |    7 +++++++
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ed7ab6..6469cb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ akonadi (1.5.0-0r1) UNRELEASED; urgency=low
   * Switch debian/rules engine to qt-kde-team/2/*. Fix FTBFS in the process.
     (Closes: #618200)
   * Strip sequence numbers from debian/patches/*.
+  * Install README.Debian to akonadi-server and all backend packages.
 
   [ José Manuel Santamaría Lema ]
   * Rename libakonadiprivate1 as libakonadiprotocolinternals1 
diff --git a/debian/control b/debian/control
index 25a940f..3092f37 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,21 @@ Homepage: http://pim.kde.org/akonadi
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-req/akonadi.git
 
+Package: akonadi-server
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}) |
+ akonadi-backend-postgresql (= ${source:Version})
+Suggests: akonadi-backend-mysql (= ${binary:Version}), akonadi-backend-sqlite (= ${binary: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
+ access mail, calendars, addressbooks, and other PIM data.
+ .
+ This package contains the Akonadi PIM storage server and associated programs.
+
 Package: libakonadiprotocolinternals1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -40,21 +55,6 @@ Description: development files for the Akonadi PIM storage service
  This package contains development files for building software that uses the
  Akonadi PIM storage service.
 
-Package: akonadi-server
-Section: net
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}) |
- akonadi-backend-postgresql (= ${source:Version})
-Suggests: akonadi-backend-mysql (= ${binary:Version}), akonadi-backend-sqlite (= ${binary: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
- access mail, calendars, addressbooks, and other PIM data.
- .
- This package contains the Akonadi PIM storage server and associated programs.
-
 Package: akonadi-backend-mysql
 Section: misc
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 5abf91e..6d611e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,17 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
+backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
+
 override_dh_auto_configure:
 	$(overriden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld \
 	    -DCONFIG_INSTALL_DIR=/etc
 
+override_dh_installdocs:
+	# Install README.Debian to backend packages
+	$(overriden_command) -A -pakonadi-server $(foreach p,$(backend_packages),-p$(p)) debian/README.Debian
+	$(overriden_command) --remaining-packages
+
 override_dh_makeshlibs:
 	$(overriden_command) -V -- -c0
 

-- 
Akonadi packaging