MAKE DEB: Reworked man file installation.

git-svn-id: trunk@30662 -

.gitattributes

@@ -2669,6 +2669,7 @@ debian/lazarus-ide-gtk2.postinst.in svneol=native#text/plain
 debian/lazarus-ide-gtk2.prerm.in svneol=native#text/plain
 debian/lazarus-ide.install.in svneol=native#text/plain
 debian/lazarus-ide.links.in svneol=native#text/plain
+debian/lazarus-ide.manpages.in svneol=native#text/plain
 debian/lazarus-ide.menu.in svneol=native#text/plain
 debian/lazarus-ide.postinst.in svneol=native#text/plain
 debian/lazarus-ide.prerm.in svneol=native#text/plain
@@ -2680,6 +2681,7 @@ debian/lcl-units.install.in svneol=native#text/plain
 debian/lcl-utils.config.in svneol=native#text/plain
 debian/lcl-utils.install.in svneol=native#text/plain
 debian/lcl-utils.links.in svneol=native#text/plain
+debian/lcl-utils.manpages.in svneol=native#text/plain
 debian/lcl-utils.postinst.in svneol=native#text/plain
 debian/lcl-utils.prerm.in svneol=native#text/plain
 debian/lcl-utils.templates.in svneol=native#text/plain

debian/lazarus-ide.install.in

@@ -5,6 +5,4 @@
 /usr/lib/lazarus/${VERSION}/languages
 /usr/lib/lazarus/${VERSION}/startlazarus
 /usr/share/applications
-/usr/share/man/man1/lazarus-ide-${VERSION}.1
-/usr/share/man/man1/startlazarus-${VERSION}.1
 /usr/share/pixmaps

debian/lazarus-ide.manpages.in

@@ -0,0 +1,2 @@
+debian/tmp/usr/man/man1/lazarus-ide-${VERSION}.1
+debian/tmp/usr/man/man1/startlazarus-${VERSION}.1

debian/lcl-utils.install.in

@@ -1,8 +1,3 @@
 /etc/lazarus-${VERSION}
 /usr/lib/lazarus/${VERSION}/lazbuild
 /usr/lib/lazarus/${VERSION}/tools
-/usr/share/man/man1/lazbuild-${VERSION}.1
-/usr/share/man/man1/lazres-${VERSION}.1
-/usr/share/man/man1/lrstolfm-${VERSION}.1
-/usr/share/man/man1/svn2revisioninc-${VERSION}.1
-/usr/share/man/man1/updatepofiles-${VERSION}.1

debian/lcl-utils.manpages.in

@@ -0,0 +1,5 @@
+debian/tmp/usr/man/man1/lazbuild-${VERSION}.1
+debian/tmp/usr/man/man1/lazres-${VERSION}.1
+debian/tmp/usr/man/man1/lrstolfm-${VERSION}.1
+debian/tmp/usr/man/man1/svn2revisioninc-${VERSION}.1
+debian/tmp/usr/man/man1/updatepofiles-${VERSION}.1

debian/rules

@@ -27,6 +27,7 @@ FPCTARGET=$(CPU_TARGET)-linux
 DEB_VERSION:=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_UPSTREAM_VERSION:=$(shell echo $(DEB_VERSION) | cut -f 1 -d -)
 DEB_UPSTREAM_MAIN_VERSION:=$(shell echo ${DEB_UPSTREAM_VERSION} | sed -e 's/^\([0-9\.]*\).*/\1/')
+DEB_BUILD=$(lastword $(subst -, ,${DEB_VERSION}))
 ifndef PACKAGESUFFIX
 export PACKAGESUFFIX=-${DEB_UPSTREAM_MAIN_VERSION}
 endif
@@ -167,9 +168,6 @@ install-arch-stamp:
 	${MKDIR} $(INSTALL_DIR)/usr/share/applications
 	convert -geometry 32x32 $(CURDIR)/images/ide_icon48x48.png $(INSTALL_DIR)/usr/share/pixmaps/lazarus-${DEB_UPSTREAM_MAIN_VERSION}.xpm
 	sed -e 's/Lazarus.*/& (${DEB_UPSTREAM_MAIN_VERSION})/' -e 's/Exec=startlazarus/&-${DEB_UPSTREAM_MAIN_VERSION}/' $(CURDIR)/install/lazarus.desktop > $(INSTALL_DIR)/usr/share/applications/lazarus-${DEB_UPSTREAM_MAIN_VERSION}.desktop
