[SCM] kanagram packaging branch, master, updated. debian/4.12.4-1-129-ge3fc3ea

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c1c2490852420c770b2238ba3488989ab97f2ca0
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Dec 20 23:37:17 2011 +0000

    4.7.90 packaging
---
 debian/.gitattributes | 1 -
 debian/changelog      | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 64b07f5..0417ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kanagram (4:4.7.90-0ubuntu2) precise; urgency=low
+
+  * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2011 14:17:56 +0000
+
 kanagram (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release

-- 
kanagram packaging