[SCM] kajongg packaging branch, master, updated. debian/4.13.1-1-64-gc3f069c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kajongg.git;a=commitdiff;h=9a4fcd8

The following commit has been merged in the master branch:
commit 9a4fcd805c8694b85a451b0494b37bc501d8a229
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Thu Dec 13 00:04:29 2012 +0000

    Install to /usr/games, Version dependency on kdegames-data
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a73dfc6..056f222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kajongg (4:4.9.90-0ubuntu3) UNRELEASED; urgency=low
+
+  * Install to /usr/games
+  * Version dependency on kdegames-data
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 13 Dec 2012 00:02:39 +0000
+
 kajongg (4:4.9.90-0ubuntu2) raring; urgency=low
 
   * Add breaks/replaces against kdegames-mahjongg-data << 4:4.9.90 
diff --git a/debian/control b/debian/control
index d82f722..6bf71d3 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Package: kajongg
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-twisted-core (>= 8.2.0),
  python-qt4-sql (>= 4.6), python-kde4 (>= 4.3.0), libsqlite3-0 (>= 3.5.0),
- libqt4-sql-sqlite (>= 4.6), libkmahjongglib-data, vorbis-tools, kdegames-data
+ libqt4-sql-sqlite (>= 4.6), libkmahjongglib-data, vorbis-tools, kdegames-data (>= ${source:Upstream-Version})
 Breaks: kdegames-mahjongg-data (<< 4:4.9.90)
 Replaces: kdegames-mahjongg-data (<< 4:4.9.90)
 Description: classical Mah Jongg game
diff --git a/debian/rules b/debian/rules
index 6a77e53..e36ca20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_auto_configure:
+	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games

-- 
kajongg packaging