[liblinear] 41/123: Revert moving Python bindings to separate namespace

[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 f4cd93df7afa5162d9431b083e8bd647016ebfb4
Author: Christian Kastner <debian at kvr.at>
Date:   Mon Jul 12 14:34:20 2010 +0200

    Revert moving Python bindings to separate namespace
    
    The downsides for this outweigh the benefits. As of now, "linear" does not
    collide with any other packages; so we would only be safeguarding against
    possible future collisions. On the other hand, moving the bindings to a
    separate namespace would probably result in non-portable code.
---
 ...Move-Python-bindings-to-package-liblinear.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 debian/python-liblinear.README.Debian              | 20 -----------------
 debian/python-liblinear.install                    |  4 ++--
 4 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/debian/patches/0002-Move-Python-bindings-to-package-liblinear.patch b/debian/patches/0002-Move-Python-bindings-to-package-liblinear.patch
deleted file mode 100644
index cedb2f7..0000000
--- a/debian/patches/0002-Move-Python-bindings-to-package-liblinear.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Fri, 9 Jul 2010 20:30:30 +0200
-Subject: [PATCH] Move Python bindings to package liblinear
-
-Upstream ships its Python bindings with very generic names. To avoid possible
-name collisions, they have been move to a package "liblinear".
-
-Forwarded: no
-Last-Update: 2010-07-09
----
- python/linearutil.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/linearutil.py b/python/linearutil.py
-index 06cd1c3..77b510e 100644
---- a/python/linearutil.py
-+++ b/python/linearutil.py
-@@ -1,6 +1,6 @@
- #!/usr/bin/env python
- 
--from linear import *
-+from liblinear.linear import *
- 
- def svm_read_problem(data_file_name):
- 	"""
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 5187293..72e9037 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Properly-build-shared-and-static-libraries-programs.patch
-0002-Move-Python-bindings-to-package-liblinear.patch
diff --git a/debian/python-liblinear.README.Debian b/debian/python-liblinear.README.Debian
deleted file mode 100644
index 863c798..0000000
--- a/debian/python-liblinear.README.Debian
+++ /dev/null
@@ -1,20 +0,0 @@
-python-liblinear for Debian
----------------------------
-
-IMPORTANT: Note that the Python bindings have been moved to the package
-"liblinear". This has been done to avoid possible name collisions, as "linear"
-is very generic.
-
-So, wherever the documentation (especially upstream's README) instructs you to
-use one of,
-
-    import linear
-    import linearutil
-
-use
-    import liblinear.linear
-    import liblinear.linearutil
-
-instead.
-
- -- Christian Kastner <debian at kvr.at>  Fri, 09 Jul 2010 20:50:11 +0200
diff --git a/debian/python-liblinear.install b/debian/python-liblinear.install
index 4fbb7a2..ab76e07 100644
--- a/debian/python-liblinear.install
+++ b/debian/python-liblinear.install
@@ -1,2 +1,2 @@
-python/linear.py usr/share/pyshared/liblinear
-python/linearutil.py usr/share/pyshared/liblinear
+python/linear.py usr/share/pyshared
+python/linearutil.py usr/share/pyshared

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