[sagemath] 01/01: Break the renaming of the rubiks package executable into a separate patch

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository sagemath.

commit 3198d16edd09895fe45c722e04558efa691eef66
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sat Mar 14 12:33:33 2015 +0100

    Break the renaming of the rubiks package executable into a separate patch
---
 debian/patches/rubiks_executables_renames.patch | 29 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/patches/unbreak.patch                    | 29 -------------------------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/debian/patches/rubiks_executables_renames.patch b/debian/patches/rubiks_executables_renames.patch
new file mode 100644
index 0000000..d5578f1
--- /dev/null
+++ b/debian/patches/rubiks_executables_renames.patch
@@ -0,0 +1,29 @@
+--- a/sage/src/sage/interfaces/rubik.py
++++ b/sage/src/sage/interfaces/rubik.py
+@@ -88,7 +88,7 @@
+     """
+     Interface to Michael Reid's optimal Rubik's Cube solver.
+     """
+-    __cmd = "optimal"
++    __cmd = "rubiks_optimal"
+ 
+     def __init__(self, verbose=False, wait=True):
+         self.verbose = verbose
+@@ -176,7 +176,7 @@
+ 
+ class CubexSolver:
+ 
+-    __cmd = "cubex"
++    __cmd = "rubiks_cubex"
+ 
+     def __call__(self, facets):
+         return self.solve(facets)
+@@ -230,7 +230,7 @@
+ 
+ class DikSolver:
+ 
+-    __cmd = "dikcube"
++    __cmd = "rubiks_dikcube"
+ 
+     def __call__(self, facets):
+         return self.solve(facets)
diff --git a/debian/patches/series b/debian/patches/series
index 4f2b209..05e999f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ silent_debian_bug_780186.patch
 silence_ecl_opt_interrupt_signal.patch
 sagedoc_avoid_exception.patch
 silence_matplotlib_1_3_changes.patch
+rubiks_executables_renames.patch
diff --git a/debian/patches/unbreak.patch b/debian/patches/unbreak.patch
index 54325f0..0d4aa4c 100644
--- a/debian/patches/unbreak.patch
+++ b/debian/patches/unbreak.patch
@@ -338,35 +338,6 @@
      """
 -    os.system('maxima')
 +    os.system('maxima -l ecl')
---- a/sage/src/sage/interfaces/rubik.py
-+++ b/sage/src/sage/interfaces/rubik.py
-@@ -88,7 +88,7 @@
-     """
-     Interface to Michael Reid's optimal Rubik's Cube solver.
-     """
--    __cmd = "optimal"
-+    __cmd = "rubiks_optimal"
- 
-     def __init__(self, verbose=False, wait=True):
-         self.verbose = verbose
-@@ -176,7 +176,7 @@
- 
- class CubexSolver:
- 
--    __cmd = "cubex"
-+    __cmd = "rubiks_cubex"
- 
-     def __call__(self, facets):
-         return self.solve(facets)
-@@ -230,7 +230,7 @@
- 
- class DikSolver:
- 
--    __cmd = "dikcube"
-+    __cmd = "rubiks_dikcube"
- 
-     def __call__(self, facets):
-         return self.solve(facets)
 --- a/sage/src/sage/interfaces/singular.py
 +++ b/sage/src/sage/interfaces/singular.py
 @@ -2148,7 +2148,7 @@

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