[singular] 03/03: Imported Debian patch 4.0.2-p1+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Thu Oct 15 23:13:15 UTC 2015


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

calculus-guest pushed a commit to branch master
in repository singular.

commit 28491e619440b9ee23c6b3b7b54de451a3886f08
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Oct 15 22:23:06 2015 +0200

    Imported Debian patch 4.0.2-p1+ds-1
---
 debian/changelog                                   |  13 ++
 debian/clean                                       |   3 +-
 debian/patches/debianization-gather-headers.patch  |   4 +-
 .../patches/debianization-rename-libraries.patch   |  20 +--
 .../debianization-rename-pkgconfig_files.patch     |   2 +-
 debian/patches/debianization-surf.patch            |   6 +-
 debian/patches/debianization.patch                 |  66 ++++++-
 debian/patches/series                              |   1 +
 debian/patches/upstream-autotools-help2man.patch   |  10 +-
 .../upstream-spelling-error-in-singular-lib.patch  |  29 +++
 .../upstream-spelling-error-in-source.patch        | 195 +++++++++++++++++++--
 debian/repack                                      |   9 +
 debian/watch                                       |   2 +-
 13 files changed, 319 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c912bd..da79789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+singular (4.0.2-p1+ds-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Debianization:
+    - debian/watch, update;
+    - debian/repack, update;
+    - debian/patches/ patches:
+      - git-version-gen echoes now the debian package version
+        with prefix "debian-" instead of a fancy git number;
+      - refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 15 Oct 2015 21:13:15 +0000
+
 singular (4.0.2+ds-1) unstable; urgency=medium
 
   * New upstream version, integrate most of submitted upstream patches.
diff --git a/debian/clean b/debian/clean
index 7d4215c..8d7b00c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,5 +5,6 @@ Singular/Singular.1
 Singular/ESingular.1
 Singular/TSingular.1
 dox/doxyfile.stamp
-dox/html_dox.log
+dox/doxygen_sqlite3.db
 dox/tags
+dox/html_dox.log
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index 7414157..69fd846 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -31,7 +31,7 @@ Last-Update: 2014-12-28
 +libsingular_omalloc_includedir=$(includedir)/singular/omalloc
  
  libsingular_omalloc_include_HEADERS = \
- omalloc.h		omDerivedConfig.h	\
+ omalloc.h		omallocClass.h          omDerivedConfig.h	\
 --- a/resources/Makefile.am
 +++ b/resources/Makefile.am
 @@ -13,12 +13,12 @@
@@ -85,7 +85,7 @@ Last-Update: 2014-12-28
  
 --- a/Singular/Makefile.am
 +++ b/Singular/Makefile.am
-@@ -129,7 +129,7 @@
+@@ -128,7 +128,7 @@
  libsingular_Singular_la_LDFLAGS    =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
  libsingular_Singular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
  
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index fd859f9..d458dc9 100644
--- a/debian/patches/debianization-rename-libraries.patch
+++ b/debian/patches/debianization-rename-libraries.patch
@@ -5,7 +5,7 @@ Description: debianization - rename libraries
 Origin: debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-12-28
+Last-Update: 2015-10-15
 
 --- a/omalloc/Makefile.am
 +++ b/omalloc/Makefile.am
@@ -21,7 +21,7 @@ Last-Update: 2014-12-28
  
 -libomalloc_include_HEADERS = \
 +libsingular_omalloc_include_HEADERS = \
- omalloc.h		omDerivedConfig.h	\
+ omalloc.h		omallocClass.h          omDerivedConfig.h	\
  omError.h		omStructs.h		omAllocDecl.h		\
  omInlineDecl.h		omBin.h			omMemOps.h		\
 @@ -29,20 +29,20 @@
@@ -90,7 +90,7 @@ Last-Update: 2014-12-28
  
  SingularHEADERS = \
     attrib.h \
-@@ -124,13 +124,13 @@
+@@ -123,13 +123,13 @@
  # -DMAKE_DISTRIBUTION
  
  # plural_cmd.inc
@@ -109,23 +109,23 @@ Last-Update: 2014-12-28
  
  #########################################################
  # handle all the generated *.inc
-@@ -175,13 +175,13 @@
+@@ -174,13 +174,13 @@
  
- Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
+ Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
 -Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
 +Singular_LDADD = libsingular-Singular.la ${BUILTIN_FLAGS}
  
  Singular_LDFLAGS = ${AM_LDFLAGS} ${BUILTIN_FLAGS}
  
- Singulard_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
+ Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
 -Singulard_LDADD = libSingular.la ${BUILTIN_FLAGS}
 +Singulard_LDADD = libsingular-Singular.la ${BUILTIN_FLAGS}
  
  Singulard_LDFLAGS = -shared ${AM_LDFLAGS} ${BUILTIN_FLAGS}
  
-@@ -192,8 +192,8 @@
+@@ -191,8 +191,8 @@
  ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
  # ESingular_LDFLAGS = ${AM_LDFLAGS}
  ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
@@ -136,7 +136,7 @@ Last-Update: 2014-12-28
  
  
  ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
-@@ -202,8 +202,8 @@
+@@ -201,8 +201,8 @@
  TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
  # TSingular_LDFLAGS = ${AM_LDFLAGS}
  TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
@@ -147,7 +147,7 @@ Last-Update: 2014-12-28
  
  TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
  # utils.cc utils.h
-@@ -214,7 +214,7 @@
+@@ -213,7 +213,7 @@
  
  libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
@@ -156,7 +156,7 @@ Last-Update: 2014-12-28
  libparse_LDFLAGS = ${AM_LDFLAGS}
  
  %.1: %
-@@ -253,7 +253,7 @@
+@@ -252,7 +252,7 @@
  check_PROGRAMS=$(TESTS)
  
  test_SOURCES = test.cc
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 247a6da..5fdcb68 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -112,7 +112,7 @@ Last-Update: 2015-08-02
  
 --- a/omalloc/configure.ac
 +++ b/omalloc/configure.ac
-@@ -621,6 +621,6 @@
+@@ -624,6 +624,6 @@
  dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
  dnl wrap it up
  dnl
diff --git a/debian/patches/debianization-surf.patch b/debian/patches/debianization-surf.patch
index a7ef2a0..c862bd3 100644
--- a/debian/patches/debianization-surf.patch
+++ b/debian/patches/debianization-surf.patch
@@ -4,7 +4,7 @@ Description: debianization: surf[-alggeo]
 Origin: debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-08-03
+Last-Update: 2015-10-15
 
 --- a/Singular/singularsurf
 +++ b/Singular/singularsurf
@@ -17,9 +17,9 @@ Last-Update: 2015-08-03
 -echo "filename = \"/tmp/surf.jpg\";">>$1.pic
 -echo "save_color_image;">>$1.pic
 -surf $1.pic
--/bin/rm $1.pic
+-command rm $1.pic
 -display /tmp/surf.jpg
--/bin/rm /tmp/surf.jpg
+-command rm /tmp/surf.jpg
 +[ -f ${1} ] || exit 1
 +SINGULARSURFALLGEOPIC=$(mktemp --tmpdir singular-surf-alggeo-XXXXXXX.pic)
 +SINGULARSURFALLGEOJPG=${SINGULARSURFALLGEOPIC%.pic}.jpg
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 0fafc0f..9b29097 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,10 +4,19 @@ Description: debianization
 Origin: debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-12-28
+Last-Update: 2015-10-15
 
 --- a/Makefile.am
 +++ b/Makefile.am
+@@ -7,7 +7,7 @@
+ SUBDIRS = resources omalloc xalloc $(USE_FACTORY) \
+ libpolys gfanlib IntegerProgramming \
+ kernel Singular \
+-dox emacs redhat desktop
++dox emacs desktop
+ 
+ EXTRA_DIST = README README.md README.pkg autogen.sh git-version-gen doxy singular.spec.in singular.spec
+ 
 @@ -28,7 +28,7 @@
  	$(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > $(distdir)/.tarball-git-version
  
@@ -93,6 +102,15 @@ Last-Update: 2014-12-28
  PKG_REQUIRE="$PKG_REQUIRE"
  AC_SUBST(PKG_REQUIRE)
  
+@@ -261,8 +263,6 @@
+ 
+ AC_CONFIG_FILES([emacs/Makefile])
+ 
+-AC_CONFIG_FILES([redhat/Makefile])
+-AC_CONFIG_FILES([redhat/singular.spec])
+ AC_CONFIG_FILES([desktop/Makefile desktop/Singular.desktop desktop/Singular-manual.desktop])
+ 
+ AC_OUTPUT
 --- a/libpolys/configure.ac
 +++ b/libpolys/configure.ac
 @@ -8,7 +8,7 @@
@@ -155,7 +173,7 @@ Last-Update: 2014-12-28
  
 --- a/omalloc/configure.ac
 +++ b/omalloc/configure.ac
-@@ -16,11 +16,13 @@
+@@ -19,11 +19,13 @@
  
  AM_MAINTAINER_MODE([enable])
  AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
@@ -185,23 +203,23 @@ Last-Update: 2014-12-28
 +++ b/Singular/Makefile.am
 @@ -6,6 +6,8 @@
  
- all-local: feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib gftables MOD ${abs_builddir}/LIB Singular ESingular TSingular
+ all-local: feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib gftables MOD ${abs_builddir}/LIB Singular$(EXEEXT) ESingular$(EXEEXT) TSingular$(EXEEXT)
  
 +AM_CPPFLAGS += -DDEB_PKG_VERSION=\"$(DEB_PKG_VERSION)\"
 +
  SUBDIRS = dyn_modules
  
  ########################### Possible builtin modules... #########################
-@@ -175,7 +177,7 @@
+@@ -174,7 +176,7 @@
  
  Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
  
 -Singular_LDFLAGS = -static ${AM_LDFLAGS} ${BUILTIN_FLAGS}
 +Singular_LDFLAGS = ${AM_LDFLAGS} ${BUILTIN_FLAGS}
  
- Singulard_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
+ Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
-@@ -188,7 +190,7 @@
+@@ -187,7 +189,7 @@
  
  #### ESingular
  ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
@@ -210,7 +228,7 @@ Last-Update: 2014-12-28
  ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
  ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
  ${top_builddir}/resources/libresources.la
-@@ -198,7 +200,7 @@
+@@ -197,7 +199,7 @@
  
  #### same for TSingular
  TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
@@ -219,7 +237,7 @@ Last-Update: 2014-12-28
  TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
  ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
  ${top_builddir}/resources/libresources.la
-@@ -213,7 +215,7 @@
+@@ -212,7 +214,7 @@
  libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
  libparse_LDADD = ${top_builddir}/omalloc/libomalloc.la
@@ -239,3 +257,35 @@ Last-Update: 2014-12-28
  , VERSION, VERSION_DATE);
    if (feOptValue(FE_OPT_NO_SHELL)) Warn("running in restricted mode:"
      " shell invocation and links are disallowed");
+--- a/git-version-gen
++++ b/git-version-gen
+@@ -1,24 +1,5 @@
+-#!/bin/bash
+-
+-export GIT_WORK_TREE=`dirname "$0"`
+-export GIT_DIR="$GIT_WORK_TREE/.git"
+-
+-## :'%h on %ci by %an: "%s"' --abbrev-commit | sed 's/\"/\\\"/g'
+-if [ -d "$GIT_WORK_TREE/.git" ] && v=`git log --pretty=format:'%h' --abbrev-commit -1 2>/dev/null` ;
+-then
+- if dirty=`sh -c "git diff-index --name-status HEAD 2>/dev/null | sed -e 's|^\([A-Z]\).*|\1|g' | tr -d '\012'"` && [ -n "$dirty" ];
+- then
+-   echo -n "$v|$dirty"
+- else
+-   echo -n "$v"
+- fi
+-# exit 0
+-else
+- F="$1"
+- if [ -r "$F" ];
+- then
+-   cat "$F"
+- else
+-   echo -n "UNKNOWN_GIT_VERSION"
+- fi
+-fi
++#!/bin/sh
++DEB_PKG_VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p')
++echo -n "debian-${DEB_PKG_VERSION}"
++exit 0
++## eos
diff --git a/debian/patches/series b/debian/patches/series
index 65ba7fa..864e833 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-spelling-error-in-singular-lib.patch
 upstream-spelling-error-in-source.patch
 upstream-autotools-help2man.patch
 upstream-autotools-help2man-extra.patch
diff --git a/debian/patches/upstream-autotools-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index c14d8d5..0b98f52 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -5,7 +5,7 @@ Description: autotools: help2man
 Origin: debian
 Forwarded: https://github.com/Singular/Sources/pull/695
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-08-02
+Last-Update: 2015-10-15
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -17,7 +17,7 @@ Last-Update: 2015-08-02
  AC_CHECK_PROGS([DOXYGEN], [doxygen])
  if test -z "$DOXYGEN";
     then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-@@ -258,7 +259,8 @@
+@@ -255,7 +256,8 @@
  
  AC_CONFIG_FILES([IntegerProgramming/Makefile])
  
@@ -29,7 +29,7 @@ Last-Update: 2015-08-02
  
 --- a/Singular/Makefile.am
 +++ b/Singular/Makefile.am
-@@ -157,6 +157,20 @@
+@@ -156,6 +156,20 @@
  
  bin_PROGRAMS = Singular ESingular TSingular $(optional_Singular_programs)
  
@@ -47,10 +47,10 @@ Last-Update: 2015-08-02
 +ESingular_DESCRIPTION = "Computer Algebra System for Polynomial Computations -- command-line interface within emacs"
 +TSingular_DESCRIPTION = "Computer Algebra System for Polynomial Computations -- command-line interface within a new terminal"
 +
- Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
+ Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
  Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
-@@ -201,6 +215,15 @@
+@@ -200,6 +214,15 @@
  libparse_LDADD = ${top_builddir}/omalloc/libomalloc.la
  libparse_LDFLAGS = -static ${AM_LDFLAGS}
  
diff --git a/debian/patches/upstream-spelling-error-in-singular-lib.patch b/debian/patches/upstream-spelling-error-in-singular-lib.patch
new file mode 100644
index 0000000..fb7338e
--- /dev/null
+++ b/debian/patches/upstream-spelling-error-in-singular-lib.patch
@@ -0,0 +1,29 @@
+Description: Singular LIB typo
+ Correct spelling error as reported by eyes in some Singular libraries;
+ meant to be submitted to the upstream maintainer.
+Origin: debian
+Forwarded: https://github.com/Singular/Sources/pull/728
+Comment: spelling-error-in-singular-lib
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-10-15
+
+--- a/Singular/LIB/resgraph.lib
++++ b/Singular/LIB/resgraph.lib
+@@ -103,7 +103,7 @@
+   if((size(#)==0)&&(find(@filename,"/tmp/")))
+   {
+ //--- do not leave any garbage in the public directories
+-    j=system("sh","commnd rm " + outfile + " " + @filename);
++    j=system("sh","command rm " + outfile + " " + @filename);
+   }
+   return();
+ }
+@@ -289,7 +289,7 @@
+   if(find(@filename,"/tmp/"))
+   {
+ //--- do not leave any garbage in the public directories
+-    j=system("sh","commnd rm " + @filename + ".jpg "+ @filename);
++    j=system("sh","command rm " + @filename + ".jpg "+ @filename);
+   }
+   return();
+ }
diff --git a/debian/patches/upstream-spelling-error-in-source.patch b/debian/patches/upstream-spelling-error-in-source.patch
index 6fc871c..cf168a1 100644
--- a/debian/patches/upstream-spelling-error-in-source.patch
+++ b/debian/patches/upstream-spelling-error-in-source.patch
@@ -3,19 +3,194 @@ Description: source typo
  meant to silence lintian and eventually to be submitted to the
  upstream maintainer.
 Origin: debian
-Forwarded: https://github.com/Singular/Sources/pull/723
+Forwarded: https://github.com/Singular/Sources/pull/728
 Comment: spelling-error-in-binary
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-08-03
+Last-Update: 2015-10-15
 
---- a/Singular/feOptTab.h
-+++ b/Singular/feOptTab.h
-@@ -105,7 +105,7 @@
+--- a/IntegerProgramming/IP_algorithms.cc
++++ b/IntegerProgramming/IP_algorithms.cc
+@@ -129,7 +129,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
  
+@@ -210,7 +210,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -417,7 +417,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int Positive_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
  
-   {"allow-net",         no_argument,        LONG_OPTION_RETURN,
--   0,          "Allow to fetch (html) help pages from the net",                feOptBool,    0,      0},
-+   0,          "Allow one to fetch (html) help pages from the net",                feOptBool,    0,      0},
+@@ -498,7 +498,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int Positive_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -714,7 +714,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int Elim_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
  
-   {"browser",           required_argument,  LONG_OPTION_RETURN,
-    "BROWSER",  "Display help in BROWSER (see help.cnf)",       feOptString, 0,   0},
+@@ -795,7 +795,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int Elim_Conti_Traverso(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -1003,7 +1003,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int Pottier(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
+ 
+@@ -1084,7 +1084,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int Pottier(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -1291,7 +1291,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int Hosten_Sturmfels(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
+ 
+@@ -1372,7 +1372,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int Hosten_Sturmfels(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -1702,7 +1702,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int DiBiase_Urbanke(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
+ 
+@@ -1783,7 +1783,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int DiBiase_Urbanke(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -2070,7 +2070,7 @@
+   if(variables<=0)
+   {
+     cerr<<"ERROR: int Bigatti_LaScala_Robbiano(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of variables / matrix columns must be positve"<<endl;
++      "number of variables / matrix columns must be positive"<<endl;
+     return 0;
+   }
+ 
+@@ -2154,7 +2154,7 @@
+   if(constraints<=0)
+   {
+     cerr<<"ERROR: int Bigatti_LaScala_Robbiano(INPUT_FILE, const BOOLEAN&):\n"
+-      "number of constraints / matrix rows must be positve"<<endl;
++      "number of constraints / matrix rows must be positive"<<endl;
+     // Solving problems without constraints is possible, but not very
+     // interesting (because trivial). To avoid the problems and the overhead
+     // incurred by an "empty" matrix, such problems are refused.
+@@ -3711,7 +3711,7 @@
+   if(new_variables<=0)
+   {
+     cerr<<"ERROR: int change_cost(INPUT_FILE, INPUT_FILE):\n"
+-      "number of variables in second input file must be positve"<<endl;
++      "number of variables in second input file must be positive"<<endl;
+     return 0;
+   }
+ 
+--- a/kernel/linear_algebra/linearAlgebra.h
++++ b/kernel/linear_algebra/linearAlgebra.h
+@@ -456,7 +456,7 @@
+  * The algorithm relies on computing square roots of floating point numbers.
+  * These will be combuted by Heron's iteration formula, with iteration
+  * stopping when two successive approximations of the square root differ by
+- * no more than the given tolerance, which is assumed to be a positve real
++ * no more than the given tolerance, which is assumed to be a positive real
+  * number.
+  **/
+ void hessenberg(
+--- a/IntegerProgramming/ideal.cc
++++ b/IntegerProgramming/ideal.cc
+@@ -351,7 +351,7 @@
+       "lexicographical \nwith positive weights"<<endl;
+ 
+   w=_w;
+-  // The argument term_ordering should be given by a homogenous grading.
++  // The argument term_ordering should be given by a homogeneous grading.
+ 
+   if(A._kernel_dimension==-2)
+     // kernel of A not yet computed, do this now
+@@ -432,7 +432,7 @@
+     if(w.weight(generator)!=0)
+       cerr<<"\nWARNING: ideal& ideal::Hosten_Sturmfels_ideal(matrix&, "
+         "const term_ordering&):\nInvalid row space vector does not induce "
+-        "homogenous grading."<<endl;
++        "homogeneous grading."<<endl;
+ 
+     binomial* bin=new binomial(A.columns,generator,w);
+     add_generator(*bin);
+@@ -575,7 +575,7 @@
+       "reverse lexicographical \nwith positive weights"<<endl;
+ 
+   w=_w;
+-  // The argument term_ordering should be given by a homogenous grading.
++  // The argument term_ordering should be given by a homogeneous grading.
+ 
+   if(A._kernel_dimension==-2)
+     // kernel of A not yet computed, do this now
+@@ -684,7 +684,7 @@
+     if(w.weight(generator)!=0)
+       cerr<<"\nWARNING: ideal& ideal::Bigatti_LaScala_Robbiano_ideal(matrix&, "
+         "const term_ordering&):\nInvalid row space vector does not induce "
+-        "homogenous grading."<<endl;
++        "homogeneous grading."<<endl;
+ 
+     binomial* bin=new binomial(A.columns+1,generator,w);
+     add_generator(*bin);
diff --git a/debian/repack b/debian/repack
index d78df8a..eeaf20a 100755
--- a/debian/repack
+++ b/debian/repack
@@ -58,6 +58,10 @@ REPACK_WORKING_FOLDER=$(pwd)
 cd "${UPSTREAM_ROOTFOLDER}"
 
 ####. "${REPACK_WORKING_FOLDER}/debian/repack.local"
+## discard other distribution material to avoid confusion
+rm --verbose --force --recursive -- redhat
+## discard third party packages
+rm --verbose --force --recursive -- Singular/LIB/surfex
 ## wipe out
 rm --verbose --force -- README.md
 rm --verbose --force -- m4/lt~obsolete.m4
@@ -76,7 +80,10 @@ rm --verbose --force -- build-aux/config.sub
 rm --verbose --force -- build-aux/config.guess
 rm --verbose --force -- build-aux/test-driver
 rmdir --verbose --ignore-fail-on-non-empty -- build-aux
+rm --verbose --force -- make_tar.sh
+rm --verbose --force -- warn_not_found.sh
 ##
+find . -name 'autom4te.cache' | xargs --no-run-if-empty rm --verbose --recursive --force
 find . -name 'aclocal.m4' | xargs --no-run-if-empty rm --verbose --force
 find . -name 'Makefile.in' | xargs --no-run-if-empty rm --verbose --force
 rm --verbose --force -- gfanlib/_config.h.in
@@ -126,6 +133,8 @@ rm --verbose --force -- m4/ax_python_embed.m4
 ####rm --verbose --force -- m4/ax_python_with_version.m4
 ###### comment:
 ######  ax_python_with_version.m4 does not belong to autoconf-archive.
+## remove executable bit for source files
+chmod --changes a-x Singular/extra.cc
 #:
 
 cd ${REPACK_WORKING_FOLDER}
diff --git a/debian/watch b/debian/watch
index cb8a5c3..9fa5a44 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/\+ds// \
+opts=dversionmangle=s/\+ds//,uversionmangle=s/p/-p/ \
 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/([\d-]+)/ singular-([\d\.]+|[\d\.]+p\d+)\.tar\.gz \
 debian sh debian/repack

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



More information about the debian-science-commits mailing list