[SCM] cantor packaging branch, master, updated. 5170f0bde366ef0083d0d0bc076ed58fa52971a2

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit aee134a4ecd4eed533111d67d3d94fb9d5e2f2e8
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Oct 18 01:02:18 2011 +0200

    Add abort-on-upstream-changes to local-options.
---
 debian/source/local-options |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

-- 
cantor packaging