[SCM] vlc/master: adjust debian/source/local-options to team guidelines

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2379e7fcd93bdba2cb72a95f2d954b09ee48881
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 19 11:07:31 2011 +0100

    adjust debian/source/local-options to team guidelines

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

-- 
VLC media player packaging