-	# Install man pages
-	$(MAKE) -C install/man installman $(INSTALLOPTS) INSTALL_PREFIX=$(INSTALL_DIR)/usr/share
-	for s in 1 2 3 4 5 6 7 8 9 ; do test -d ${INSTALL_DIR}/usr/share/man/man$${s} && for f in ${INSTALL_DIR}/usr/share/man/man$${s}/*.? ; do n=`basename $${f}` ; ${MV} $${f} `dirname $${f}`/$${n%%.*}-${DEB_UPSTREAM_MAIN_VERSION}."$${n#*.}" ; done ; done || true
 	# Install configuration files
 	${MKDIR} $(INSTALL_DIR)/etc/lazarus-${DEB_UPSTREAM_MAIN_VERSION}
 	fpcsubst -d LazarusVersion=${DEB_UPSTREAM_MAIN_VERSION} -i ${CURDIR}/tools/install/linux/environmentoptions.xml -o $(INSTALL_DIR)/etc/lazarus-${DEB_UPSTREAM_MAIN_VERSION}/environmentoptions.xml
@@ -188,10 +186,20 @@ install-arch-stamp:
 	    sed -e "s/$${PACKAGE}/&${PACKAGESUFFIX}/g" $${PACKAGE} > ../$${PACKAGE}${PACKAGESUFFIX}/usr/share/lintian/overrides/$${PACKAGE}${PACKAGESUFFIX} ; \
 	  fi ; \
 	done
+ifeq (${DEB_BUILD},0)
+	# We are building upstream debs, install override files for build = 0
+	set -x -e ; cd debian ; for PACKAGE in `sed -n -e 's/Package: \(.*\)/\1/p' control` ; do \
+	  if [ -d $${PACKAGE} ] ; \
+	  then \
+	    ${MKDIR} $${PACKAGE}/usr/share/lintian/overrides ; \
+	    echo "$${PACKAGE}: debian-revision-should-not-be-zero" >> $${PACKAGE}/usr/share/lintian/overrides/$${PACKAGE} ; \
+	  fi ; \
+	done
+endif
 	find ${INSTALL_DIR} -empty -delete
 	touch install-arch-stamp
 
-arrange-arch: install-arch arrange-arch-stamp
+arrange-arch: install-arch arrange-arch-stamp install-man
 arrange-arch-stamp:
 	dh_testdir
 	dh_testroot
@@ -202,6 +210,15 @@ build-indep: patch
 install-indep:
 	touch install-indep-stamp
 
+install-man: install-man-stamp
+install-man-stamp:
+	# Install man pages
+	$(MAKE) -C install/man installman $(INSTALLOPTS)
+	for s in ${INSTALL_DIR}/usr/man/man[1-9] ; do cd $${s} && for f in *.[1-9] ; do ${MV} $${f} $${f%%.*}-${DEB_UPSTREAM_MAIN_VERSION}."$${f#*.}" ; done ; done || true
+	dh_installman -s
+	${RM} ${INSTALL_DIR}/usr/man
+	touch install-man-stamp
+
 ###################
 # Documentation
 #
@@ -285,6 +302,16 @@ binary-indep: clean-patched build-doc install-doc install-source debian-files
 	    sed -e "s/$${PACKAGE}/&${PACKAGESUFFIX}/g" $${PACKAGE} > ../$${PACKAGE}${PACKAGESUFFIX}/usr/share/lintian/overrides/$${PACKAGE}${PACKAGESUFFIX} ; \
 	  fi ; \
 	done
+ifeq (${DEB_BUILD},0)
+	# We are building upstream debs, install override files for build = 0
+	set -x -e ; cd debian ; for PACKAGE in `sed -n -e 's/Package: \(.*\)/\1/p' control` ; do \
+	  if [ -d $${PACKAGE} ] ; \
+	  then \
+	    ${MKDIR} $${PACKAGE}/usr/share/lintian/overrides ; \
+	    echo "$${PACKAGE}: debian-revision-should-not-be-zero" >> $${PACKAGE}/usr/share/lintian/overrides/$${PACKAGE} ; \
+	  fi ; \
+	done
+endif
 	dh_compress -i -X.pdf
 	dh_fixperms -i
 	dh_installdebconf -i
@@ -303,7 +330,6 @@ binary-arch: arrange-arch
 	dh_installexamples -a
 	dh_installmenu
 	fpc-depends
-	dh_installman -s
 	dh_strip -s
 	dh_compress -a
 	dh_fixperms -a