[Glibc-bsd-commits] r5912 - in trunk/freebsd-buildutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 15:37:46 +0000 (Sat, 05 Mar 2016)
New Revision: 5912

Added:
   trunk/freebsd-buildutils/debian/patches/man_symlinks.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
   trunk/freebsd-buildutils/debian/patches/series
Log:
Use relative path in manpage symlinks
(to fix #749327 in src:freebsd-libs)


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2016-03-05 05:41:26 UTC (rev 5911)
+++ trunk/freebsd-buildutils/debian/changelog	2016-03-05 15:37:46 UTC (rev 5912)
@@ -2,10 +2,12 @@
 
   * New upstream snapshot of 10.3-RC1
   * Mark freebsd-mk as Multi-Arch: foreign (thanks, Helmut Grohne!)
+  * Actually use the proper build architecture compiler
   * Map Debian's kfreebsd-armhf to FreeBSD's armv6 MACHINE_ARCH
-  * Actually use the proper build architecture compiler
   * Add *.test.mk files to freebsd-mk, allowing reverse-dependencies to
     use WITH_TESTS=yes
+  * Use relative path in manpage symlinks
+      - man_symlinks.diff
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 05 Mar 2016 00:27:01 +0000
 

Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2016-03-05 05:41:26 UTC (rev 5911)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2016-03-05 15:37:46 UTC (rev 5912)
@@ -121,28 +121,6 @@
  	    ${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
  	    ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
  	rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
-Index: freebsd-buildutils/src/share/mk/bsd.man.mk
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/bsd.man.mk
-+++ freebsd-buildutils/src/share/mk/bsd.man.mk
-@@ -216,7 +216,7 @@ _maninstall: ${MAN}
- 		t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
- 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
- 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
--		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
-+		${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- 	@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
-@@ -231,7 +231,7 @@ _maninstall: ${MAN}
- 		t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
- 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
- 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
--		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
-+		${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
- 	done
- .endif
- .endif
 Index: freebsd-buildutils/src/share/mk/bsd.own.mk
 ===================================================================
 --- freebsd-buildutils.orig/src/share/mk/bsd.own.mk

Added: trunk/freebsd-buildutils/debian/patches/man_symlinks.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/man_symlinks.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/man_symlinks.diff	2016-03-05 15:37:46 UTC (rev 5912)
@@ -0,0 +1,23 @@
+Subject: use relative path in manpage symlinks
+From: Steven Chamberlain <steven at pyro.eu.org>
+Date: Sat, 05 Mar 2016 15:31:00 +0000
+
+See https://bugs.debian.org/749327
+
+--- a/src/share/mk/bsd.man.mk
++++ b/src/share/mk/bsd.man.mk
+@@ -211,12 +211,12 @@
+ 			[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
+ 		esac; \
+ 		name=$$1; shift; sect=$$1; shift; \
+-		l=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
++		l=$$name; \
+ 		name=$$1; shift; sect=$$1; shift; \
+ 		t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
+ 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
+ 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
+-		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
++		${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
+ 	done
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+ 	@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2016-03-05 05:41:26 UTC (rev 5911)
+++ trunk/freebsd-buildutils/debian/patches/series	2016-03-05 15:37:46 UTC (rev 5912)
@@ -29,3 +29,4 @@
 makefiles.diff
 #test
 hppa.diff
+man_symlinks.diff