[singular] 04/04: Imported Debian patch 1:4.1.0-p3+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 0e1e869e333a1df9cd51ff94a8cc60a8f67ebdeb
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Fri Apr 28 17:14:18 2017 +0400

    Imported Debian patch 1:4.1.0-p3+ds-1
---
 debian/changelog                                          | 7 +++++--
 debian/patches/debianization-documentation.patch          | 2 +-
 debian/patches/debianization-rename-pkgconfig_files.patch | 2 +-
 debian/patches/debianization.patch                        | 2 +-
 debian/patches/upstream-autotools-help2man.patch          | 2 +-
 debian/rules                                              | 6 +++---
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ddafd8..1a9a991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-singular (1:4.1.0-p3+ds-0) UNRELEASED; urgency=medium
+singular (1:4.1.0-p3+ds-1) experimental; urgency=medium
 
   * New upstream minor version.
+  * Debianization:
+    - d/patches/, refreshment;
+    - singular.hlp management, correct (Closes: #856871).
 
- -- Jerome Benoit <calculus at rezozer.net>  Fri, 28 Apr 2017 09:36:35 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Fri, 28 Apr 2017 12:40:35 +0000
 
 singular (1:4.1.0-p2+ds-1) experimental; urgency=medium
 
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index ea9b8ed..0d13c86 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -54,7 +54,7 @@ Last-Update: 2016-04-28
 +++ b/Makefile.am
 @@ -30,7 +30,12 @@
  install-data-local:
- 	-cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -)
+ 	-(cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar jxf -))
  	-mkdir $(DESTDIR)$(datadir)/info
 -	-mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/.
 +	-mv  $(DESTDIR)$(datadir)/singular/singular.hlp  $(DESTDIR)$(datadir)/info/singular.hlp
diff --git a/debian/patches/debianization-rename-pkgconfig_files.patch b/debian/patches/debianization-rename-pkgconfig_files.patch
index 80a0249..826c6a8 100644
--- a/debian/patches/debianization-rename-pkgconfig_files.patch
+++ b/debian/patches/debianization-rename-pkgconfig_files.patch
@@ -102,7 +102,7 @@ Last-Update: 2016-10-20
  
 --- a/omalloc/configure.ac
 +++ b/omalloc/configure.ac
-@@ -637,6 +637,6 @@
+@@ -602,6 +602,6 @@
  dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
  dnl wrap it up
  dnl
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index c19f1f4..3bfea02 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)
  
-@@ -251,8 +253,6 @@
+@@ -254,8 +256,6 @@
  
  AC_CONFIG_FILES([emacs/Makefile])
  
diff --git a/debian/patches/upstream-autotools-help2man.patch b/debian/patches/upstream-autotools-help2man.patch
index b394e5f..71be12e 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])
-@@ -245,7 +246,8 @@
+@@ -248,7 +249,8 @@
  
  AC_CONFIG_FILES([IntegerProgramming/Makefile])
  
diff --git a/debian/rules b/debian/rules
index ce93c83..1d2549e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,9 @@ override_dh_link-arch:
 	dh_link -p libsingular4-dev \
 		/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/Singular.pc /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/singular.pc
 
-override_dh_link-indep:
-	dh_link -p singular-doc \
-		/usr/share/info/singular.hlp.gz /usr/share/info/singular.info.gz
+##override_dh_link-indep:
+##	dh_link -p singular-doc \
+##		/usr/share/info/singular.hlp.gz /usr/share/info/singular.info.gz
 
 get-orig-source:
 	uscan --no-conf --download-current-version --compression xz --verbose

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