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

Modestas Vainius modax at alioth.debian.org
Wed Apr 27 12:21:02 UTC 2011


The following commit has been merged in the master branch:
commit 0f18c988d95acd250707cb994062dd941db5757f
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Apr 27 15:18:33 2011 +0300

    Replace $(overriden_command) with $(overridden_command) in debian/rules.
    
    Requires pkg-kde-tools 0.12.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |   10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 619b1b7..b6ce7c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 akonadi (1.5.1-2) UNRELEASED; urgency=low
 
+  * Replace $(overriden_command) with $(overridden_command) in debian/rules.
+    Requires pkg-kde-tools 0.12.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 27 Apr 2011 15:16:47 +0300
 
diff --git a/debian/control b/debian/control
index a019825..a8e95fa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modax at debian.org>,
  Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7), cmake (>= 2.6.2), automoc, pkg-kde-tools (>= 0.11),
+Build-Depends: debhelper (>= 7), cmake (>= 2.6.2), automoc, pkg-kde-tools (>= 0.12),
  libqt4-dev (>= 4:4.6.0), shared-mime-info, libmysqlclient-dev,
  libxslt-dev, libsoprano-dev (>= 2.1.1), xsltproc, libdbus-1-dev, libboost-program-options-dev,
  libsqlite3-dev
diff --git a/debian/rules b/debian/rules
index 6d611e2..3c5d504 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,16 @@ 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 \
+	$(overridden_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
+	$(overridden_command) -A -pakonadi-server $(foreach p,$(backend_packages),-p$(p)) debian/README.Debian
+	$(overridden_command) --remaining-packages
 
 override_dh_makeshlibs:
-	$(overriden_command) -V -- -c0
+	$(overridden_command) -V -- -c0
 
 override_dh_strip:
-	$(overriden_command) --dbg-package=akonadi-dbg
+	$(overridden_command) --dbg-package=akonadi-dbg

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list