[Debian-astro-commits] [funtools] 02/03: Adjust patch for new version

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository funtools.

commit 05d380868b25d2096dd305755b0f854593c980a0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Oct 23 11:42:27 2015 +0200

    Adjust patch for new version
---
 debian/patches/fix_manpages.patch | 37 -------------------------------------
 debian/patches/link_to_so.patch   |  9 +++++++++
 debian/patches/multiarch.patch    |  9 ---------
 debian/patches/series             |  1 -
 4 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
deleted file mode 100644
index 8bb374e..0000000
--- a/debian/patches/fix_manpages.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix manpages (section and name) so that lintian does not complain
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -462,14 +462,19 @@
- install-man:
- 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
- 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
--	    mkdir $(MAN_INSTALL_DIR); \
-+	    mkdir -p $(MAN_INSTALL_DIR); \
- 	    chmod 755 $(MAN_INSTALL_DIR); \
- 	    else true; \
- 	fi;
- 	@-(for i in `ls ./man/man?/*.?` ; \
- 	    do \
--		B=`basename $$i`; \
--		E=`echo $$i | awk -F. '{print $$NF}'`; \
-+		B=`basename $$i|sed s/\\\\.n/.7/`; \
-+		E=`echo $$i | awk -F. '{print $$NF}' | sed s/n/7/`; \
-+		case $$B in \
-+			funds9.7) \
-+				B=funds9.1; \
-+				E=1;; \
-+		esac; \
- 		M="$(MAN_INSTALL_DIR)/man$$E"; \
- 		if [ ! -d $$M ] ; then \
- 		    echo "Making directory $$M"; \
-@@ -479,6 +484,9 @@
- 		fi; \
- 		echo "Installing $$B" ; \
- 		$(INSTALL_DATA) $$i $$M/$$B; \
-+		sed -i "s/\([ \"\']\)\(-[A-Za-z0-9]\)/\1\\\\\2/g" $$M/$$B ; \
-+		sed -i "s/^\\\&\\\fB\(.*\):\(.*\)\\\fR/\1 \- \2/g" $$M/$$B ;\
-+		sed -i "s/funtools(n)/funtools(7)/g" $$M/$$B ; \
- 	    done;)
- 
- install-share:
diff --git a/debian/patches/link_to_so.patch b/debian/patches/link_to_so.patch
index bea9cda..85a47e4 100644
--- a/debian/patches/link_to_so.patch
+++ b/debian/patches/link_to_so.patch
@@ -21,6 +21,15 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
  		rm -rf $(PACKAGE)tmp;)
  
  mainlib:	$(MAINLIBOBJS) funmainlib.o lex.calc.o
+@@ -462,7 +462,7 @@
+ install-man:
+ 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
+ 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
+-	    mkdir $(MAN_INSTALL_DIR); \
++	    mkdir -p $(MAN_INSTALL_DIR); \
+ 	    chmod 755 $(MAN_INSTALL_DIR); \
+ 	    else true; \
+ 	fi;
 --- a/mklib
 +++ b/mklib
 @@ -34,7 +34,6 @@
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
index 5fa98b8..2074117 100644
--- a/debian/patches/multiarch.patch
+++ b/debian/patches/multiarch.patch
@@ -31,12 +31,3 @@ Description: Copy files to the correct destinations according to multiarch.
  
  # util files are in the util subdirectory
  UTIL_INC =		-I./util
-@@ -474,7 +474,7 @@
- install-man:
- 	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
- 	    echo "Making directory $(MAN_INSTALL_DIR)"; \
--	    mkdir $(MAN_INSTALL_DIR); \
-+	    mkdir -p $(MAN_INSTALL_DIR); \
- 	    chmod 755 $(MAN_INSTALL_DIR); \
- 	    else true; \
- 	fi;
diff --git a/debian/patches/series b/debian/patches/series
index 32d3e91..ef62806 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix_manpages.patch
 link_to_so.patch
 use_shared_libwcstools.patch
 build_tclfun.patch

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