[singular] 04/04: Imported Debian patch 4.1.0-p1+ds-1

[Jerome Benoit]

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

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

commit 40838d94d1bd7999a946caab81f555f2fc739bff
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Nov 21 05:27:07 2016 +0000

    Imported Debian patch 4.1.0-p1+ds-1
---
 debian/changelog                                    |  8 +++++---
 debian/libsingular4.lintian-overrides               |  4 ++--
 debian/patches/debianization.patch                  |  2 +-
 debian/patches/series                               |  1 -
 debian/patches/upstream-autotools-help2man.patch    |  2 +-
 .../upstream-lintian-spelling-error-silence.patch   | 21 ---------------------
 debian/rules                                        |  4 ++--
 7 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83d8727..ee81d86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-singular (1:4.1.0-p1+ds-0) experimental; urgency=medium
+singular (1:4.1.0-p1+ds-1) experimental; urgency=medium
 
   * New upstream minor version.
   * Debianization:
-    - debian/copyright, refresh.
+    - debian/copyright, refresh;
+    - debian/rules, harden;
+    - debian/*, correct typo.
 
- -- Jerome Benoit <calculus at rezozer.net>  Mon, 21 Nov 2016 04:00:29 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 21 Nov 2016 05:25:14 +0000
 
 singular (1:4.0.3-p5+ds-1) experimental; urgency=medium
 
diff --git a/debian/libsingular4.lintian-overrides b/debian/libsingular4.lintian-overrides
index 751625a..bb73503 100644
--- a/debian/libsingular4.lintian-overrides
+++ b/debian/libsingular4.lintian-overrides
@@ -1,7 +1,7 @@
 # the upstream source ball contains only EMPTY ChangeLog files
 libsingular4: no-upstream-changelog
 
-# the upstream source contains C++ code, and has no clearly defined and versionned ABI
+# the upstream source contains C++ code, and has no clearly defined and versioned ABI
 libsingular4: package-name-doesnt-match-sonames
 
 # An isolated mathematically impossible computation in factory/NTLconvert.cc
@@ -14,5 +14,5 @@ libsingular4: package-name-doesnt-match-sonames
 # than a design issue that may be revisited only to please lintian.
 libsingular4: shlib-calls-exit
 
-# the upstream source contains C++ code, and has no clearly defined and versionned ABI
+# the upstream source contains C++ code, and has no clearly defined and versioned ABI
 libsingular4: no-symbols-control-file
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index d83553f..5989e65 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -102,7 +102,7 @@ Last-Update: 2015-10-15
  PKG_REQUIRE="$PKG_REQUIRE"
  AC_SUBST(PKG_REQUIRE)
  
-@@ -261,8 +263,6 @@
+@@ -256,8 +258,6 @@
  
  AC_CONFIG_FILES([emacs/Makefile])
  
diff --git a/debian/patches/series b/debian/patches/series
index 0899914..47a93cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream-lintian-spelling-error-silence.patch
 upstream-bug-837016-doxygen-ax-update.patch
 upstream-tests-omalloc-getlucky.patch
 upstream-autotools-help2man.patch
diff --git a/debian/patches/upstream-autotools-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index ca1b480..a5d4663 100644
--- a/debian/patches/upstream-autotools-help2man.patch
+++ b/debian/patches/upstream-autotools-help2man.patch
@@ -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])
-@@ -255,7 +256,8 @@
+@@ -250,7 +251,8 @@
  
  AC_CONFIG_FILES([IntegerProgramming/Makefile])
  
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
deleted file mode 100644
index 03a0be2..0000000
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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: vendor, Debian
-Forwarded: https://github.com/Singular/Sources/pull/804
-Comment: spelling-error-in-binary
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-09
-
---- a/kernel/combinatorics/hilb.cc
-+++ b/kernel/combinatorics/hilb.cc
-@@ -79,7 +79,7 @@
-     {
-       if (z>(MAX_INT_VAL)/2)
-       {
--       WerrorS("interal arrays too big");
-+       WerrorS("internal arrays too big");
-        return;
-       }
-       p = (int *)omAlloc((unsigned long)z * sizeof(int));
diff --git a/debian/rules b/debian/rules
index 3722ccc..ce93c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ default:
 	dh $@ --with autoreconf --parallel
 
 override_dh_auto_build-indep:
-	$(MAKE)
+	dh_auto_build -i
 	$(MAKE) -C dox html
 
 override_dh_auto_test-arch:
@@ -25,7 +25,7 @@ override_dh_auto_test-indep:
 
 DEB_AUTO_INSTALL_MAKEFLAGS = TOPSRCDIR=$(CURDIR) DESTDIR=$(CURDIR)/debian/tmp
 override_dh_auto_install-indep:
-	$(MAKE) install $(DEB_AUTO_INSTALL_MAKEFLAGS)
+	dh_auto_install -i
 	$(MAKE) -C dox install-html $(DEB_AUTO_INSTALL_MAKEFLAGS)
 
 ## WARNING: documentation might not be clean

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