[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.2-10-g8607d56

[Andreas Tille]

The following commit has been merged in the master branch:
commit 534f39f63e9407bd0127ee4da82a834fafd868eb
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 31 08:32:28 2012 +0200

    Add dpkg-source local-options hints.

diff --git a/debian/changelog b/debian/changelog
index 30b4afd..c55114e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ jellyfish (1.1.4-1) UNRELEASED; urgency=low
   * debian/patches/fix-unused-but-set-variable.patch: Due to the use
     of hardening flags warnings about unused-but-set-variable becomes
     an error - start working on a patch
+  * debian/source/local-options: Add dpkg-source local-options hints
 
- -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 08:28:08 +0200
+ -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 08:31:55 +0200
 
 jellyfish (1.1.2-1) unstable; 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

-- 
count k-mers of DNA