[med-svn] [varscan] 04/05: patch was applied upstream

[Andreas Tille]

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

tille pushed a commit to branch master
in repository varscan.

commit a87b07a8bb3cd398ad1d2290ce37fdebbebaa88f
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 16 14:35:41 2014 +0200

    patch was applied upstream
---
 debian/changelog                 |  2 +-
 debian/patches/fix_convert.patch | 23 -----------------------
 debian/patches/series            |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b75055..27ed355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 varscan (2.3.7+dfsg-1) UNRELEASED; urgency=medium
 
-  * New upstream version
+  * New upstream version (patch was applied upstream)
 
  -- Andreas Tille <tille at debian.org>  Tue, 16 Sep 2014 14:12:50 +0200
 
diff --git a/debian/patches/fix_convert.patch b/debian/patches/fix_convert.patch
deleted file mode 100644
index 8ac6246..0000000
--- a/debian/patches/fix_convert.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Olivier Sallou <osallou at debian.org>
-Subject: upstream error in conversion
-Description: there is a not allowed conversion between double and float
-Forwarded: yes
-Last-Updated: 2014-04-17
---- a/net/sf/varscan/CopyCaller.java
-+++ b/net/sf/varscan/CopyCaller.java
-@@ -253,7 +253,7 @@ public class CopyCaller {
- 				    	        		int gcBin = (int) gcContent;
- 				    	        		if(gcBin >= 0 && gcBin <= 100)
- 				    	        		{
--				    	        			gcLogSum[gcBin] += logratio;
-+				    	        			gcLogSum[gcBin] += (float) logratio;
- 				    	        			gcLogNum[gcBin]++;
- 				    	        		}
- 			    	        		}
-@@ -576,4 +576,4 @@ public class CopyCaller {
- 		return(regionRef + "\t" + regionStart + "\t" + regionStop + "\t" + regionCalls + "\t" + regionDepthNormal + "\t" + regionDepthTumor + "\t" + log2ratio);
- 
- 	}
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index ff6eedb..209ce4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_convert.patch
 usage.patch

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