[SCM] xvidcore/master: Include local options to unapply all patches and abort on any upstream changes.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 09fcedcaa95060969db18223bf4283a83c88de42
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 3 18:56:44 2011 -0400

    Include local options to unapply all patches and abort on any upstream changes.

diff --git a/debian/changelog b/debian/changelog
index ba63a34..a473ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ xvidcore (2:1.3.1-1) UNRELEASED; urgency=low
   * Enable -O3 instead of -O2.
   * Include Vcs-* entries.
   * Add DM-Upload-Allowed: yes.
+  * Include local options to unapply all patches and abort on any upstream
+    changes.
 
- -- Andres Mejia <mcitadel at gmail.com>  Tue, 03 May 2011 18:49:23 -0400
+ -- Andres Mejia <mcitadel at gmail.com>  Tue, 03 May 2011 18:56:05 -0400
 
 xvidcore (2:1.3.0-1) UNRELEASED; urgency=low
 
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

-- 
xvidcore packaging