[SCM] templates for different package types branch, master, updated. 6410a201a7a1bb4f92a3d4f1d8b55724c672fdd3

[Miriam Ruiz]

The following commit has been merged in the master branch:
commit 6410a201a7a1bb4f92a3d4f1d8b55724c672fdd3
Author: Miriam Ruiz <miriam at debian.org>
Date:   Sat Jun 4 01:12:56 2011 +0200

    Added local option --abort-on-upstream-changes
    See: http://lists.debian.org/debian-devel/2011/05/msg01130.html

diff --git a/source/local-options b/source/local-options
index 4aceb10..9cdfca9 100644
--- a/source/local-options
+++ b/source/local-options
@@ -1 +1,2 @@
 unapply-patches
+abort-on-upstream-changes

-- 
templates for different package types