[Pkg-erlang-commits] r1147 - in erlang/trunk/debian: . lintian patches patterns
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Dec 19 16:35:07 UTC 2009
Author: sgolovan
Date: 2009-12-19 16:35:07 +0000 (Sat, 19 Dec 2009)
New Revision: 1147
Added:
erlang/trunk/debian/docb_gen
erlang/trunk/debian/erlang-manpages.manpages
erlang/trunk/debian/erlang-manpages.postinst
erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-override
erlang/trunk/debian/patches/docs.patch
erlang/trunk/debian/patterns/erlang-erl-docgen.patterns
erlang/trunk/debian/typer.1
Removed:
erlang/trunk/debian/manpages/
Modified:
erlang/trunk/debian/analyse.sh
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/erlang-base-hipe.manpages
erlang/trunk/debian/erlang-base.manpages
erlang/trunk/debian/erlang-common-test.manpages
erlang/trunk/debian/erlang-dialyzer.manpages
erlang/trunk/debian/erlang-typer.manpages
erlang/trunk/debian/erlang-webtool.manpages
erlang/trunk/debian/patches/build-options.patch
erlang/trunk/debian/patches/clean.patch
erlang/trunk/debian/patches/man.patch
erlang/trunk/debian/patches/native.patch
erlang/trunk/debian/patches/series
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release adds a new binary package erlang-erl-docgen.
* Moved from prebuilt manpages to generated from sources. This adds
erlang-manpages binary package and xsltproc build dependency.
Modified: erlang/trunk/debian/analyse.sh
===================================================================
--- erlang/trunk/debian/analyse.sh 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/analyse.sh 2009-12-19 16:35:07 UTC (rev 1147)
@@ -56,9 +56,10 @@
cut -c 20- >> debian/erlang-dev.install
PACKAGES='appmon asn1 common-test corba crypto debugger dialyzer docbuilder
- edoc et eunit gs ic inets inviso megaco mnesia observer odbc os-mon
- parsetools percept pman public-key reltool runtime-tools snmp ssh
- ssl syntax-tools test-server toolbar tools tv typer webtool wx xmerl'
+ edoc erl-docgen et eunit gs ic inets inviso megaco mnesia observer
+ odbc os-mon parsetools percept pman public-key reltool runtime-tools
+ snmp ssh ssl syntax-tools test-server toolbar tools tv typer webtool
+ wx xmerl'
CMD='grep -v -E -e ./usr/lib/erlang/usr/include |
grep -v -E -f debian/patterns/erlang-base.patterns |
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/changelog 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1,12 +1,13 @@
erlang (1:13.b.3-dfsg-1) unstable; urgency=low
- * New upstream release.
+ * New upstream release (it adds a new binary package erlang-erl-docgen).
* Refreshed patches, removed most of emacs.patch which is applied upstream.
* Linked run_test binary from erlang-common-test package to /usr/bin.
- * Refreshed manpages and added run_test manpage.
* Fixed VCS headers in debian/control.
+ * Moved from prebuilt manpages to generated from sources. This adds
+ erlang-manpages binary package and xsltproc build dependency.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 27 Nov 2009 20:51:29 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 19 Dec 2009 19:32:51 +0300
erlang (1:13.b.2.1-dfsg-1) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/control 2009-12-19 16:35:07 UTC (rev 1147)
@@ -6,7 +6,7 @@
Standards-Version: 3.8.3
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]
@@ -180,6 +180,17 @@
the conventions of the Erlang world.
+Package: erlang-erl-docgen
+Architecture: all
+Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: xsltproc, fop, erlang, erlang-manpages, erlang-doc-html
+Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc-html (<< ${source:Upstream-Version}), erlang-doc-html (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
+Description: Erlang/OTP documentation stylesheets
+ The erl_docgen package includes XSLT stylesheets and document type
+ definitions used for Erlang/OTP documentation. They allow to
+ transform documentation to manpage, HTML, and PDF formats.
+
+
Package: erlang-et
Architecture: any
Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -245,6 +256,16 @@
Erlang nodes, using a control component also started with inviso API
functions.
+Package: erlang-manpages
+Architecture: all
+Suggests: erlang
+Description: Erlang/OTP manual pages
+ Documentation for the Erlang programming language in `man' format. This
+ documentation can be read using the command `erl -man mod', where `mod'
+ is the name of the module you want documentation on.
+ .
+ This package contains all Erlang/OTP manual pages from sections other
+ than 1. They document Erlang/OTP modules, config files and applications.
Package: erlang-megaco
Architecture: any
@@ -587,7 +608,7 @@
Architecture: all
Depends: ${erlang-base}, erlang-dev, erlang-appmon, erlang-asn1,
erlang-common-test, erlang-corba, erlang-crypto, erlang-debugger,
- erlang-dialyzer, erlang-docbuilder, erlang-edoc, erlang-et,
+ erlang-dialyzer, erlang-docbuilder, erlang-edoc, erlang-erl-docgen, erlang-et,
erlang-eunit, erlang-gs, erlang-ic, erlang-inets, erlang-inviso,
erlang-megaco, erlang-mnesia, erlang-observer, erlang-odbc, erlang-os-mon,
erlang-parsetools, erlang-percept, erlang-pman, erlang-public-key,
Added: erlang/trunk/debian/docb_gen
===================================================================
--- erlang/trunk/debian/docb_gen (rev 0)
+++ erlang/trunk/debian/docb_gen 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1,34 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main(Args) ->
+ {Func, File, Opts} = parse_args(Args),
+ case docb_gen:Func(File, Opts) of
+ ok ->
+ ok;
+ {error, Reason} ->
+ io:format("~p~n", [Reason]),
+ halt(1)
+ end.
+
+parse_args(Args) ->
+ parse_args(Args, module, "", [], [], false, true).
+
+parse_args([], Func, File, Defs, Includes, Preprocess, Sort) ->
+ {Func, File, [{def, lists:reverse(Defs)},
+ {includes, lists:reverse(Includes)},
+ {preprocess, Preprocess},
+ {sort_functions, Sort}]};
+parse_args(["-chapter" | Tail], _Func, File, Defs, Includes, Preprocess, Sort) ->
+ parse_args(Tail, users_guide, File, Defs, Includes, Preprocess, Sort);
+parse_args(["-def", Name, Value | Tail], Func, File, Defs, Includes, Preprocess, Sort) ->
+ parse_args(Tail, Func, File, [{list_to_atom(Name), Value} | Defs], Includes, Preprocess, Sort);
+parse_args(["-includes", Dir | Tail], Func, File, Defs, Includes, Preprocess, Sort) ->
+ parse_args(Tail, Func, File, Defs, [Dir | Includes], Preprocess, Sort);
+parse_args(["-preprocess", P | Tail], Func, File, Defs, Includes, _Preprocess, Sort) ->
+ parse_args(Tail, Func, File, Defs, Includes, list_to_atom(P), Sort);
+parse_args(["-sort_functions", S | Tail], Func, File, Defs, Includes, Preprocess, _Sort) ->
+ parse_args(Tail, Func, File, Defs, Includes, Preprocess, list_to_atom(S));
+parse_args([F | Tail], Func, _File, Defs, Includes, Preprocess, Sort) ->
+ parse_args(Tail, Func, F, Defs, Includes, Preprocess, Sort).
+
Property changes on: erlang/trunk/debian/docb_gen
___________________________________________________________________
Added: svn:executable
+ *
Modified: erlang/trunk/debian/erlang-base-hipe.manpages
===================================================================
--- erlang/trunk/debian/erlang-base-hipe.manpages 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/erlang-base-hipe.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1,7 +1,7 @@
-debian/manpages/epmd.1
-debian/manpages/erl_call.1
-debian/manpages/erlc.1
-debian/manpages/erl.1
-debian/manpages/escript.1
-debian/manpages/run_erl.1
-debian/manpages/start_embedded.1
+debian/tmp/usr/share/man/man1/epmd.1
+debian/tmp/usr/share/man/man1/erl_call.1
+debian/tmp/usr/share/man/man1/erlc.1
+debian/tmp/usr/share/man/man1/erl.1
+debian/tmp/usr/share/man/man1/escript.1
+debian/tmp/usr/share/man/man1/run_erl.1
+debian/tmp/usr/share/man/man1/start_embedded.1
Modified: erlang/trunk/debian/erlang-base.manpages
===================================================================
--- erlang/trunk/debian/erlang-base.manpages 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/erlang-base.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1,7 +1,7 @@
-debian/manpages/epmd.1
-debian/manpages/erl_call.1
-debian/manpages/erlc.1
-debian/manpages/erl.1
-debian/manpages/escript.1
-debian/manpages/run_erl.1
-debian/manpages/start_embedded.1
+debian/tmp/usr/share/man/man1/epmd.1
+debian/tmp/usr/share/man/man1/erl_call.1
+debian/tmp/usr/share/man/man1/erlc.1
+debian/tmp/usr/share/man/man1/erl.1
+debian/tmp/usr/share/man/man1/escript.1
+debian/tmp/usr/share/man/man1/run_erl.1
+debian/tmp/usr/share/man/man1/start_embedded.1
Modified: erlang/trunk/debian/erlang-common-test.manpages
===================================================================
--- erlang/trunk/debian/erlang-common-test.manpages 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/erlang-common-test.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1 +1 @@
-debian/manpages/run_test.1
+debian/tmp/usr/share/man/man1/run_test.1
Modified: erlang/trunk/debian/erlang-dialyzer.manpages
===================================================================
--- erlang/trunk/debian/erlang-dialyzer.manpages 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/erlang-dialyzer.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1 +1 @@
-debian/manpages/dialyzer.1
+debian/tmp/usr/share/man/man1/dialyzer.1
Added: erlang/trunk/debian/erlang-manpages.manpages
===================================================================
--- erlang/trunk/debian/erlang-manpages.manpages (rev 0)
+++ erlang/trunk/debian/erlang-manpages.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man3/*
+debian/tmp/usr/share/man/man4/*
+debian/tmp/usr/share/man/man6/*
Added: erlang/trunk/debian/erlang-manpages.postinst
===================================================================
--- erlang/trunk/debian/erlang-manpages.postinst (rev 0)
+++ erlang/trunk/debian/erlang-manpages.postinst 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1,25 @@
+#! /bin/sh
+# postinst script for erlang-manpages
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "1:12.b.1" ; then
+ for name in dialyzer \
+ epmd \
+ erl \
+ erl_call \
+ erlc \
+ escript \
+ run_erl \
+ start \
+ start_webtool ; do
+ dpkg-divert --package erlang-manpages --remove --rename \
+ --divert /usr/share/man/man1/$name.erlang.1.gz \
+ /usr/share/man/man1/$name.1.gz >/dev/null
+ done
+fi
+
+#DEBHELPER#
+
Modified: erlang/trunk/debian/erlang-typer.manpages
===================================================================
--- erlang/trunk/debian/erlang-typer.manpages 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/erlang-typer.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1 +1 @@
-debian/manpages/typer.1
+debian/typer.1
Modified: erlang/trunk/debian/erlang-webtool.manpages
===================================================================
--- erlang/trunk/debian/erlang-webtool.manpages 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/erlang-webtool.manpages 2009-12-19 16:35:07 UTC (rev 1147)
@@ -1 +1 @@
-debian/manpages/start_webtool.1
+debian/tmp/usr/share/man/man1/start_webtool.1
Added: erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-override
===================================================================
--- erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-override (rev 0)
+++ erlang/trunk/debian/lintian/erlang-erl-docgen.lintian-override 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1 @@
+erlang-erl-docgen: image-file-in-usr-lib
Modified: erlang/trunk/debian/patches/build-options.patch
===================================================================
--- erlang/trunk/debian/patches/build-options.patch 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/patches/build-options.patch 2009-12-19 16:35:07 UTC (rev 1147)
@@ -7,8 +7,8 @@
Also, add debug info to VM binaries if DEB_BUILD_OPTIONS contains "debug".
---- erlang-13.b.1-dfsg.orig/Makefile.in
-+++ erlang-13.b.1-dfsg/erts/Makefile.in
+--- erlang-13.b.3-dfsg.orig/Makefile.in
++++ erlang-13.b.3-dfsg/Makefile.in
@@ -16,6 +16,9 @@
#
# %CopyrightEnd%
@@ -19,8 +19,8 @@
# Toplevel makefile for building the Erlang system
#
---- erlang-13.b.1-dfsg.orig/erts/etc/common/Makefile.in
-+++ erlang-13.b.1-dfsg/erts/etc/common/Makefile.in
+--- erlang-13.b.3-dfsg.orig/erts/etc/common/Makefile.in
++++ erlang-13.b.3-dfsg/erts/etc/common/Makefile.in
@@ -494,13 +494,13 @@
Install: ../unix/Install.src ../../vsn.mk $(TARGET)/Makefile
@@ -37,29 +37,29 @@
-e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
-e 's;%VSN%;$(VSN);' \
../unix/erl.src.src > erl.src
---- erlang-13.b.1-dfsg.orig/erts/emulator/Makefile.in
-+++ erlang-13.b.1-dfsg/erts/emulator/Makefile.in
-@@ -256,7 +256,7 @@
- else
+--- erlang-13.b.3-dfsg.orig/erts/emulator/Makefile.in
++++ erlang-13.b.3-dfsg/erts/emulator/Makefile.in
+@@ -258,7 +258,7 @@
CS_CFLAGS = $(CS_CFLAGS_)
endif
+ CS_LDFLAGS = $(LDFLAGS)
-CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal @ERTS_INTERNAL_X_LIBS@
+CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal$(TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
LIBS += @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@
-@@ -275,7 +275,7 @@
- DEPLIBS = \
- $(ERL_TOP)/erts/emulator/zlib/obj/$(TARGET)/$(TYPE)/libz.a \
+@@ -284,7 +284,7 @@
+ LIBS += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a
+ DEPLIBS += \
$(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a \
- $(ERL_TOP)/erts/lib/internal/$(TARGET)/liberts_internal.a
+ $(ERL_TOP)/erts/lib/internal/$(TARGET)/liberts_internal$(TYPEMARKER).a
# rem liberts_internal.a
endif
---- erlang-13.b.1-dfsg.orig/make/otp.mk.in
-+++ erlang-13.b.1-dfsg/make/otp.mk.in
-@@ -54,19 +54,18 @@
+--- erlang-13.b.3-dfsg.orig/make/otp.mk.in
++++ erlang-13.b.3-dfsg/make/otp.mk.in
+@@ -71,18 +71,17 @@
# Erlang language section
# ----------------------------------------------------
EMULATOR = beam
@@ -72,21 +72,17 @@
else
- ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750)
- ERL_COMPILE_FLAGS += +compressed
-- else
-- ifdef BOOTSTRAP
-- ERL_COMPILE_FLAGS += +slim
-- else
-- ERL_COMPILE_FLAGS += +debug_info
-- endif
+ ERL_COMPILE_FLAGS += +compressed
+ ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
+ ERL_COMPILE_FLAGS += +debug_info
-+ else
+ else
+- ifdef BOOTSTRAP
+- ERL_COMPILE_FLAGS += +slim
+- else
+ ifeq ($(findstring nostrip,$(DEB_BUILD_OPTIONS)),nostrip)
-+ ERL_COMPILE_FLAGS += +debug_info
+ ERL_COMPILE_FLAGS += +debug_info
+ else
+ ERL_COMPILE_FLAGS += +slim
-+ endif
+ endif
endif
endif
- ERLC_WFLAGS = -W
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/patches/clean.patch 2009-12-19 16:35:07 UTC (rev 1147)
@@ -13,7 +13,7 @@
#
# Just wipe out emulator, not libraries
-@@ -811,3 +812,166 @@
+@@ -811,3 +812,171 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
@@ -97,6 +97,8 @@
+ rm -rf $(ERL_TOP)/lib/erl_interface/obj.mt/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/erl_interface/obj.st/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/erl_interface/src/$(TARGET)
++ rm -rf $(ERL_TOP)/lib/eunit/doc/src/eunit_surefire.xml
++ rm -rf $(ERL_TOP)/lib/eunit/doc/src/eunit.xml
+ rm -rf $(ERL_TOP)/lib/gs/config.log
+ rm -rf $(ERL_TOP)/lib/gs/config.status
+ rm -rf $(ERL_TOP)/lib/gs/tcl/$(TARGET)
@@ -111,6 +113,7 @@
+ rm -rf $(ERL_TOP)/lib/kernel/ebin/*.beam
+ rm -rf $(ERL_TOP)/lib/kernel/ebin/*.app
+ rm -rf $(ERL_TOP)/lib/kernel/ebin/*.appup
++ rm -rf $(ERL_TOP)/lib/kernel/src/inet_dns_record_adts.hrl
+ rm -rf $(ERL_TOP)/lib/megaco/config.log
+ rm -rf $(ERL_TOP)/lib/megaco/config.status
+ rm -rf $(ERL_TOP)/lib/megaco/priv/lib/$(TARGET)
@@ -140,6 +143,7 @@
+ rm -rf $(ERL_TOP)/lib/orber/src/PKIX1Implicit88.asn1db
+ rm -rf $(ERL_TOP)/lib/orber/src/PKIXAttributeCertificate.asn1db
+ rm -rf $(ERL_TOP)/lib/os_mon/c_src/$(TARGET)
++ rm -rf $(ERL_TOP)/lib/os_mon/doc/man6/os_mon.6
+ rm -rf $(ERL_TOP)/lib/os_mon/priv/bin/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/os_mon/priv/obj/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/otp_mibs/ebin/otp_mib.beam
@@ -153,6 +157,7 @@
+ rm -rf $(ERL_TOP)/lib/snmp/config.status
+ rm -rf $(ERL_TOP)/lib/snmp/mibs/Makefile
+ rm -rf $(ERL_TOP)/lib/ssl/c_src/$(TARGET)
++ rm -rf $(ERL_TOP)/lib/ssl/doc/man6/ssl.6
+ rm -rf $(ERL_TOP)/lib/ssl/examples/certs/$(TARGET)
+ rm -rf $(ERL_TOP)/lib/ssl/pkix/OTP-PKIX.asn1db
+ rm -rf $(ERL_TOP)/lib/ssl/priv/bin/$(TARGET)
Added: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch (rev 0)
+++ erlang/trunk/debian/patches/docs.patch 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1,126 @@
+Patch by sergei Golovan fixes several bugs with . and ' at the
+beginning of a line in Erlang manpages. It simply escapes all dots
+and apostrophes by adding \& before them. Also, it fixes whatis entries
+for module and application definitions.
+
+--- erlang-13.b.3-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-13.b.3-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+@@ -192,7 +192,7 @@
+ <!-- Erlref -->
+ <xsl:template match="/erlref">
+ <xsl:text>.TH </xsl:text><xsl:value-of select="module"/><xsl:text> 3 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "Ericsson AB" "Erlang Module Definition" </xsl:text>
+- <xsl:text>.SH MODULE </xsl:text>
++ <xsl:text>.SH NAME </xsl:text>
+ <xsl:value-of select="module"/><xsl:text> \- </xsl:text><xsl:value-of select="modulesummary"/><xsl:text> </xsl:text>
+ <xsl:apply-templates/>
+ </xsl:template>
+@@ -225,7 +225,7 @@
+ <xsl:template match="/appref">
+ <xsl:text>.TH </xsl:text><xsl:value-of select="app"/><xsl:text> 6 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "Ericsson AB" "Erlang Application Definition" </xsl:text>
+ <xsl:text>.SH NAME </xsl:text>
+- <xsl:value-of select="file"/><xsl:text> \- </xsl:text><xsl:value-of select="filesummary"/><xsl:text> </xsl:text>
++ <xsl:value-of select="app"/><xsl:text> \- </xsl:text><xsl:value-of select="appsummary"/><xsl:text> </xsl:text>
+ <xsl:apply-templates/>
+ </xsl:template>
+
+@@ -268,7 +268,7 @@
+ <xsl:text> .TP</xsl:text>
+ <xsl:text> Types</xsl:text>
+ <xsl:apply-templates/>
+- <xsl:text> .RE</xsl:text>
++ <xsl:text> .RE </xsl:text>
+ </xsl:template>
+
+
+@@ -288,7 +288,7 @@
+ <xsl:template match="desc">
+ <xsl:text> .RS</xsl:text>
+ <xsl:apply-templates/>
+- <xsl:text> .RE</xsl:text>
++ <xsl:text> .RE </xsl:text>
+ </xsl:template>
+
+
+@@ -305,4 +305,60 @@
+ <xsl:value-of select="normalize-space()"/>
+ </xsl:template>
+
++ <!-- Authors -->
++ <xsl:template match="authors">
++ <xsl:text> .SH AUTHORS</xsl:text>
++ <xsl:apply-templates/>
++ </xsl:template>
++
++ <!-- Aname -->
++ <xsl:template match="authors/aname">
++ <xsl:text> .LP </xsl:text>
++ <xsl:apply-templates/>
++ </xsl:template>
++
++ <!-- Email -->
++ <xsl:template match="authors/email">
++ <xsl:text> .I <</xsl:text>
++ <xsl:apply-templates/>
++ <xsl:text>></xsl:text>
++ </xsl:template>
++
++ <!-- Replace ' by \&' ans . by \&. -->
++ <xsl:template match="text()">
++ <xsl:variable name="rep1">
++ <xsl:call-template name="replace-string">
++ <xsl:with-param name="text" select="." />
++ <xsl:with-param name="replace" select=""'"" />
++ <xsl:with-param name="with" select=""\&'"" />
++ </xsl:call-template>
++ </xsl:variable>
++ <xsl:call-template name="replace-string">
++ <xsl:with-param name="text" select="$rep1" />
++ <xsl:with-param name="replace" select=""."" />
++ <xsl:with-param name="with" select=""\&."" />
++ </xsl:call-template>
++ </xsl:template>
++
++ <!-- Template replace-string is borrowed at http://www.dpawson.co.uk/xsl/sect2/replace.html -->
++ <xsl:template name="replace-string">
++ <xsl:param name="text"/>
++ <xsl:param name="replace"/>
++ <xsl:param name="with"/>
++ <xsl:choose>
++ <xsl:when test="contains($text,$replace)">
++ <xsl:value-of select="substring-before($text,$replace)"/>
++ <xsl:value-of select="$with"/>
++ <xsl:call-template name="replace-string">
++ <xsl:with-param name="text" select="substring-after($text,$replace)"/>
++ <xsl:with-param name="replace" select="$replace"/>
++ <xsl:with-param name="with" select="$with"/>
++ </xsl:call-template>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:value-of select="$text"/>
++ </xsl:otherwise>
++ </xsl:choose>
++ </xsl:template>
++
+ </xsl:stylesheet>
+--- erlang-13.b.3-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-13.b.3-dfsg/lib/stdlib/doc/src/re.xml
+@@ -349,7 +349,7 @@
+ metacharacter should not match before it. Setting this without
+ <c>multiline</c> (at compile time) causes circumflex never to
+ match. This option affects only the behavior of the circumflex
+- metacharacter. It does not affect \A.</item>
++ metacharacter. It does not affect \\A.</item>
+
+ <tag><c>noteol</c></tag>
+
+@@ -358,8 +358,8 @@
+ match it nor (except in multiline mode) a newline immediately
+ before it. Setting this without <c>multiline</c> (at compile time)
+ causes dollar never to match. This option affects only the
+- behavior of the dollar metacharacter. It does not affect \Z or
+- \z.</item>
++ behavior of the dollar metacharacter. It does not affect \\Z or
++ \\z.</item>
+
+ <tag><c>{offset, int()}</c></tag>
+
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/patches/man.patch 2009-12-19 16:35:07 UTC (rev 1147)
@@ -15,7 +15,7 @@
+ /*
+ * Conform to erlang-manpages content.
+ */
-+ putenv(strsave("MANSECT=3erl:1:4:6"));
++ putenv(strsave("MANSECT=3erl:1:4:6:7"));
execvp("man", argv+i);
error("Could not execute the 'man' command.");
#endif
Modified: erlang/trunk/debian/patches/native.patch
===================================================================
--- erlang/trunk/debian/patches/native.patch 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/patches/native.patch 2009-12-19 16:35:07 UTC (rev 1147)
@@ -2,9 +2,9 @@
Adds native code to all Erlang binaries if HiPE is enabled.
---- erlang-13.b-dfsg.orig/make/otp.mk.in
-+++ erlang-13.b-dfsg/make/otp.mk.in
-@@ -66,6 +66,11 @@
+--- erlang-13.b.3-dfsg.orig/make/otp.mk.in
++++ erlang-13.b.3-dfsg/make/otp.mk.in
+@@ -83,6 +83,11 @@
ERL_COMPILE_FLAGS += +slim
else
ERL_COMPILE_FLAGS += +debug_info
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/patches/series 2009-12-19 16:35:07 UTC (rev 1147)
@@ -5,5 +5,6 @@
emacs.patch
ssl.patch
m68k.patch
+docs.patch
#native.patch
#build-options.patch
Added: erlang/trunk/debian/patterns/erlang-erl-docgen.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-erl-docgen.patterns (rev 0)
+++ erlang/trunk/debian/patterns/erlang-erl-docgen.patterns 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1 @@
+./usr/lib/erlang/lib/erl_docgen-.*/
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2009-12-13 13:21:59 UTC (rev 1146)
+++ erlang/trunk/debian/rules 2009-12-19 16:35:07 UTC (rev 1147)
@@ -7,6 +7,7 @@
export QUILT_PATCHES := debian/patches
ROOT_DIR=$(shell pwd)
+TMP_DIR=$(ROOT_DIR)/debian/tmp
export HOME := $(ROOT_DIR)/debian
@@ -99,6 +100,7 @@
rm -f lib/dialyzer/SKIP
# Remove installed erlang from debian/
+ rm -rf debian/tmp
rm -rf debian/erlang-stnd
rm -rf debian/erlang-hipe
@@ -306,6 +308,22 @@
${MAKE} TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)" CC_R_FLAG= LD_R_FLAG= CC_R_OPT=
touch build-stnd-stamp
+bin/docb_gen: debian/docb_gen
+ dh_testdir
+ install -D -m 755 $< $@
+
+manpages: manpages-stamp
+manpages-stamp: build-stnd-stamp bin/docb_gen
+ dh_testdir
+ pwd=$$(pwd) ; \
+ target=$$(basename $$(find make -type d |grep /)) ; \
+ PATH=$$pwd/bin:$$PATH ; \
+ for m in $$(find . -wholename '*/doc/src/Makefile') ; do \
+ (cd $$(dirname $$m) && make man ERL_TOP=$$pwd TARGET=$$target) || exit 1 ; \
+ done
+ touch manpages-stamp
+
+
install-hipe: install-hipe-stamp
install-hipe-stamp: INSTALL_DIR=$(shell pwd)/debian/erlang-hipe
install-hipe-stamp: build-hipe-stamp
@@ -315,9 +333,35 @@
install-stnd: install-stnd-stamp
install-stnd-stamp: INSTALL_DIR=$(shell pwd)/debian/erlang-stnd
-install-stnd-stamp: build-stnd-stamp
+install-stnd-stamp: build-stnd-stamp manpages-stamp
dh_testdir
$(do-install)
+ #
+ # Install manpages
+ install -d -m 755 $(TMP_DIR)/usr/share/man
+ for m in $$(find . -wholename '*/doc/man?') ; do \
+ cp -r $$m $(TMP_DIR)/usr/share/man || exit 1 ; \
+ done
+ cp $(TMP_DIR)/usr/share/man/man3/dialyzer.3 $(TMP_DIR)/usr/share/man/man1/dialyzer.1
+ mv $(TMP_DIR)/usr/share/man/man1/start.1 $(TMP_DIR)/usr/share/man/man1/start_embedded.1
+ #
+ # Fix manpages
+ for f in $$(find $(TMP_DIR)/usr/share/man -type f) ; do \
+ sed -i -e's/\(^\.TH .*\) 3 /\1 3erl /' \
+ -e's/\([[:alnum:]]\)(3)/\1(3erl)/g' \
+ $$f ; \
+ done
+ for f in $$(find $(TMP_DIR)/usr/share/man/man3 -type f) ; do \
+ mv $$f $${f}erl ; \
+ done
+ for f in $$(find $(TMP_DIR)/usr/share/man/man1 -type f) ; do \
+ sed -i -e's/, start_erl(1)//g' \
+ -e's/start(1)/start_embedded(1)/g' \
+ $$f ; \
+ done
+ sed -i -e's/^start \\-/start_embedded \\-/' \
+ -e's/^\.TH start 1/.TH start_embedded 1/' \
+ $(TMP_DIR)/usr/share/man/man1/start_embedded.1
touch install-stnd-stamp
# Very accurately place each installed file into the proper package
@@ -365,7 +409,7 @@
dh_installdirs -i
dh_install -i --sourcedir=$(TMPINSTALL_DIR)
#
- for pkg in examples ; do \
+ for pkg in erl-docgen examples ; do \
install -D -m 644 debian/lintian/erlang-$$pkg.lintian-override \
$(ROOT_DIR)/debian/erlang-$$pkg/usr/share/lintian/overrides/erlang-$$pkg ; \
done
@@ -383,8 +427,7 @@
dh_makeshlibs -i
dh_installdeb -i
echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang.substvars
- #echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang-nox.substvars
- #echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang-x11.substvars
+ echo 'erlang-base=erlang-base | erlang-base-hipe' >>debian/erlang-erl-docgen.substvars
echo 'erlang-base=erlang-base (>= $${binary:Version}) | erlang-base-hipe (>= $${binary:Version}), erlang-base (<< $${binary:Version}.0) | erlang-base-hipe (<< $${binary:Version}.0)' \
>>debian/erlang-src.substvars
echo 'erlang-base=erlang-base (>= $${binary:Version}) | erlang-base-hipe (>= $${binary:Version}), erlang-base (<< $${binary:Version}.0) | erlang-base-hipe (<< $${binary:Version}.0)' \
Copied: erlang/trunk/debian/typer.1 (from rev 1139, erlang/trunk/debian/manpages/typer.1)
===================================================================
--- erlang/trunk/debian/typer.1 (rev 0)
+++ erlang/trunk/debian/typer.1 2009-12-19 16:35:07 UTC (rev 1147)
@@ -0,0 +1,81 @@
+.TH typer 1 "typer 0.1.7.3" "Ericsson AB" "USER COMMANDS"
+.SH NAME
+typer \- The TypEr, a Type annotator of Erlang code
+.SH DESCRIPTION
+.LP
+TypEr is a tool that displays and automatically inserts type annotations
+in Erlang code. It uses Dialyzer to infer variable types.
+
+.SH USAGE
+.LP
+typer [--help] [--version] [--comments] [--plt PltFile]
+ [--show | --show-exported | --annotate | --annotate-inc-files]
+ [-Ddefine]* [-I include_dir]* [-T application]* [-r] file*
+.fi
+.LP
+Options:
+.RS 2
+.TP 4
+.B
+\fI-r dir\fR
+Searches directories recursively for .erl files below them.
+.TP 4
+.B
+\fI--show\fR
+Prints type specifications for all functions on stdout
+(this is the default behaviour; this option is not really needed).
+.TP 4
+.B
+\fI--show-exported\fR
+Same as --show, but prints specifications for exported functions only.
+Specs are displayed sorted alphabetically on the function's name.
+.TP 4
+.B
+\fI--annotate\fR
+Annotates the specified files with type specifications.
+.TP 4
+.B
+\fI--annotate-inc-files\fR
+Same as --annotate but annotates all -include() files as well as
+all .erl files (use this option with caution, it has not been tested much).
+.TP 4
+.B
+\fI--comments\fR
+Prints type information using Edoc comments, not type contracts.
+.TP 4
+.B
+\fI--plt PltFile\fR
+Uses the specified Dialyzer PLT file rather than the default one.
+.TP 4
+.B
+\fI-T file\fR
+The file \fIfile\fR already contains type specifications and these specifications
+are to be trusted in order to print specs for the rest of the files.
+(Multiple files or dirs, separated by spaces, can be specified.)
+.TP 4
+.B
+\fI-Dname\fR (or \fI-Dname=value\fR)
+Passes the defined name to TypEr.
+(The syntax of defines is the same as that used by \fIerlc\fR, see erlc(1).)
+.TP 4
+.B
+\fI-I include_dir\fR
+Passes the include_dir to TypEr.
+(The syntax of includes is the same as that used by \fIerlc\fR, see erlc(1).)
+.TP 4
+.B
+\fI--version\fR (or \fI-v\fR)
+Prints the TypEr version and exits.
+.TP 4
+.B
+\fI--help\fR (or \fI-h\fR)
+Prints help message and exits.
+.RE
+.SS Note:
+.LP
+* denotes that multiple occurrences of these options are possible\&.
+
+.SH SEE ALSO
+dialyzer(1), erlc(1)
+
+.RE
Property changes on: erlang/trunk/debian/typer.1
___________________________________________________________________
Added: svn:mergeinfo
+
More information about the Pkg-erlang-commits
mailing list