[SCM] an open source computer algebra system branch, debian, updated. 3f1c419ac4981d4babdd737ac18bd16c080a761a
Bernhard R. Link
brlink at debian.org
Sat Mar 3 21:58:07 UTC 2012
The following commit has been merged in the debian branch:
commit 749ac019ba06a2d978a1e33eb452954516f494e6
Author: Bernhard R. Link <brlink at debian.org>
Date: Sat Mar 3 11:34:56 2012 +0100
update debian/patches directory
look for emacs binary in /usr/bin
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 1ec67a3..892cf2b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
# see git-dpm(1) from git-dpm package
-1b52f95906305b903b6a49c2861c147de37ac7d3
+8540879674bcba6e1b5f6f4c1439439586fc55fa
8540879674bcba6e1b5f6f4c1439439586fc55fa
af80c455bead480e8e21703ac28b5a5965265887
af80c455bead480e8e21703ac28b5a5965265887
diff --git a/debian/patches/0004-default-path-settings.patch b/debian/patches/0004-default-path-settings.patch
index fe970d5..cd63338 100644
--- a/debian/patches/0004-default-path-settings.patch
+++ b/debian/patches/0004-default-path-settings.patch
@@ -1,4 +1,4 @@
-From 7684147a7a319d61714d7f3d6cef79ffa832b33f Mon Sep 17 00:00:00 2001
+From 58d6e2e79d7dc7ea728d30891fcd89e57e2335a3 Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink at debian.org>
Date: Sat, 25 Feb 2012 13:47:46 +0100
Subject: default path settings
@@ -8,14 +8,15 @@ Subject: default path settings
- as S_BIN_DIR and S_ROOT_DIR are the same in the Debian package,
don't default ROOT_DIR to BIN_DIR/..
- xterm set as x-terminal-emulator alternative.
+- emacs binary located in /usr/bin
- remove %b/.. and %r/.. from default search path in order to
not look into /usr/lib/LIB for libraries.
---
- kernel/feResource.cc | 10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
+ kernel/feResource.cc | 14 ++++++--------
+ 1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index ba0385c..5633f3a 100644
+index ba0385c..7b1be9b 100644
--- a/kernel/feResource.cc
+++ b/kernel/feResource.cc
@@ -76,13 +76,11 @@ static feResourceConfig_s feResourceConfigs[] =
@@ -35,6 +36,17 @@ index ba0385c..5633f3a 100644
{"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
{"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", (char *)""},
{"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", (char *)""},
+@@ -95,8 +93,8 @@ static feResourceConfig_s feResourceConfigs[] =
+ {"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""},
+
+ #ifdef ESINGULAR
+- {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "%b/emacs", (char *)""},
+- {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "%b/xemacs", (char *)""},
++ {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "/usr/bin/emacs", (char *)""},
++ {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "/usr/bin/xemacs", (char *)""},
+ {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""},
+ {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""},
+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
@@ -105,7 +103,7 @@ static feResourceConfig_s feResourceConfigs[] =
#ifdef ix86_Win
{"rxvt", 'X', feResBinary,"RXVT", "%b/rxvt", (char *)""},
diff --git a/debian/patches/0005-append-suffix-to-soname.patch b/debian/patches/0005-append-suffix-to-soname.patch
index 551954a..2e853b2 100644
--- a/debian/patches/0005-append-suffix-to-soname.patch
+++ b/debian/patches/0005-append-suffix-to-soname.patch
@@ -1,4 +1,4 @@
-From c68c785b486ad4109ee0127aa6d3b5c2f594b41d Mon Sep 17 00:00:00 2001
+From 12a9979488d2711c4fad7db9dade99bf5f9060df Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink at debian.org>
Date: Sun, 19 Feb 2012 21:25:54 +0100
Subject: append suffix to soname
diff --git a/debian/patches/0006-add-working-all-target-to-Makefile.in.patch b/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
index 03e8c1a..0010565 100644
--- a/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
+++ b/debian/patches/0006-add-working-all-target-to-Makefile.in.patch
@@ -1,4 +1,4 @@
-From a02ce6481f8b90f188c55288b494eaf58216e036 Mon Sep 17 00:00:00 2001
+From a4fb40d6cd6c62cf29ad6a4f8e5c3a029da07a39 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 11:07:25 +0100
Subject: add working 'all' target to Makefile.in
diff --git a/debian/patches/0007-miscellaneous-Makefile-template-patches.patch b/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
index 56bbead..ccdcc94 100644
--- a/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
+++ b/debian/patches/0007-miscellaneous-Makefile-template-patches.patch
@@ -1,4 +1,4 @@
-From 3b95ef36368738089e67ae927c9929b56a009872 Mon Sep 17 00:00:00 2001
+From 2c621289709a634b7a345904b9ca6c8652e9752f Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 12:37:00 +0100
Subject: miscellaneous Makefile template patches
diff --git a/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch b/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
index 4c9d481..1a001c8 100644
--- a/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
+++ b/debian/patches/0008-assert-needs-to-be-defined-after-include-assert.h.patch
@@ -1,4 +1,4 @@
-From b49a95763138ebc3950975436ad8b57c580d7968 Mon Sep 17 00:00:00 2001
+From 686a5c09d84490d82c8e83d9ea7ecbdf79308cc2 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Thu, 16 Feb 2012 11:23:11 +0100
Subject: =?UTF-8?q?assert=20needs=20to=20be=20defined=20after=20#include=20"?=
diff --git a/debian/patches/0009-keep-mod2.h-in-Singular.patch b/debian/patches/0009-keep-mod2.h-in-Singular.patch
index 710062d..3b190a7 100644
--- a/debian/patches/0009-keep-mod2.h-in-Singular.patch
+++ b/debian/patches/0009-keep-mod2.h-in-Singular.patch
@@ -1,4 +1,4 @@
-From 7bf259b5aa0ebeacd6b29da8199a95bba5343100 Mon Sep 17 00:00:00 2001
+From 0437b2252c7bc8e7e22256aa377c3e9c724b255a Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix at salfelder.org>
Date: Wed, 22 Feb 2012 11:18:38 +0100
Subject: keep mod2.h in Singular/
@@ -1171,7 +1171,7 @@ index 43a4344..41e97e4 100644
poly unifastmult(poly f,poly g, ring r);
poly multifastmult(poly f, poly g, ring r);
diff --git a/kernel/feResource.cc b/kernel/feResource.cc
-index 5633f3a..5a32d3a 100644
+index 7b1be9b..445cc6d 100644
--- a/kernel/feResource.cc
+++ b/kernel/feResource.cc
@@ -10,7 +10,7 @@
diff --git a/debian/patches/0010-librariesmove-libreadline-to-main-binary.patch b/debian/patches/0010-move-libreadline-to-main-binary.patch
similarity index 98%
rename from debian/patches/0010-librariesmove-libreadline-to-main-binary.patch
rename to debian/patches/0010-move-libreadline-to-main-binary.patch
index af56154..558d159 100644
--- a/debian/patches/0010-librariesmove-libreadline-to-main-binary.patch
+++ b/debian/patches/0010-move-libreadline-to-main-binary.patch
@@ -1,7 +1,7 @@
-From 1b52f95906305b903b6a49c2861c147de37ac7d3 Mon Sep 17 00:00:00 2001
+From 8540879674bcba6e1b5f6f4c1439439586fc55fa Mon Sep 17 00:00:00 2001
From: "Bernhard R. Link" <brlink at debian.org>
Date: Sun, 26 Feb 2012 13:38:14 +0100
-Subject: librariesmove libreadline to main binary
+Subject: move libreadline to main binary
and link Singular binary against libsingular instead of carrying a copy
of everything.
diff --git a/debian/patches/series b/debian/patches/series
index b25b4ed..383871d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,4 @@
0007-miscellaneous-Makefile-template-patches.patch
0008-assert-needs-to-be-defined-after-include-assert.h.patch
0009-keep-mod2.h-in-Singular.patch
-0010-librariesmove-libreadline-to-main-binary.patch
+0010-move-libreadline-to-main-binary.patch
--
an open source computer algebra system
More information about the debian-science-commits
mailing list