[SCM] khangman packaging branch, master, updated. debian/4.13.1-1-126-gaf8e271

[Maximiliano Curia]

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

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

    4.7.90 packaging
---
 debian/.gitattributes       | 1 -
 debian/changelog            | 6 ++++++
 debian/source/local-options | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

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 aec63d5..979ef74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+khangman (4:4.7.90-0ubuntu1) precise; urgency=low
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Dec 2011 13:14:40 +0000
+
 khangman (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
khangman packaging