[liblinear] 80/123: Dropped patches implemented/included upstream

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository liblinear.

commit 0a16da686fcf2c28b88b1d97f84c5fc1b7bd03fd
Author: Christian Kastner <debian at kvr.at>
Date:   Thu Apr 7 00:01:26 2011 +0200

    Dropped patches implemented/included upstream
---
 ...003-Add-missing-solver-to-Python-bindings.patch | 64 ----------------------
 debian/patches/0004-Python-namespace-change.patch  | 25 ---------
 debian/patches/series                              |  2 -
 3 files changed, 91 deletions(-)

diff --git a/debian/patches/0003-Add-missing-solver-to-Python-bindings.patch b/debian/patches/0003-Add-missing-solver-to-Python-bindings.patch
deleted file mode 100644
index 0f979aa..0000000
--- a/debian/patches/0003-Add-missing-solver-to-Python-bindings.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Fri, 17 Sep 2010 22:44:45 +0200
-Subject: [PATCH] Add missing solver to Python bindings
-
-Apparently, the solver for the dual form of logistic regression that was added to the
-library in 1.7 was accidentally omitted from the Python bindings.
-
-Forwarded: yes
-Last-Update: 2011-02-27
----
- python/linear.py     |    4 ++--
- python/linearutil.py |    5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/python/linear.py b/python/linear.py
-index 145f60f..0cf6ca5 100644
---- a/python/linear.py
-+++ b/python/linear.py
-@@ -17,7 +17,7 @@ else:
- 
- # Construct constants
- SOLVER_TYPE = ['L2R_LR', 'L2R_L2LOSS_SVC_DUAL', 'L2R_L2LOSS_SVC', 'L2R_L1LOSS_SVC_DUAL',\
--		'MCSVM_CS', 'L1R_L2LOSS_SVC', 'L1R_LR']
-+		'MCSVM_CS', 'L1R_L2LOSS_SVC', 'L1R_LR', 'L2R_LR_DUAL']
- for i, s in enumerate(SOLVER_TYPE): exec("%s = %d" % (s , i))
- 
- PRINT_STRING_FUN = CFUNCTYPE(None, c_char_p)
-@@ -182,7 +182,7 @@ class parameter(Structure):
- 		if self.eps == float('inf'):
- 			if self.solver_type in [L2R_LR, L2R_L2LOSS_SVC]:
- 				self.eps = 0.01
--			elif self.solver_type in [L2R_L2LOSS_SVC_DUAL, L2R_L1LOSS_SVC_DUAL, MCSVM_CS]:
-+			elif self.solver_type in [L2R_L2LOSS_SVC_DUAL, L2R_L1LOSS_SVC_DUAL, MCSVM_CS, L2R_LR_DUAL]:
- 				self.eps = 0.1
- 			elif self.solver_type in [L1R_L2LOSS_SVC, L1R_LR]:
- 				self.eps = 0.01
-diff --git a/python/linearutil.py b/python/linearutil.py
-index 77b510e..9607608 100644
---- a/python/linearutil.py
-+++ b/python/linearutil.py
-@@ -74,19 +74,20 @@ def train(arg1, arg2=None, arg3=None):
- 
- 	'options':
- 		-s type : set type of solver (default 1)
--			0 -- L2-regularized logistic regression
-+			0 -- L2-regularized logistic regression (primal)
- 			1 -- L2-regularized L2-loss support vector classification (dual)	
- 			2 -- L2-regularized L2-loss support vector classification (primal)
- 			3 -- L2-regularized L1-loss support vector classification (dual)
- 			4 -- multi-class support vector classification by Crammer and Singer
- 			5 -- L1-regularized L2-loss support vector classification
- 			6 -- L1-regularized logistic regression
-+			7 -- L2-regularized logistic regression (dual)
- 		-c cost : set the parameter C (default 1)
- 		-e epsilon : set tolerance of termination criterion
- 			-s 0 and 2 
- 				|f'(w)|_2 <= eps*min(pos,neg)/l*|f'(w0)|_2, 
- 				where f is the primal function, (default 0.01)
--			-s 1, 3, and 4
-+			-s 1, 3, 4 and 7
- 				Dual maximal violation <= eps; similar to liblinear (default 0.1)
- 			-s 5 and 6
- 				|f'(w)|_inf <= eps*min(pos,neg)/l*|f'(w0)|_inf,
--- 
diff --git a/debian/patches/0004-Python-namespace-change.patch b/debian/patches/0004-Python-namespace-change.patch
deleted file mode 100644
index 6e3b339..0000000
--- a/debian/patches/0004-Python-namespace-change.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Fri, 11 Mar 2011 19:45:52 +0100
-Subject: [PATCH] Python namespace change
-
-As indicated in NEWS for python-liblinear.
-
-Forwarded: not needed, this change will be in next upstream release.
-Last-Update: 2011-03-11
----
- python/linearutil.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/linearutil.py b/python/linearutil.py
-index 949ba60..90e7a41 100644
---- a/python/linearutil.py
-+++ b/python/linearutil.py
-@@ -1,6 +1,6 @@
- #!/usr/bin/env python
- 
--from linear import *
-+from liblinear import *
- 
- def svm_read_problem(data_file_name):
- 	"""
--- 
diff --git a/debian/patches/series b/debian/patches/series
index a206cf1..72e9037 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Properly-build-shared-and-static-libraries-programs.patch
-0003-Add-missing-solver-to-Python-bindings.patch
-0004-Python-namespace-change.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liblinear.git