[med-svn] [bamtools] 01/02: add breaks+replaces to fix upgrade

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch master
in repository bamtools.

commit b58116cf5cdd1abd8d2c48a1fdde41cd5d786a5f
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Wed Mar 9 00:58:54 2016 -0800

    add breaks+replaces to fix upgrade
---
 debian/changelog        |  8 ++++++++
 debian/control          |  2 ++
 debian/patches/spelling | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 096d432..5ee4bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bamtools (2.4.0+dfsg-5) unstable; urgency=medium
+
+  * Fix the movement of the development docs into their own -doc package
+    (Closes: 817188)
+  * Fix another typo in upstream
+
+ -- Michael R. Crusoe <crusoe at ucdavis.edu>  Wed, 09 Mar 2016 00:58:33 -0800
+
 bamtools (2.4.0+dfsg-4) unstable; urgency=medium
 
   * Lower priority to 'extra' due to dependency on libjsoncpp1
diff --git a/debian/control b/debian/control
index 226bb57..73e0513 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,8 @@ Package: libbamtools-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Breaks: libbamtools-dev (<< 2.4.0-4)
+Replaces: libbamtools-dev (<< 2.4.0-4)
 Description: docs for dynamic library for manipulating BAM (genome alignment) files
  BamTools facilitates research analysis and data management using BAM
  files.  It copes with the enormous amount of data produced by current
diff --git a/debian/patches/spelling b/debian/patches/spelling
index a77f66a..a34dd09 100644
--- a/debian/patches/spelling
+++ b/debian/patches/spelling
@@ -13,3 +13,14 @@ Forwarded: https://github.com/pezmaster31/bamtools/pull/122
      return false;
  }    
  
+--- bamtools.orig/src/toolkit/bamtools_resolve.cpp
++++ bamtools/src/toolkit/bamtools_resolve.cpp
+@@ -868,7 +868,7 @@
+ 
+         // make sure required stats file supplied
+         if ( !m_settings->HasStatsFile )
+-            errors.push_back("Ouptut stats filename required for -makeStats mode. Please specify one using -stats option.");
++            errors.push_back("Output stats filename required for -makeStats mode. Please specify one using -stats option.");
+ 
+         // check for UseStats options
+         if ( m_settings->HasForceMarkReadGroups )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bamtools.git