[med-svn] samtools 01/06: Drop literal_version.patch since upstream does not use make to obtain version number any more

[Andreas Tille]

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

tille pushed a commit to branch master
in repository samtools.

commit 9e3a866a0d9dce9deb97789633cf3756b08bdf70
Author: Andreas Tille <tille at debian.org>
Date:   Mon Dec 11 15:26:51 2017 +0100

    Drop literal_version.patch since upstream does not use make to obtain version number any more
---
 debian/changelog                     |  5 ++++-
 debian/patches/literal_version.patch | 16 ----------------
 debian/patches/series                |  1 -
 debian/patches/spelling.patch        |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72ddc08..20498f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-samtools (1.5-2) UNRELEASED; urgency=medium
+samtools (1.6-1) UNRELEASED; urgency=medium
 
   [ Steffen Moeller ]
   * debian/upstream/metadata:
@@ -6,6 +6,9 @@ samtools (1.5-2) UNRELEASED; urgency=medium
     - yamllint cleanliness
 
   [ Andreas Tille ]
+  * New upstream version
+  * Drop literal_version.patch since upstream does not use make to obtain
+    version number any more
   * Switch to default Debian Med repository layout
 
  -- Andreas Tille <tille at debian.org>  Mon, 11 Dec 2017 15:16:14 +0100
diff --git a/debian/patches/literal_version.patch b/debian/patches/literal_version.patch
deleted file mode 100644
index a9731fb..0000000
--- a/debian/patches/literal_version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: do not use make to extract version
- Without a valid config.mk, trying to call m4_esyscmd_s() to run
- make results in weird error messages. This patch avoids having
- to run make just to extract this value.
-Author: Sascha Steinbiss <sascha at steinbiss.name>
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@
- # DEALINGS IN THE SOFTWARE.
- 
- dnl Process this file with autoconf to produce a configure script
--AC_INIT([Samtools], m4_esyscmd_s([make print-version]),
-+AC_INIT([Samtools], m4_esyscmd_s([grep 'PACKAGE_VERSION =' Makefile | cut -f 2 -d'=' | xargs]),
-         [samtools-help at lists.sourceforge.net], [], [http://www.htslib.org/])
- AC_PREREQ([2.63])  dnl This version introduced 4-argument AC_CHECK_HEADER
- AC_CONFIG_SRCDIR([bamtk.c])
diff --git a/debian/patches/series b/debian/patches/series
index 08bb035..d87adb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 spelling.patch
-literal_version.patch
 mayhem.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index ad72959..200c13e 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -2,7 +2,7 @@ Description: spelling fix
 Author: Sascha Steinbiss <sascha at steinbiss.name> 
 --- a/samtools.1
 +++ b/samtools.1
-@@ -93,8 +93,8 @@
+@@ -95,8 +95,8 @@ samtools markdup in.algnsorted.bam out.b
  .PP
  Samtools is a set of utilities that manipulate alignments in the BAM
  format. It imports from and exports to the SAM (Sequence Alignment/Map)

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