[SCM] WarMUX PKG branch, master, updated. 1fbcfe74ab3fb2e1b3edd034f7900b145cce2031

[Felix Geyer]

The following commit has been merged in the master branch:
commit 1fbcfe74ab3fb2e1b3edd034f7900b145cce2031
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Feb 15 22:39:06 2011 +0100

    Add abort-on-upstream-changes to debian/source/local-options.

diff --git a/debian/changelog b/debian/changelog
index d51dbe2..92bfa05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ warmux (1:11.01+repack-1) UNRELEASED; urgency=low
   * Rename the Ukrainian translation to the corrent locale code "uk".
   * Fix FTBFS on s390. (Closes: #602822)
     - Add 05_fix_build_s390.patch
+  * Add abort-on-upstream-changes to debian/source/local-options.
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 15 Feb 2011 22:36:02 +0100
+ -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 15 Feb 2011 22:37:30 +0100
 
 wormux (1:0.9.2.1-1) experimental; urgency=low
 
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
WarMUX PKG