[singular] 03/03: Imported Debian patch 4.0.3-p4+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Fri Oct 21 02:08:23 UTC 2016 

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

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

commit 769bbd97b41395747c594fc9c53062309ebef04b
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Oct 21 02:16:05 2016 +0100

    Imported Debian patch 4.0.3-p4+ds-1
---
 debian/changelog                                   |  10 ++
 debian/patches/debianization-4ti2.patch            |   2 +-
 debian/patches/debianization-documentation.patch   |   2 +-
 debian/patches/debianization-gather-headers.patch  |  24 ++---
 .../patches/debianization-rename-libraries.patch   | 110 +++++++++------------
 .../debianization-rename-pkgconfig_files.patch     |  36 +++----
 debian/patches/debianization-resources.patch       |   2 +-
 debian/patches/debianization-surf.patch            |   2 +-
 debian/patches/debianization.patch                 |  16 +--
 debian/patches/series                              |   1 -
 .../upstream-autotools-help2man-extra.patch        |   2 +-
 debian/patches/upstream-autotools-help2man.patch   |   4 +-
 .../upstream-bug-840481-readline6TWO7.patch        | 107 --------------------
 .../upstream-lintian-spelling-error-silence.patch  |   6 +-
 .../patches/upstream-tests-omalloc-getlucky.patch  |   2 +-
 15 files changed, 104 insertions(+), 222 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8208253..a132b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+singular (4.0.3-p4+ds-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Debianization:
+    - debian/patches/*.patch:
+      - Origin field, correct;
+      - refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 20 Oct 2016 23:58:53 +0000
+
 singular (4.0.3-p3+ds-2) unstable; urgency=medium
 
   * RC fix (Closes: #840481), fix readline 6 to 7 migration issue.
diff --git a/debian/patches/debianization-4ti2.patch b/debian/patches/debianization-4ti2.patch
index 32f6923..f1a542d 100644
--- a/debian/patches/debianization-4ti2.patch
+++ b/debian/patches/debianization-4ti2.patch
@@ -1,7 +1,7 @@
 Description: debianization: 4ti2
  Address the Debian specific naming scheme set up for the 4ti2 suite tools
  in the 4ti2 Debian package.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2014-12-28
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index 2581dd0..ea9b8ed 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -1,6 +1,6 @@
 Description: debianization -- documentation
  Address Debian Policy requirements for documentation.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2016-04-28
diff --git a/debian/patches/debianization-gather-headers.patch b/debian/patches/debianization-gather-headers.patch
index 2f057af..0970a98 100644
--- a/debian/patches/debianization-gather-headers.patch
+++ b/debian/patches/debianization-gather-headers.patch
@@ -1,10 +1,10 @@
 Description: debianization - gather headers
  Gather Singular headers in a package include folder mainly for avoiding
  possible collision, given that some of them have rather generic names.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-04-28
+Last-Update: 2016-10-20
 
 --- a/factory/Makefile.am
 +++ b/factory/Makefile.am
@@ -34,22 +34,24 @@ Last-Update: 2016-04-28
  omalloc.h		omallocClass.h          omDerivedConfig.h	\
 --- a/resources/Makefile.am
 +++ b/resources/Makefile.am
-@@ -13,12 +13,12 @@
+@@ -13,13 +13,13 @@
  
  libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
  
--configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/resources
+-configheaderdir = $(includedir)/$(DEB_HOST_MULTIARCH)/resources
 -libsingular_resources_includedir  =$(includedir)/resources
-+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/singular/resources
++configheaderdir = $(includedir)/$(DEB_HOST_MULTIARCH)/singular/resources
 +libsingular_resources_includedir  =$(includedir)/singular/resources
  
  libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
  
--nodist_libsingular_resources_include_HEADERS = resourcesconfig.h
-+nodist_configheader_HEADERS = resourcesconfig.h
- DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
+-nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h
+-DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
++nodist_configheader_HEADERS = singular_resourcesconfig.h
++DISTCLEANFILES = $(nodist_configheader_HEADERS)
  
  pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = singular_resources.pc
 --- a/gfanlib/Makefile.am
 +++ b/gfanlib/Makefile.am
 @@ -17,7 +17,7 @@
@@ -297,8 +299,8 @@ Last-Update: 2016-04-28
  Libs: -L${libdir} -lsingular-Singular @USEPPROCSDYNAMICLD@
  Libs.private:
  
---- a/resources/resources.pc.in
-+++ b/resources/resources.pc.in
+--- a/resources/singular_resources.pc.in
++++ b/resources/singular_resources.pc.in
 @@ -2,6 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
@@ -364,7 +366,7 @@ Last-Update: 2016-04-28
 +libsingular_omalloc_includedir=$(includedir)/singular/omalloc
  
 -libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
-+noinst_libsingular_omalloc_include_HEADERS = omalloc.h omallocClass.h
++noinst_HEADERS = omalloc.h omallocClass.h
  
  SOURCES=dummy.c omallocClass.cc
  
diff --git a/debian/patches/debianization-rename-libraries.patch b/debian/patches/debianization-rename-libraries.patch
index 07ca92f..2d94e8c 100644
--- a/debian/patches/debianization-rename-libraries.patch
+++ b/debian/patches/debianization-rename-libraries.patch
@@ -2,10 +2,10 @@ Description: debianization - rename libraries
  Append suffix `singular-' to every Singular libraries for avoiding possible
  collision and for consistency, given that their name are rather generic apart
  for the Singular library itself.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-10-15
+Last-Update: 2016-10-20
 
 --- a/omalloc/Makefile.am
 +++ b/omalloc/Makefile.am
@@ -117,29 +117,31 @@ Last-Update: 2015-10-15
  
  Singulard_LDFLAGS = -shared ${AM_LDFLAGS} ${BUILTIN_FLAGS}
  
-@@ -191,8 +191,8 @@
+@@ -191,8 +191,9 @@
  ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
  # ESingular_LDFLAGS = ${AM_LDFLAGS}
  ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
 -${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
+-${top_builddir}/resources/libsingular_resources.la
 +${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libsingular-omalloc.la \
 +${top_builddir}/resources/libsingular-resources.la
++
  
  
  ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
-@@ -201,8 +201,8 @@
+@@ -201,8 +202,9 @@
  TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
  # TSingular_LDFLAGS = ${AM_LDFLAGS}
  TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
 -${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
+-${top_builddir}/resources/libsingular_resources.la
 +${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libsingular-omalloc.la \
 +${top_builddir}/resources/libsingular-resources.la
++
  
  TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
  # utils.cc utils.h
-@@ -213,7 +213,7 @@
+@@ -213,7 +215,7 @@
  
  libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
@@ -148,7 +150,7 @@ Last-Update: 2015-10-15
  libparse_LDFLAGS = ${AM_LDFLAGS}
  
  %.1: %
-@@ -254,7 +254,7 @@
+@@ -254,7 +256,7 @@
  check_PROGRAMS=$(TESTS)
  
  test_SOURCES = test.cc
@@ -201,7 +203,7 @@ Last-Update: 2015-10-15
    AC_MSG_RESULT(yes)
    RESOURCES_INCLUDES="-I$ac_abs_top_srcdir "
  
--  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la"
+-  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la"
 +  RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular-resources.la"
  
    AC_SUBST(RESOURCES_INCLUDES)
@@ -283,42 +285,6 @@ Last-Update: 2015-10-15
  
  ####################################################
  ## PKG config
---- a/resources/Makefile.am
-+++ b/resources/Makefile.am
-@@ -1,25 +1,25 @@
- ACLOCAL_AMFLAGS = -I ../m4
- 
--libresources_LTLIBRARIES = libresources.la
-+libsingular_resources_LTLIBRARIES = libsingular-resources.la
- 
--libresourcesdir = $(libdir)
-+libsingular_resourcesdir = $(libdir)
- 
- 
- AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
- 
- 
- SOURCES  = omFindExec.c feResource.cc feFopen.cc
--libresources_la_SOURCES   = $(SOURCES)
-+libsingular_resources_la_SOURCES   = $(SOURCES)
- 
--libresources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
-+libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
- 
- configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/resources
--libresources_includedir  =$(includedir)/resources
-+libsingular_resources_includedir  =$(includedir)/resources
- 
--libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
-+libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
- 
--nodist_libresources_include_HEADERS = resourcesconfig.h
--DISTCLEANFILES = $(nodist_libresources_include_HEADERS)
-+nodist_libsingular_resources_include_HEADERS = resourcesconfig.h
-+DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = resources.pc
 --- a/kernel/Makefile.am
 +++ b/kernel/Makefile.am
 @@ -14,7 +14,7 @@
@@ -386,17 +352,6 @@ Last-Update: 2015-10-15
  endif
  
  #AM_COLOR_TESTS=always
---- a/libpolys/tests/Makefile.am
-+++ b/libpolys/tests/Makefile.am
-@@ -22,7 +22,7 @@
- $(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
- $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
- 
--polys_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
-+polys_test_LDADD = ${top_builddir}/polys/libsingular-polys.la $(coeffs_test_LDADD)
- rings_test_LDADD = $(polys_test_LDADD)
- 
- BUILT_SOURCES = gftables MOD \
 --- a/Singular.pc.in
 +++ b/Singular.pc.in
 @@ -12,6 +12,6 @@
@@ -418,16 +373,6 @@ Last-Update: 2015-10-15
  # Libs.private:
  
 +
---- a/resources/resources.pc.in
-+++ b/resources/resources.pc.in
-@@ -12,6 +12,6 @@
- # Conflicts:
- 
- Cflags: -I${includedir} @SINGULAR_CFLAGS@
--Libs: -L${libdir} -l at PACKAGE@
-+Libs: -L${libdir} -lsingular-resources
- # Libs.private:
- 
 --- a/factory/factory.pc.in
 +++ b/factory/factory.pc.in
 @@ -12,6 +12,6 @@
@@ -477,3 +422,36 @@ Last-Update: 2015-10-15
  
  DISTCLEANFILES =  config.h
  
+--- a/resources/Makefile.am
++++ b/resources/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I ../m4
+ 
+-libsingular_resources_LTLIBRARIES = libsingular_resources.la
++libsingular_resources_LTLIBRARIES = libsingular-resources.la
+ 
+ libsingular_resourcesdir = $(libdir)
+ 
+--- a/libpolys/tests/Makefile.am
++++ b/libpolys/tests/Makefile.am
+@@ -22,8 +22,8 @@
+ $(FACTORY_LIBS) $(RESOURCES_LIBS) $(OMALLOC_LIBS) \
+ $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
+ 
+-simple_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
+-polys_test_LDADD = ${top_builddir}/polys/libpolys.la $(coeffs_test_LDADD)
++simple_test_LDADD = ${top_builddir}/polys/libsingular-polys.la $(coeffs_test_LDADD)
++polys_test_LDADD = ${top_builddir}/polys/libsingular-polys.la $(coeffs_test_LDADD)
+ rings_test_LDADD = $(polys_test_LDADD)
+ 
+ BUILT_SOURCES = gftables MOD \
+--- a/resources/singular_resources.pc.in
++++ b/resources/singular_resources.pc.in
+@@ -12,6 +12,6 @@
+ # Conflicts:
+ 
+ Cflags: -I${includedir} @SINGULAR_CFLAGS@
+-Libs: -L${libdir} -l at PACKAGE@
++Libs: -L${libdir} -lsingular-resources
+ # Libs.private:
+ 
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 5b25b1e..6447f70 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -2,10 +2,10 @@ Description: debianization - rename pkpconfig (pc) files
  Append suffix `singular-' to each Singular pkgconfig(1) file for avoiding
  possible collision apart for the Singular pkgconfig file itself, while
  previous renaming changes are implemented.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-08-02
+Last-Update: 2016-10-20
 
 --- a/Singular.pc.in
 +++ b/Singular.pc.in
@@ -29,8 +29,8 @@ Last-Update: 2015-08-02
  Description: The Singular polynomial/coefficient arithmetic and related supporting functionality
  Version: @PACKAGE_VERSION@
  URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
---- a/resources/resources.pc.in
-+++ b/resources/resources.pc.in
+--- a/resources/singular_resources.pc.in
++++ b/resources/singular_resources.pc.in
 @@ -4,7 +4,7 @@
  includedir=@includedir@
  multiarchincludedir=@includedir@/@DEB_HOST_MULTIARCH@
@@ -68,7 +68,7 @@ Last-Update: 2015-08-02
    AC_MSG_CHECKING([  RESOURCES_LIBS?..])
    AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
  
--  PKG_REQUIRE="$PKG_REQUIRE resources"
+-  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
 +  PKG_REQUIRE="$PKG_REQUIRE singular-resources"
    AC_SUBST(PKG_REQUIRE)
  else
@@ -81,22 +81,13 @@ Last-Update: 2015-08-02
 +AC_CONFIG_FILES([singular-libpolys.pc:libpolys.pc.in])
  AC_CONFIG_FILES([libpolys-config], [chmod a+x libpolys-config])
  AC_OUTPUT
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -72,5 +72,5 @@
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- 
--AC_CONFIG_FILES([resources.pc Makefile])
-+AC_CONFIG_FILES([singular-resources.pc:resources.pc.in Makefile])
- AC_OUTPUT
 --- a/factory/configure.ac
 +++ b/factory/configure.ac
 @@ -136,7 +136,7 @@
    AC_MSG_CHECKING([  RESOURCES_LIBS?..])
    AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
  
--  PKG_REQUIRE="$PKG_REQUIRE resources"
+-  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
 +  PKG_REQUIRE="$PKG_REQUIRE singular-resources"
    AC_SUBST(PKG_REQUIRE)
  else
@@ -133,10 +124,10 @@ Last-Update: 2015-08-02
 --- a/resources/Makefile.am
 +++ b/resources/Makefile.am
 @@ -22,4 +22,4 @@
- DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
+ DISTCLEANFILES = $(nodist_configheader_HEADERS)
  
  pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = resources.pc
+-pkgconfig_DATA = singular_resources.pc
 +pkgconfig_DATA = singular-resources.pc
 --- a/factory/Makefile.am
 +++ b/factory/Makefile.am
@@ -191,7 +182,7 @@ Last-Update: 2015-08-02
  
    ac_configure_args="$ac_configure_args $ENABLE_ARG"
  
--  PKG_REQUIRE="$PKG_REQUIRE resources"
+-  PKG_REQUIRE="$PKG_REQUIRE singular_resources"
 +  PKG_REQUIRE="$PKG_REQUIRE singular-resources"
    AC_SUBST(PKG_REQUIRE)
   else
@@ -214,3 +205,12 @@ Last-Update: 2015-08-02
      AC_SUBST(PKG_REQUIRE)
    else
      AC_MSG_RESULT(no)
+--- a/resources/configure.ac
++++ b/resources/configure.ac
+@@ -72,5 +72,5 @@
+ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ 
+-AC_CONFIG_FILES([singular_resources.pc Makefile])
++AC_CONFIG_FILES([singular-resources.pc:singular_resources.pc.in Makefile])
+ AC_OUTPUT
diff --git a/debian/patches/debianization-resources.patch b/debian/patches/debianization-resources.patch
index 6f48097..17311b3 100644
--- a/debian/patches/debianization-resources.patch
+++ b/debian/patches/debianization-resources.patch
@@ -1,6 +1,6 @@
 Description: debianization - resources
  Address Debian Policy requirements for Singular resources.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2014-12-24
diff --git a/debian/patches/debianization-surf.patch b/debian/patches/debianization-surf.patch
index c862bd3..71eb590 100644
--- a/debian/patches/debianization-surf.patch
+++ b/debian/patches/debianization-surf.patch
@@ -1,7 +1,7 @@
 Description: debianization: surf[-alggeo]
  Address the Debian specific naming scheme set up for the surf[-alggeo]
  software package in the surf-allgeo Debian package.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2015-10-15
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index dc78d4d..d83553f 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -1,7 +1,7 @@
 Description: debianization
  Meant to maintain a minimal debian/rules, to fix warnings,
  to address Debian specific stuff in general.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2015-10-15
@@ -76,12 +76,12 @@ Last-Update: 2015-10-15
 +++ b/resources/Makefile.am
 @@ -13,6 +13,7 @@
  
- libresources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
+ libsingular_resources_la_LDFLAGS   = -release ${PACKAGE_VERSION}
  
-+configheaderdir = ${includedir}/$(DEB_HOST_MULTIARCH)/resources
- libresources_includedir  =$(includedir)/resources
++configheaderdir = $(includedir)/$(DEB_HOST_MULTIARCH)/resources
+ libsingular_resources_includedir  =$(includedir)/resources
  
- libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
+ libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
 --- a/configure.ac
 +++ b/configure.ac
 @@ -18,7 +18,7 @@
@@ -102,7 +102,7 @@ Last-Update: 2015-10-15
  PKG_REQUIRE="$PKG_REQUIRE"
  AC_SUBST(PKG_REQUIRE)
  
-@@ -260,8 +262,6 @@
+@@ -261,8 +263,6 @@
  
  AC_CONFIG_FILES([emacs/Makefile])
  
@@ -227,7 +227,7 @@ Last-Update: 2015-10-15
 +# ESingular_LDFLAGS = ${AM_LDFLAGS}
  ESingular_LDADD =  ${top_builddir}/libpolys/reporter/libreporter.la \
  ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
- ${top_builddir}/resources/libresources.la
+ ${top_builddir}/resources/libsingular_resources.la
 @@ -197,7 +199,7 @@
  
  #### same for TSingular
@@ -236,7 +236,7 @@ Last-Update: 2015-10-15
 +# TSingular_LDFLAGS = ${AM_LDFLAGS}
  TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
  ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
- ${top_builddir}/resources/libresources.la
+ ${top_builddir}/resources/libsingular_resources.la
 @@ -212,7 +214,7 @@
  libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
  
diff --git a/debian/patches/series b/debian/patches/series
index b80acc8..231c1a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream-bug-840481-readline6TWO7.patch
 upstream-bug-837016-doxygen-ax-update.patch
 upstream-lintian-spelling-error-silence.patch
 upstream-tests-omalloc-getlucky.patch
diff --git a/debian/patches/upstream-autotools-help2man-extra.patch b/debian/patches/upstream-autotools-help2man-extra.patch
index bd499ef..4505079 100644
--- a/debian/patches/upstream-autotools-help2man-extra.patch
+++ b/debian/patches/upstream-autotools-help2man-extra.patch
@@ -1,7 +1,7 @@
 Description: autotools: help2man - extra
  Implement extra material added during the generation of the manpages for
  the front-end programs; meant to be submitted to the upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: https://github.com/Singular/Sources/pull/695
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2014-12-23
diff --git a/debian/patches/upstream-autotools-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index 5b44cdc..ca1b480 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -2,7 +2,7 @@ Description: autotools: help2man
  Implement the generation of the manpages for the front-end
  programs and development tools with help2man(1);
  meant to be submitted to the upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: https://github.com/Singular/Sources/pull/695
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2016-08-21
@@ -17,7 +17,7 @@ Last-Update: 2016-08-21
  AC_CHECK_PROGS([DOXYGEN], [doxygen])
  if test -z "$DOXYGEN";
     then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-@@ -254,7 +255,8 @@
+@@ -255,7 +256,8 @@
  
  AC_CONFIG_FILES([IntegerProgramming/Makefile])
  
diff --git a/debian/patches/upstream-bug-840481-readline6TWO7.patch b/debian/patches/upstream-bug-840481-readline6TWO7.patch
deleted file mode 100644
index fb70171..0000000
--- a/debian/patches/upstream-bug-840481-readline6TWO7.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Fix RC #840481 caused by readline 6to7 migration
-Bug: https://github.com/Singular/Sources/issues/799
-Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
-Last-Update: 2016-10-13
-
---- a/kernel/oswrapper/feread.cc
-+++ b/kernel/oswrapper/feread.cc
-@@ -341,19 +341,28 @@
-     #ifdef atarist
-       rl_outstream = fopen( "/dev/tty", "w" );
-     #else
--      rl_outstream = fopen( ttyname(fileno(stdin)), "w" );
-+      char *fn=ttyname(fileno(stdin));
-+      if (fn!=NULL) rl_outstream = fopen( fn, "w" );
-     #endif
-   }
- 
--  /* try to read a history */
--  using_history();
--  char *p = getenv("SINGULARHIST");
--  if (p != NULL)
-+  if(isatty(fileno(stdin)))
-+	{
-+    /* try to read a history */
-+    using_history();
-+    char *p = getenv("SINGULARHIST");
-+    if (p != NULL)
-+    {
-+      read_history (p);
-+    }
-+    fe_fgets_stdin=fe_fgets_stdin_rl;
-+    return(fe_fgets_stdin_rl(pr,s,size));
-+	}
-+	else
-   {
--    read_history (p);
--  }
--  fe_fgets_stdin=fe_fgets_stdin_rl;
--  return(fe_fgets_stdin_rl(pr,s,size));
-+    fe_fgets_stdin=fe_fgets;
-+		return(fe_fgets(pr,s,size));
-+	}
- #endif
- #ifdef HAVE_DYN_RL
-   /* do dynamic loading */
-@@ -373,7 +382,7 @@
-     #endif
-     return fe_fgets_stdin(pr,s,size);
-   }
--  else /* could load libreadline: */
-+  else if (isatty(STDIN_FILENO))/*and could load libreadline: */
-   {
-     /* Allow conditional parsing of the ~/.inputrc file. */
-     *fe_rl_readline_name = "Singular";
-@@ -386,20 +395,25 @@
-     {
-       (*fe_read_history) (p);
-     }
--  }
- 
--  /* set the output stream */
--  if(!isatty(STDOUT_FILENO))
-+    /* set the output stream */
-+    if(!isatty(STDOUT_FILENO))
-+    {
-+      #ifdef atarist
-+        *fe_rl_outstream = fopen( "/dev/tty", "w" );
-+      #else
-+        char *fn=ttyname(fileno(stdin));
-+				if (fn!=NULL) *fe_rl_outstream = fopen( fn, "w" );
-+      #endif
-+    }
-+    fe_fgets_stdin=fe_fgets_stdin_drl;
-+    return fe_fgets_stdin_drl(pr,s,size);
-+  }
-+  else
-   {
--    #ifdef atarist
--      *fe_rl_outstream = fopen( "/dev/tty", "w" );
--    #else
--      *fe_rl_outstream = fopen( ttyname(fileno(stdin)), "w" );
--    #endif
-+    fe_fgets_stdin=fe_fgets;
-+    return fe_fgets(pr,s,size);
-   }
--
--  fe_fgets_stdin=fe_fgets_stdin_drl;
--  return fe_fgets_stdin_drl(pr,s,size);
- #else
-   #if !defined(HAVE_READLINE) && defined(HAVE_FEREAD)
-     fe_fgets_stdin=fe_fgets_stdin_emu;
---- a/kernel/oswrapper/fereadl.c
-+++ b/kernel/oswrapper/fereadl.c
-@@ -793,10 +793,10 @@
-     if (fe_using_history==NULL) { res=13; break; }
-     fe_read_history=dynl_sym(fe_rl_hdl,"read_history");
-     if (fe_read_history==NULL) { res=14; break; }
--    return 0;
-+    break;
-   }
--  dynl_close(fe_rl_hdl);
--  if (res==0)
-+  if (res!=0) dynl_close(fe_rl_hdl);
-+  else
-   {
-     char *p;
-     /* more init stuff: */
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
index 3b702d4..e5b2a53 100644
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -2,11 +2,11 @@ Description: source typo
  Correct spelling error as reported by lintian in some binraries;
  meant to silence lintian and eventually to be submitted to the
  upstream maintainer.
-Origin: debian
-Forwarded: WIP
+Origin: vendor, Debian
+Forwarded: https://github.com/Singular/Sources/pull/800
 Comment: spelling-error-in-binary
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-08-21
+Last-Update: 2016-10-20
 
 --- a/kernel/numeric/mpr_base.cc
 +++ b/kernel/numeric/mpr_base.cc
diff --git a/debian/patches/upstream-tests-omalloc-getlucky.patch b/debian/patches/upstream-tests-omalloc-getlucky.patch
index 715b859..f06dea8 100644
--- a/debian/patches/upstream-tests-omalloc-getlucky.patch
+++ b/debian/patches/upstream-tests-omalloc-getlucky.patch
@@ -4,7 +4,7 @@ Description: tests: omalloc: multi-running script
  wrapper that is meant to work around those unlucky cases by running a few
  number of tests instead of just one test; meant to be submitted to the
  upstream maintainer.
-Origin: debian
+Origin: vendor, Debian
 Forwarded: https://github.com/Singular/Sources/pull/733
 Author: Jerome Benoit <calculus at rezozer.net>
 Last-Update: 2015-11-14

-- 
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