[Pkg-erlang-commits] r1213 - erlang/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-03-09 11:09:58 +0000 (Tue, 09 Mar 2010)
New Revision: 1213

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/rules
Log:
[erlang]
  * Manpages in section 1 are needed even if only arch-dependent packages are
    built. So, reenabled them.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2010-03-09 03:47:37 UTC (rev 1212)
+++ erlang/trunk/debian/changelog	2010-03-09 11:09:58 UTC (rev 1213)
@@ -1,8 +1,9 @@
-erlang (1:13.b.4-dfsg-3) UNRELEASED; urgency=low
+erlang (1:13.b.4-dfsg-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Manpages in section 1 are needed even if only arch-dependent packages are
+    built. So, reenabled them.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 09 Mar 2010 00:42:32 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 09 Mar 2010 14:09:11 +0300
 
 erlang (1:13.b.4-dfsg-2) unstable; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2010-03-09 03:47:37 UTC (rev 1212)
+++ erlang/trunk/debian/control	2010-03-09 11:09:58 UTC (rev 1213)
@@ -6,12 +6,12 @@
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
  libncurses5-dev, quilt, autotools-dev, unixodbc-dev, bison, flex,
- libwxgtk2.8-dev, dctrl-tools,
+ libwxgtk2.8-dev, dctrl-tools, xsltproc,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libsctp-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !solaris-i386],
  kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
  default-jdk
-Build-Depends-Indep: xsltproc, fop
+Build-Depends-Indep: fop
 Build-Conflicts: autoconf2.13, libwxgtk2.4-dev, libwxgtk2.6-dev
 Homepage: http://www.erlang.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-erlang/erlang/trunk/

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2010-03-09 03:47:37 UTC (rev 1212)
+++ erlang/trunk/debian/rules	2010-03-09 11:09:58 UTC (rev 1213)
@@ -7,6 +7,7 @@
 export QUILT_PATCHES := debian/patches
 
 ROOT_DIR=$(shell pwd)
+MAN_DIR = $(ROOT_DIR)/debian/erlang-docs/usr/lib/erlang/man
 
 export HOME := $(ROOT_DIR)/debian
 
@@ -290,6 +291,26 @@
 	 rm -v install.sh priv/run_test.in)
 endef
 
+# manpages builds section 1 manual pages
+manpages: manpages-stamp
+manpages-stamp: $(INSTALL_RULE)
+	dh_testdir
+	target=$$(basename $$(find make -type d |grep /)) ; \
+	PATH=$(ROOT_DIR)/bin:$$PATH ; \
+	for m in lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
+	    make -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
+	done
+	#
+	install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
+	install lib/dialyzer/doc/man3/*.3 $(MAN_DIR)/man3 ; \
+	for m in lib/erl_interface lib/common_test lib/webtool erts ; do \
+	    install $$m/doc/man1/*.1 $(MAN_DIR)/man1 ; \
+	done
+	#
+	sh debian/scripts/fixmanpages $(MAN_DIR)
+	#
+	touch manpages-stamp
+
 # CC_R_FLAG and LD_R_FLAG are empty because Debian doesn't recommend
 # RPATH definition in binaries
 # CC_R_OPT is used in percept
@@ -319,7 +340,7 @@
 	PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) docs
 	$(MAKE) DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
 	#
-	sh debian/scripts/fixmanpages $(ROOT_DIR)/debian/erlang-docs/usr/lib/erlang/man
+	sh debian/scripts/fixmanpages $(MAN_DIR)
 	#
 	(cd $(ROOT_DIR)/debian/erlang-docs/usr/lib/erlang/lib ; \
 	 perl $(ROOT_DIR)/debian/scripts/genindex >index.html ; \
@@ -341,7 +362,7 @@
 	touch install-stnd-stamp
 
 build: build-arch build-indep
-build-arch: build-stamp
+build-arch: build-stamp manpages-stamp
 build-indep: build-stamp
 build-stamp: $(INSTALL_RULE)
 	dh_testdir
@@ -506,6 +527,6 @@
 
 .PHONY: patch unpatch clean-patched clean automake install build build-arch build-indep
 .PHONY: binary binary-arch binary-indep get-orig-source
-.PHONY: configure-stnd build-stnd install-stnd docs
+.PHONY: configure-stnd build-stnd install-stnd docs manpages
 .PHONY: configure-hipe build-hipe install-hipe
 .PHONY: binary-erlang-base binary-erlang-base-hipe