Merge lp:~statik/ubuntu/lucid/erlang/merge-erlang13b3 into lp:ubuntu/lucid/erlang

[Elliot Murphy]

[Elliot Murphy (statik)]

My first UDD merge!
I think I even maybe got it right. Very recently there was a new upstream release of Erlang, which was uploaded to debian in the last day or two.

I grabbed lp:ubuntu/lucid/erlang, and did bzr merge-package lp:debian/sid/erlang. This gave me three conflicts:
- debian/patches/build-options.patch
- debian/control
- debian/changelog

build-options.patch was an easy conflict to resolve, it looks like the diff was just regenerated and had different directory names in it.

debian/control was pretty simple, adding a build-dep on xsltproc for the manpages, I confirmed that this is already in main and kept Martin's change of dropping the build-depend on libwxgtk2.8-dev.

debian/changelog was the most complex, and that wasn't too hard. I put the new debian changelog entries in the right order relative to the ubuntu ones, and then added an entry saying i did the merge and re-iterating the remaining ubuntu changes.

Please let me know if there is anything that I could have done better.

[Martin Pitt (pitti)]

That merge looks fine, thanks!

I must say that I don't like the current UDD-style merging very much, though, it's _horribly_ expensive. I have to download the entire branch with all the history (which is huge), then additionally the orig.tar.gz, and for pushing the change I have to upload some 20 MB of branch data again (in addition to the normal upload).

review: Approve

=== modified file 'Makefile.in'
--- Makefile.in	2009-09-25 23:45:31 +0000
+++ Makefile.in	2009-12-22 03:23:51 +0000
@@ -231,7 +231,7 @@
 BEAM_EVM=$(ERL_TOP)/bin/$(TARGET)/beam_evm
 BOOTSTRAP_COMPILER  =  $(BOOTSTRAP_TOP)/primary_compiler
 
-.PHONY: emulator libs kernel stdlib compiler hipe dialyzer typer preloaded
+.PHONY: emulator libs kernel stdlib compiler hipe dialyzer typer syntax_tools preloaded
 
 emulator:
 	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) NO_START_SCRIPTS=true $(TYPE) FLAVOR=$(FLAVOR)
@@ -284,6 +284,11 @@
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
 	    $(MAKE) opt BUILD_ALL=true
 
+syntax_tools:
+	cd lib/syntax_tools && \
+	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
+	    $(MAKE) opt BUILD_ALL=true
+
 preloaded:
 	cd erts/preloaded/src && \
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
@@ -324,7 +329,7 @@
 	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
 
 $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc:  $(ERL_TOP)/bin/$(TARGET)/erlc
-	@rm -f 	$(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
+	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 	@cp $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 endif
@@ -347,6 +352,7 @@
 			cp $$x $$TF; \
 		true; \
 	done
+	rm -f lib/hipe/ebin/*.beam
 #	if test -f lib/hipe/ebin/hipe.beam ; then cp lib/hipe/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin; fi
 	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; fi
 	if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; fi
@@ -648,88 +654,21 @@
 # Build tests
 # ---------------------------------------------------------------------
 
-# Start with building the test server
-TESTS = test_server
-
-# Tests that can be run on any platform (keep alphabetic order, please)
-TESTS +=					\
-	asn1_test				\
-	common_test_test			\
-	compiler_test				\
-	emulator_test				\
-	epmd_test				\
-	erl_interface_test			\
-	ic_test					\
-	inets_test				\
-	inviso_test				\
-	jinterface_test				\
-	kernel_test				\
-	megaco_test				\
-	mnesia_test				\
-	observer_test                           \
-	orber_test				\
-	os_mon_test				\
-	otp_mibs_test				\
-	percept_test				\
-	pman_test				\
-	public_key_test                         \
-	reltool_test                            \
-	sasl_test				\
-	snmp_test				\
-	runtime_tools_test			\
-	stdlib_test				\
-	system_test				\
-	test_server_test			\
-	wx_test
-
-# Tests that can *not* be run on VxWorks
-ifneq ($(findstring vxworks,$(TARGET)),vxworks)
-TESTS +=					\
-	cosTransactions_test			\
-	cosEvent_test				\
-	cosTime_test				\
-	cosNotification_test			\
-	cosProperty_test			\
-	cosFileTransfer_test			\
-	cosEventDomain_test			\
-	crypto_test				\
-	debugger_test				\
-	edoc_test                               \
-	eunit_test				\
-	hipe_test				\
-	odbc_test				\
-	parsetools_test				\
-	public_key_test                         \
-	ssl_test				\
-	ssh_test				\
-	syntax_tools_test			\
-	tools_test				\
-	toolbar_test				\
-	xmerl_test
-endif
-
-.PHONY: tests release_tests test_server emulator_test system_test epmd_test
-
-tests release_tests: $(TESTS)
-
-# Build the test_server
-test_server:
-	cd lib/test_server    && $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests
-
-emulator_test:
-	cd erts/emulator/test && $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests
-
-system_test:
-	cd erts/test          && $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests
-
-epmd_test:
-	cd erts/epmd/test     && $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests
-
-%_test:
-	@dir="`echo $@ | sed 's/_test$$//'`"; \
-	 cd lib/$$dir/test    && $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests
-# Should I also set TESTROOT_DIR=$(TESTSUITE_ROOT)  ?
-# ----------------------------------------------------------------------
+TEST_DIRS := \
+	lib/test_server \
+	$(wildcard lib/*/test) \
+	erts/test \
+	erts/epmd/test \
+	erts/emulator/test
+
+.PHONY: tests release_tests $(TEST_DIRS)
+
+tests release_tests: $(TEST_DIRS)
+
+$(TEST_DIRS):
+	if test -f $@/Makefile; then \
+		(cd $@; $(MAKE) TESTROOT=$(TESTSUITE_ROOT) release_tests) || exit $$?; \
+	fi
 
 # ----------------------------------------------------------------------
 # Obsolete type of bootstrap where all stages where built with installed sytem 
 
=== modified file 'README'
--- README	2009-09-25 23:45:31 +0000
+++ README	2009-12-22 03:23:50 +0000
@@ -8,6 +8,10 @@
 
   http://www.erlang.org/
 
+The source code for Erlang/OTP can also be found in a Git
+repository at
+
+   http://github.com/erlang/otp
 
 %CopyrightBegin%
 
@@ -150,15 +154,22 @@
 How to build and install Erlang/OTP
 -----------------------------------
 
+If you are building in a Git reposistory, see
+
+  http://wiki.github.com/erlang/otp
+
+The following instructions are for building using the
+source tar ball.
+
 Start by unpacking the Erlang/OTP distribution file with your
 GNU compatible TAR
 
-  1)    gunzip -c otp_src_R13B02.tar.gz | tar xf -
-  1)    zcat otp_src_R13B02.tar.gz | tar xf -
+  1)    gunzip -c otp_src_R13B03.tar.gz | tar xf -
+  1)    zcat otp_src_R13B03.tar.gz | tar xf -
 
 Now cd into the base directory
 
-  2)    cd otp_src_R13B02
+  2)    cd otp_src_R13B03
 
 On some platforms Perl may behave strangely if certain locales are set,
 so optionally you may need to set the LANG variable:
@@ -326,13 +337,14 @@
 		Sun's x86 assembler is emphatically /not/ supported.
 	FreeBSD:
 		FreeBSD 6.1 and 6.2 in 32-bit and 64-bit modes should work.
+	MacOSX/Darwin:
+		Darwin 9.8.0 in 32-bit mode should work.
 
 PowerPC:
 	All 32-bit 6xx/7xx(G3)/74xx(G4) processors should work.
-	32-bit mode on 970 (G5) and POWER5 is untested and may need
-	compiler changes (to avoid using the "mcrxr" instruction).
+	32-bit mode on 970 (G5) and POWER5 processors should work.
 
-	Linux (Yellow Dog) and Mac OSX 10.3.9 are supported.
+	Linux (Yellow Dog) and Mac OSX 10.4 are supported.
 
 SPARC:
 	All UltraSPARC processors running 32-bit user code should work.
 
=== modified file 'README.win32'
--- README.win32	2009-09-25 23:45:31 +0000
+++ README.win32	2009-12-22 03:23:50 +0000
@@ -4,9 +4,11 @@
 
 1. Introduction
 2. Answers to some "frequently asked questions"
-3. What you need and the environment
-4. Building and installing
-5. Final words
+3. Tools you need and their environment
+4. The shell environment
+5. Building and installing
+6. Development
+7. Final words
 
 %CopyrightBegin%
 
@@ -86,7 +88,7 @@
 [e-mail]. I cannot of course help everyone with all
 their problems, please try to solve the problems and submit
 solutions/workarounds. Remember, it's all about sharing, not about
-demanding :-)
+demanding...
 
 Lets go then, I'll start with a little FAQ, based on in house questions
 and misunderstandings.
@@ -131,8 +133,8 @@
 some problems. Fixing those problems might be easy or might be hard.
 I suggest you try yourself and share your experience. No one would be
 happier if a simple ./configure && make would produce a fully fledged
-Cygwin binary. Ericsson does however not pay me to... Well, you know
-that by now I suppose :-)
+Cygwin binary. Ericsson does however not pay me to do a Cygwin port, so
+such a port would have to happen in spare time, which is a limited resource... 
 
 Q: Hah, I saw you, you used GCC even though you said you didn't!
 
@@ -155,7 +157,7 @@
 file for Erlang/OTP will never happen, at least I will never make
 one. Clicking around in super-multi-tab'd dialogs to add a file or
 compiler option when it's so much easier in a makefile is simply not
-my style :-) 
+my style.
 
 Q: So how does it all work then?
 
@@ -181,7 +183,7 @@
 made them into shell-scripts and not Perl-scripts, I believe they are
 easier to understand and change that way. I might be wrong though,
 cause another reason I didn't write them in Perl is because I've never
-liked Perl and my Perl code is no pleasant reading :-)
+liked Perl and my Perl code is no pleasant reading...
 
 In $ERL_TOP, there is a script called otp_build, that script handles
 the hassle of giving all the right parameters to configure/make and
@@ -208,9 +210,9 @@
 include workarounds for the bugs I've found in different Cygwin
 releases, please help me to add workarounds for new Cygwin-related
 bugs as soon as you encounter them. Also please do submit bug reports
-to the appropriate Cygwin developers. The Cygwin GCC we used for R12B
+to the appropriate Cygwin developers. The Cygwin GCC we used for R13B
 was version 3.4.4. We used VC++ 8.0 (i.e. Visual studio 2005 SP1),
-Sun's JDK 1.4.2_15, NSIS 2.30, and Win32 OpenSSL 0.9.8e. Please read
+Sun's JDK 1.5.0_17, NSIS 2.37, and Win32 OpenSSL 0.9.8e. Please read
 the next section for details on what you need.
 
 Q: Can you help me setup X in Cygwin?
@@ -243,11 +245,16 @@
    - open /cygwin/opt/local/pgm/wxWidgets-2.8.9/contrib/build/stc/stc.dsw 
    - build the unicode release (and unicode debug) packages
 * Get and unpack the erlang source distribution with Cygwin's tar.
+* set ERL_TOP to where you unpacked the source distribution
+* $ cd $ERL_TOP
+* Get (from http://www.erlang.org/download/tcltk85_win32_bin.tar.gz)
+and unpack the prebuilt TCL/TK binaries for windows with cygwin tar,
+standing in $ERL_TOP
 * Modify PATH and other environment variables so that all these tools
-are runnable from a bash shell
-* set ERL_TOP to where you unpacked the source distribution
-$ cd $ERL_TOP
+are runnable from a bash shell. Still standing in $ERL_TOP, issue the following
+commands:
 $ eval `./otp_build env_win32`
+$ ./otp_build autoconf
 $ ./otp_build configure
 $ ./otp_build boot -a
 $ ./otp_build release -a
@@ -258,8 +265,8 @@
 Windows shell.
 
  
-What you need and the environment
----------------------------------
+Tools you need and their environment
+------------------------------------
 
 You need some tools to be able to build Erlang/OTP on Windows. Most
 notably you'll need Cygwin and Microsoft VC++, but you also might want
@@ -311,7 +318,7 @@
 that might appear...
  
 If you want to use (t)csh instead of bash you're on your own, I
-haven't tried (god forbid :-)) and know of no one that has. I expect
+haven't tried and know of no one that has. I expect
 that you use bash in all shell examples.
 
 * Microsoft Visual Studio 2005 SP1. Please don't skip the service
@@ -368,7 +375,7 @@
 
 Add javac *LAST* to your path environment in bash, in my case this means:
 --------------------------------------------------------------
-PATH="$PATH:/cygdrive/c/Program Files/Java/jdk1.4.2/bin"
+PATH="$PATH:/cygdrive/c/Program Files/Java/jdk1.5.0_17/bin"
 --------------------------------------------------------------
 No CLASSPATH or anything is needed. Type "javac" at the bash prompt
 and you should get a list of available Java options. Make sure by
@@ -401,7 +408,7 @@
 
 If you want to build openssl for windows yourself (which might be
 possible, as you wouldn't be reading this if you weren't a
-compile-it-yourself person :-), you either have to put the resulting
+compile-it-yourself person), you either have to put the resulting
 DLL's in your path or in the windows system directory and either
 specify where you put the includes etc with the configure-parameter
 --with-ssl=<cygwin path to the root> or put your installation directly
@@ -412,18 +419,50 @@
 used, it results in cygwin depending binaries and it has unix style
 archives (.a, not .lib).
 
+* Building with wxWidgets. Download wxWidgets-2.8.9 or higher patch 
+release (2.9.*  is a developer release which currently does not work 
+with wxErlang).
+Install or unpack it to DRIVE:/PATH/cygwin/opt/local/pgm
+Open from explorer (i.e. by double clicking the file) 
+C:\cygwin\opt\local\pgm\wxMSW-2.8.10\build\msw\wx.dsw
+In Microsoft Visual Studio, click File/Open/File, locate and
+open:  C:\cygwin\opt\local\pgm\wxMSW-2.8.10\include\wx\msw\setup.h
+enable wxUSE_GLCANVAS, wxUSE_POSTSCRIPT and wxUSE_GRAPHICS_CONTEXT
+Build it by clicking Build/Batch Build and select all unicode release 
+(and unicode debug) packages.
+Open C:\cygwin\opt\local\pgm\wxMSW-2.8.10\contrib/build/stc/stc.dsw
+and batch build all unicode packages.
+
 * The Erlang source distribution. The same as for Unix
 platforms. Preferably use tar from within Cygwin to unpack the source
-tar.gz (tar zxf otp_src_R11B-0.tar.gz). 
+tar.gz (tar zxf otp_src_R13B03.tar.gz). 
 
 set the environment ERL_TOP to point to the root directory of the
 source distribution. Let's say I stood in $HOME/src and unpacked 
-otp_src_R11B-0.tar.gz, I then add the following to .profile:
+otp_src_R13B03.tar.gz, I then add the following to .profile:
 --------------------------------------------------------
-ERL_TOP=$HOME/src/otp_src_R11B-0
+ERL_TOP=$HOME/src/otp_src_R13B03
 export $ERL_TOP
 --------------------------------------------------------
 
+* The TCL/TK binaries. You could compile Tcl/Tk for windows yourself,
+but you can get a stripped down version from our website which is
+suitable to include in the final binary package. If you want to supply
+tcl/tk yourself, read the instructions about how the tcl/tk tar file
+used in the build is constructed under $ERL_TOP/lib/gs/tcl. The easy
+way is to download
+http://www.erlang.org/download/tcltk85_win32_bin.tar.gz and unpack it
+standing in the $ERL_TOP directory. This will create the file
+win32.tar.gz in $ERL_TOP/lib/gs/tcl/binaries. 
+
+One last alternative is to create a file named 'SKIP' in the
+$ERL_TOP/lib/gs/ after configure is run, but that will give you an
+erlang system without gs (which might be okay as you probably will use
+wx anyway).
+
+The shell environment
+---------------------
+
 So, if you have followed the instructions above, when you start a bash
 shell, you should have an INCLUDE environment with a Windows style
 path, a LIB environment variable also in Windows style, and finally a
@@ -434,7 +473,7 @@
 style*, and points to a directory containing, among other files, the
 script "otp_build".
 
-OK, a final massage of the environment is needed, and that is done by
+A final massage of the environment is needed, and that is done by
 the script $ERL_TOP/otp_build. Start bash and do the following, note
 the "back-ticks" (`), can be quite hard to get on some keyboards, but
 pressing the back-tick key followed by the space bar might do it...
@@ -486,6 +525,7 @@
 $ERL_TOP/release/win32: and there is where the packed self installing
 executable will reside too.
 
+$ ./otp_build autoconf # Ignore the warning blob about versions of autoconf
 $ ./otp_build configure <optional configure options>
 $ ./otp_build boot -a
 $ ./otp_build release -a <installation directory>
@@ -496,7 +536,16 @@
 
 Lets get into more detail:
 
-$ ./otp_build configure - This runs the supplied configure scripts
+$ ./otp_build autoconf - This step rebuilds the configure scripts to
+work correctly in the cygwin environment. In an ideal world, this
+would not be needed, but alas, we have encountered several
+incompatibilities between our distributed configure scripts (generated
+on a Linux platform) and the cygwin environment over the
+years. Running autoconf on cygwin ensures that the configure scripts
+are generated in a cygwin-compatible way and that they will work well
+in the next step.
+
+$ ./otp_build configure - This runs the newly generated configure scripts
 with options making configure behave nicely. The target machine type is
 plainly "win32", so a lot of the configure-scripts recognize this
 awkward target name and behave accordingly. The CC variable also makes
@@ -548,11 +597,11 @@
 run the executable with the parameter "/S" (capital S). like in:
 ------------------------------------------------------
 $ cd $ERL_TOP
-$ release/win32/otp_win32_R9C /S
+$ release/win32/otp_win32_R13B03 /S
 .....
 ------------------------------------------------------
 - and after a while Erlang will have been installed in 
-C:\Program Files\erl5.5, with shortcuts in the menu etc.
+C:\Program Files\erl5.7.4, with shortcuts in the menu etc.
 
 *NOTE* Beginning with R9C, the Windows installer does *not* add Erlang
 to the system wide path. If one wants to have Erlang in the path, one
@@ -571,10 +620,9 @@
 run Erlang. The registry is also used to store uninstall information,
 but if one has not used the self extracting installer, one cannot
 (need not) do any uninstall, one just scratches the release directory
-and everything is gone. Erlang/OTP R9C does not *need* to put anything
+and everything is gone. Erlang/OTP does not *need* to put anything
 in the Windows registry at all, and does not if you don't use the self
-extracting installer. In other words the installer is pure cosmetics
-:-)
+extracting installer. In other words the installer is pure cosmetics.
 
 
 Development
@@ -635,11 +683,21 @@
 $ cd $ERL_TOP/lib/stdlib/src
 $ make opt
 
-Note that you're expected o have a fresh erlang in your path when
-doing this, preferably the plain R12B you have built in the previous
+Note that you're expected o have a fresh Erlang in your path when
+doing this, preferably the plain R13B03 you have built in the previous
 steps. You could also add $ERL_TOP/bootstrap/bin to your PATH before
 rebuilding specific libraries, that would give you a good enough
-Erlang system to compile any OTP erlang code.
+Erlang system to compile any OTP erlang code.  Setting up the path
+correctly is a little bit tricky, you still need to have
+$ERL_TOP/erts/etc/win32/cygwin_tools/vc and
+$ERL_TOP/erts/etc/win32/cygwin_tools *before* the actual emulator
+in the path. A typical setting of the path for using the bootstrap
+compiler would be:
+
+$ export PATH=$ERL_TOP/erts/etc/win32/cygwin_tools/vc:$ERL_TOP/erts/etc/win32/cygwin_tools:$ERL_TOP/bootstrap/bin:$PATH
+
+That should make it possible to rebuild any library without hassle...
+
 If you want to copy a library (an application) newly built, to a
 release area, you do like with the emulator:
 
 
=== modified file 'bootstrap/bin/start.boot'
 Binary files bootstrap/bin/start.boot	2009-09-25 23:45:31 +0000 and bootstrap/bin/start.boot	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/bin/start.script'
--- bootstrap/bin/start.script	2009-09-25 23:45:31 +0000
+++ bootstrap/bin/start.script	2009-12-22 03:23:48 +0000
@@ -1,6 +1,6 @@
-%% script generated at {2009,9,18} {14,51,51}
+%% script generated at {2009,11,16} {16,51,54}
 {script,
-    {"OTP  APN 181 01","R13B02"},
+    {"OTP  APN 181 01","R13B03"},
     [{preLoaded,
          [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
           zlib]},
@@ -43,7 +43,7 @@
          {application_controller,start,
              [{application,kernel,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"2.13.3"},
+                   {vsn,"2.13.4"},
                    {id,[]},
                    {modules,
                        [application,application_controller,application_master,
@@ -80,7 +80,7 @@
          {application,load,
              [{application,stdlib,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"1.16.3"},
+                   {vsn,"1.16.4"},
                    {id,[]},
                    {modules,
                        [array,base64,beam_lib,c,calendar,dets,dets_server,
 
=== modified file 'bootstrap/bin/start_clean.boot'
 Binary files bootstrap/bin/start_clean.boot	2009-09-25 23:45:31 +0000 and bootstrap/bin/start_clean.boot	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/bin/start_clean.script'
--- bootstrap/bin/start_clean.script	2009-09-25 23:45:31 +0000
+++ bootstrap/bin/start_clean.script	2009-12-22 03:23:51 +0000
@@ -1,6 +1,6 @@
-%% script generated at {2009,9,18} {14,51,51}
+%% script generated at {2009,11,16} {16,51,54}
 {script,
-    {"OTP  APN 181 01","R13B02"},
+    {"OTP  APN 181 01","R13B03"},
     [{preLoaded,
          [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
           zlib]},
@@ -43,7 +43,7 @@
          {application_controller,start,
              [{application,kernel,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"2.13.3"},
+                   {vsn,"2.13.4"},
                    {id,[]},
                    {modules,
                        [application,application_controller,application_master,
@@ -80,7 +80,7 @@
          {application,load,
              [{application,stdlib,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"1.16.3"},
+                   {vsn,"1.16.4"},
                    {id,[]},
                    {modules,
                        [array,base64,beam_lib,c,calendar,dets,dets_server,
 
=== modified file 'bootstrap/lib/compiler/ebin/beam_asm.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_asm.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_asm.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_block.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_block.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_block.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_bool.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_bool.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_bool.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_bsm.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_bsm.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_bsm.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_clean.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_clean.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_clean.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_dead.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_dead.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_dead.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_dict.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_dict.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_dict.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_disasm.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_disasm.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_disasm.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_flatten.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_flatten.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_flatten.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_jump.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_jump.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_jump.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_listing.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_listing.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_listing.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_opcodes.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_opcodes.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_opcodes.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_peep.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_peep.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_peep.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_trim.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_trim.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_trim.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_type.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_type.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_type.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_utils.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_utils.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_utils.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/beam_validator.beam'
 Binary files bootstrap/lib/compiler/ebin/beam_validator.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/beam_validator.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/cerl.beam'
 Binary files bootstrap/lib/compiler/ebin/cerl.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/cerl.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/cerl_clauses.beam'
 Binary files bootstrap/lib/compiler/ebin/cerl_clauses.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/cerl_clauses.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/cerl_inline.beam'
 Binary files bootstrap/lib/compiler/ebin/cerl_inline.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/cerl_inline.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/cerl_trees.beam'
 Binary files bootstrap/lib/compiler/ebin/cerl_trees.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/cerl_trees.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/compile.beam'
 Binary files bootstrap/lib/compiler/ebin/compile.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/compile.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/compiler.app'
--- bootstrap/lib/compiler/ebin/compiler.app	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/compiler/ebin/compiler.app	2009-12-22 03:23:52 +0000
@@ -18,7 +18,7 @@
 
 {application, compiler,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "4.6.3"},
+  {vsn, "4.6.4"},
   {modules, [
 	     beam_asm,
 	     beam_block,
 
=== modified file 'bootstrap/lib/compiler/ebin/compiler.appup'
--- bootstrap/lib/compiler/ebin/compiler.appup	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/compiler/ebin/compiler.appup	2009-12-22 03:23:50 +0000
@@ -1,1 +1,1 @@
-{"4.6.3",[],[]}.
+{"4.6.4",[],[]}.
 
=== modified file 'bootstrap/lib/compiler/ebin/core_lib.beam'
 Binary files bootstrap/lib/compiler/ebin/core_lib.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/core_lib.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/core_lint.beam'
 Binary files bootstrap/lib/compiler/ebin/core_lint.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/core_lint.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/core_parse.beam'
 Binary files bootstrap/lib/compiler/ebin/core_parse.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/core_parse.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/core_pp.beam'
 Binary files bootstrap/lib/compiler/ebin/core_pp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/core_pp.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/core_scan.beam'
 Binary files bootstrap/lib/compiler/ebin/core_scan.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/core_scan.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/erl_bifs.beam'
 Binary files bootstrap/lib/compiler/ebin/erl_bifs.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/erl_bifs.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/rec_env.beam'
 Binary files bootstrap/lib/compiler/ebin/rec_env.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/rec_env.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/sys_core_dsetel.beam'
 Binary files bootstrap/lib/compiler/ebin/sys_core_dsetel.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/sys_core_dsetel.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/sys_core_fold.beam'
 Binary files bootstrap/lib/compiler/ebin/sys_core_fold.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/sys_core_fold.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/sys_core_inline.beam'
 Binary files bootstrap/lib/compiler/ebin/sys_core_inline.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/sys_core_inline.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/sys_expand_pmod.beam'
 Binary files bootstrap/lib/compiler/ebin/sys_expand_pmod.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/sys_expand_pmod.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/sys_pre_attributes.beam'
 Binary files bootstrap/lib/compiler/ebin/sys_pre_attributes.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/sys_pre_attributes.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/sys_pre_expand.beam'
 Binary files bootstrap/lib/compiler/ebin/sys_pre_expand.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/sys_pre_expand.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/v3_codegen.beam'
 Binary files bootstrap/lib/compiler/ebin/v3_codegen.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/v3_codegen.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/v3_core.beam'
 Binary files bootstrap/lib/compiler/ebin/v3_core.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/v3_core.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/v3_kernel.beam'
 Binary files bootstrap/lib/compiler/ebin/v3_kernel.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/v3_kernel.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/v3_kernel_pp.beam'
 Binary files bootstrap/lib/compiler/ebin/v3_kernel_pp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/v3_kernel_pp.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/compiler/ebin/v3_life.beam'
 Binary files bootstrap/lib/compiler/ebin/v3_life.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/compiler/ebin/v3_life.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/application.beam'
 Binary files bootstrap/lib/kernel/ebin/application.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/application.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/application_controller.beam'
 Binary files bootstrap/lib/kernel/ebin/application_controller.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/application_controller.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/application_master.beam'
 Binary files bootstrap/lib/kernel/ebin/application_master.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/application_master.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/application_starter.beam'
 Binary files bootstrap/lib/kernel/ebin/application_starter.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/application_starter.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/auth.beam'
 Binary files bootstrap/lib/kernel/ebin/auth.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/auth.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/code.beam'
 Binary files bootstrap/lib/kernel/ebin/code.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/code.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/code_server.beam'
 Binary files bootstrap/lib/kernel/ebin/code_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/code_server.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/disk_log.beam'
 Binary files bootstrap/lib/kernel/ebin/disk_log.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/disk_log.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/disk_log_1.beam'
 Binary files bootstrap/lib/kernel/ebin/disk_log_1.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/disk_log_1.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/disk_log_server.beam'
 Binary files bootstrap/lib/kernel/ebin/disk_log_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/disk_log_server.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/disk_log_sup.beam'
 Binary files bootstrap/lib/kernel/ebin/disk_log_sup.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/disk_log_sup.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/dist_ac.beam'
 Binary files bootstrap/lib/kernel/ebin/dist_ac.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/dist_ac.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/dist_util.beam'
 Binary files bootstrap/lib/kernel/ebin/dist_util.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/dist_util.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/erl_boot_server.beam'
 Binary files bootstrap/lib/kernel/ebin/erl_boot_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/erl_boot_server.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/erl_ddll.beam'
 Binary files bootstrap/lib/kernel/ebin/erl_ddll.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/erl_ddll.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/erl_distribution.beam'
 Binary files bootstrap/lib/kernel/ebin/erl_distribution.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/erl_distribution.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/erl_epmd.beam'
 Binary files bootstrap/lib/kernel/ebin/erl_epmd.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/erl_epmd.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/erl_reply.beam'
 Binary files bootstrap/lib/kernel/ebin/erl_reply.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/erl_reply.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/error_handler.beam'
 Binary files bootstrap/lib/kernel/ebin/error_handler.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/error_handler.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/error_logger.beam'
 Binary files bootstrap/lib/kernel/ebin/error_logger.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/error_logger.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/erts_debug.beam'
 Binary files bootstrap/lib/kernel/ebin/erts_debug.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/erts_debug.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/file.beam'
 Binary files bootstrap/lib/kernel/ebin/file.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/file.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/file_io_server.beam'
 Binary files bootstrap/lib/kernel/ebin/file_io_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/file_io_server.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/file_server.beam'
 Binary files bootstrap/lib/kernel/ebin/file_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/file_server.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/gen_sctp.beam'
 Binary files bootstrap/lib/kernel/ebin/gen_sctp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/gen_sctp.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/gen_tcp.beam'
 Binary files bootstrap/lib/kernel/ebin/gen_tcp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/gen_tcp.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/gen_udp.beam'
 Binary files bootstrap/lib/kernel/ebin/gen_udp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/gen_udp.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/global.beam'
 Binary files bootstrap/lib/kernel/ebin/global.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/global.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/global_group.beam'
 Binary files bootstrap/lib/kernel/ebin/global_group.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/global_group.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/global_search.beam'
 Binary files bootstrap/lib/kernel/ebin/global_search.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/global_search.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/group.beam'
 Binary files bootstrap/lib/kernel/ebin/group.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/group.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/heart.beam'
 Binary files bootstrap/lib/kernel/ebin/heart.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/heart.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/hipe_unified_loader.beam'
 Binary files bootstrap/lib/kernel/ebin/hipe_unified_loader.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/hipe_unified_loader.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet.beam'
 Binary files bootstrap/lib/kernel/ebin/inet.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet6_sctp.beam'
 Binary files bootstrap/lib/kernel/ebin/inet6_sctp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet6_sctp.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet6_tcp.beam'
 Binary files bootstrap/lib/kernel/ebin/inet6_tcp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet6_tcp.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam'
 Binary files bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet6_udp.beam'
 Binary files bootstrap/lib/kernel/ebin/inet6_udp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet6_udp.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_config.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_config.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_config.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_db.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_db.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_db.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_dns.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_dns.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_dns.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_gethost_native.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_gethost_native.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_gethost_native.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_hosts.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_hosts.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_hosts.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_parse.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_parse.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_parse.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_res.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_res.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_res.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_sctp.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_sctp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_sctp.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_tcp.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_tcp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_tcp.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_tcp_dist.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_tcp_dist.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_tcp_dist.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/inet_udp.beam'
 Binary files bootstrap/lib/kernel/ebin/inet_udp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/inet_udp.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/kernel.app'
--- bootstrap/lib/kernel/ebin/kernel.app	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/kernel/ebin/kernel.app	2009-12-22 03:23:51 +0000
@@ -21,7 +21,7 @@
 {application, kernel,
  [
   {description, "ERTS  CXC 138 10"},
-  {vsn, "2.13.3"},
+  {vsn, "2.13.4"},
   {modules, [application,
 	     application_controller,
 	     application_master,
 
=== modified file 'bootstrap/lib/kernel/ebin/kernel.appup'
--- bootstrap/lib/kernel/ebin/kernel.appup	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/kernel/ebin/kernel.appup	2009-12-22 03:23:48 +0000
@@ -1,1 +1,1 @@
-{"2.13.3",[],[]}.
+{"2.13.4",[],[]}.
 
=== modified file 'bootstrap/lib/kernel/ebin/kernel.beam'
 Binary files bootstrap/lib/kernel/ebin/kernel.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/kernel.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/kernel_config.beam'
 Binary files bootstrap/lib/kernel/ebin/kernel_config.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/kernel_config.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/net.beam'
 Binary files bootstrap/lib/kernel/ebin/net.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/net.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/net_adm.beam'
 Binary files bootstrap/lib/kernel/ebin/net_adm.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/net_adm.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/net_kernel.beam'
 Binary files bootstrap/lib/kernel/ebin/net_kernel.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/net_kernel.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/os.beam'
 Binary files bootstrap/lib/kernel/ebin/os.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/os.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/packages.beam'
 Binary files bootstrap/lib/kernel/ebin/packages.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/packages.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/pg2.beam'
 Binary files bootstrap/lib/kernel/ebin/pg2.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/pg2.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/ram_file.beam'
 Binary files bootstrap/lib/kernel/ebin/ram_file.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/ram_file.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/rpc.beam'
 Binary files bootstrap/lib/kernel/ebin/rpc.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/rpc.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/seq_trace.beam'
 Binary files bootstrap/lib/kernel/ebin/seq_trace.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/seq_trace.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/standard_error.beam'
 Binary files bootstrap/lib/kernel/ebin/standard_error.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/standard_error.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/user.beam'
 Binary files bootstrap/lib/kernel/ebin/user.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/user.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/user_drv.beam'
 Binary files bootstrap/lib/kernel/ebin/user_drv.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/user_drv.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/user_sup.beam'
 Binary files bootstrap/lib/kernel/ebin/user_sup.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/user_sup.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/kernel/ebin/wrap_log_reader.beam'
 Binary files bootstrap/lib/kernel/ebin/wrap_log_reader.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/kernel/ebin/wrap_log_reader.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/array.beam'
 Binary files bootstrap/lib/stdlib/ebin/array.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/array.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/base64.beam'
 Binary files bootstrap/lib/stdlib/ebin/base64.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/base64.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/beam_lib.beam'
 Binary files bootstrap/lib/stdlib/ebin/beam_lib.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/beam_lib.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/c.beam'
 Binary files bootstrap/lib/stdlib/ebin/c.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/c.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/calendar.beam'
 Binary files bootstrap/lib/stdlib/ebin/calendar.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/calendar.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dets.beam'
 Binary files bootstrap/lib/stdlib/ebin/dets.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dets.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dets_server.beam'
 Binary files bootstrap/lib/stdlib/ebin/dets_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dets_server.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dets_sup.beam'
 Binary files bootstrap/lib/stdlib/ebin/dets_sup.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dets_sup.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dets_utils.beam'
 Binary files bootstrap/lib/stdlib/ebin/dets_utils.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dets_utils.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dets_v8.beam'
 Binary files bootstrap/lib/stdlib/ebin/dets_v8.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dets_v8.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dets_v9.beam'
 Binary files bootstrap/lib/stdlib/ebin/dets_v9.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dets_v9.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/dict.beam'
 Binary files bootstrap/lib/stdlib/ebin/dict.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/dict.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/digraph.beam'
 Binary files bootstrap/lib/stdlib/ebin/digraph.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/digraph.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/digraph_utils.beam'
 Binary files bootstrap/lib/stdlib/ebin/digraph_utils.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/digraph_utils.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/edlin.beam'
 Binary files bootstrap/lib/stdlib/ebin/edlin.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/edlin.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/edlin_expand.beam'
 Binary files bootstrap/lib/stdlib/ebin/edlin_expand.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/edlin_expand.beam	2009-12-22 03:23:47 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/epp.beam'
 Binary files bootstrap/lib/stdlib/ebin/epp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/epp.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_bits.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_bits.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_bits.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_compile.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_compile.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_compile.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_eval.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_eval.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_eval.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_expand_records.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_expand_records.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_expand_records.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_internal.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_internal.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_internal.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_lint.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_lint.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_lint.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_parse.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_parse.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_parse.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_posix_msg.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_posix_msg.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_posix_msg.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_pp.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_pp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_pp.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_scan.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_scan.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_scan.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/erl_tar.beam'
 Binary files bootstrap/lib/stdlib/ebin/erl_tar.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/erl_tar.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/error_logger_file_h.beam'
 Binary files bootstrap/lib/stdlib/ebin/error_logger_file_h.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/error_logger_file_h.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam'
 Binary files bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/escript.beam'
 Binary files bootstrap/lib/stdlib/ebin/escript.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/escript.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/ets.beam'
 Binary files bootstrap/lib/stdlib/ebin/ets.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/ets.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/eval_bits.beam'
 Binary files bootstrap/lib/stdlib/ebin/eval_bits.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/eval_bits.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/file_sorter.beam'
 Binary files bootstrap/lib/stdlib/ebin/file_sorter.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/file_sorter.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/filelib.beam'
 Binary files bootstrap/lib/stdlib/ebin/filelib.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/filelib.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/filename.beam'
 Binary files bootstrap/lib/stdlib/ebin/filename.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/filename.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/gb_sets.beam'
 Binary files bootstrap/lib/stdlib/ebin/gb_sets.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/gb_sets.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/gb_trees.beam'
 Binary files bootstrap/lib/stdlib/ebin/gb_trees.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/gb_trees.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/gen.beam'
 Binary files bootstrap/lib/stdlib/ebin/gen.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/gen.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/gen_event.beam'
 Binary files bootstrap/lib/stdlib/ebin/gen_event.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/gen_event.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/gen_fsm.beam'
 Binary files bootstrap/lib/stdlib/ebin/gen_fsm.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/gen_fsm.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/gen_server.beam'
 Binary files bootstrap/lib/stdlib/ebin/gen_server.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/gen_server.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/io.beam'
 Binary files bootstrap/lib/stdlib/ebin/io.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/io.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/io_lib.beam'
 Binary files bootstrap/lib/stdlib/ebin/io_lib.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/io_lib.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/io_lib_format.beam'
 Binary files bootstrap/lib/stdlib/ebin/io_lib_format.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/io_lib_format.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/io_lib_fread.beam'
 Binary files bootstrap/lib/stdlib/ebin/io_lib_fread.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/io_lib_fread.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/io_lib_pretty.beam'
 Binary files bootstrap/lib/stdlib/ebin/io_lib_pretty.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/io_lib_pretty.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/lib.beam'
 Binary files bootstrap/lib/stdlib/ebin/lib.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/lib.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/lists.beam'
 Binary files bootstrap/lib/stdlib/ebin/lists.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/lists.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/log_mf_h.beam'
 Binary files bootstrap/lib/stdlib/ebin/log_mf_h.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/log_mf_h.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/math.beam'
 Binary files bootstrap/lib/stdlib/ebin/math.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/math.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/ms_transform.beam'
 Binary files bootstrap/lib/stdlib/ebin/ms_transform.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/ms_transform.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/orddict.beam'
 Binary files bootstrap/lib/stdlib/ebin/orddict.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/orddict.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/ordsets.beam'
 Binary files bootstrap/lib/stdlib/ebin/ordsets.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/ordsets.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/otp_internal.beam'
 Binary files bootstrap/lib/stdlib/ebin/otp_internal.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/otp_internal.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/pg.beam'
 Binary files bootstrap/lib/stdlib/ebin/pg.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/pg.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/pool.beam'
 Binary files bootstrap/lib/stdlib/ebin/pool.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/pool.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/proc_lib.beam'
 Binary files bootstrap/lib/stdlib/ebin/proc_lib.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/proc_lib.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/proplists.beam'
 Binary files bootstrap/lib/stdlib/ebin/proplists.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/proplists.beam	2009-12-22 03:23:47 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/qlc.beam'
 Binary files bootstrap/lib/stdlib/ebin/qlc.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/qlc.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/qlc_pt.beam'
 Binary files bootstrap/lib/stdlib/ebin/qlc_pt.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/qlc_pt.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/queue.beam'
 Binary files bootstrap/lib/stdlib/ebin/queue.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/queue.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/random.beam'
 Binary files bootstrap/lib/stdlib/ebin/random.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/random.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/re.beam'
 Binary files bootstrap/lib/stdlib/ebin/re.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/re.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/regexp.beam'
 Binary files bootstrap/lib/stdlib/ebin/regexp.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/regexp.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/sets.beam'
 Binary files bootstrap/lib/stdlib/ebin/sets.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/sets.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/shell.beam'
 Binary files bootstrap/lib/stdlib/ebin/shell.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/shell.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/shell_default.beam'
 Binary files bootstrap/lib/stdlib/ebin/shell_default.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/shell_default.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/slave.beam'
 Binary files bootstrap/lib/stdlib/ebin/slave.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/slave.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/sofs.beam'
 Binary files bootstrap/lib/stdlib/ebin/sofs.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/sofs.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/stdlib.app'
--- bootstrap/lib/stdlib/ebin/stdlib.app	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/stdlib/ebin/stdlib.app	2009-12-22 03:23:50 +0000
@@ -19,7 +19,7 @@
 %%
 {application, stdlib,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "1.16.3"},
+  {vsn, "1.16.4"},
   {modules, [array,
 	     base64,
 	     beam_lib,
 
=== modified file 'bootstrap/lib/stdlib/ebin/stdlib.appup'
--- bootstrap/lib/stdlib/ebin/stdlib.appup	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/stdlib/ebin/stdlib.appup	2009-12-22 03:23:50 +0000
@@ -1,1 +1,1 @@
-{"1.16.3",[],[]}.
+{"1.16.4",[],[]}.
 
=== modified file 'bootstrap/lib/stdlib/ebin/string.beam'
 Binary files bootstrap/lib/stdlib/ebin/string.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/string.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/supervisor.beam'
 Binary files bootstrap/lib/stdlib/ebin/supervisor.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/supervisor.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/supervisor_bridge.beam'
 Binary files bootstrap/lib/stdlib/ebin/supervisor_bridge.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/supervisor_bridge.beam	2009-12-22 03:23:49 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/sys.beam'
 Binary files bootstrap/lib/stdlib/ebin/sys.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/sys.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/timer.beam'
 Binary files bootstrap/lib/stdlib/ebin/timer.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/timer.beam	2009-12-22 03:23:48 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/unicode.beam'
 Binary files bootstrap/lib/stdlib/ebin/unicode.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/unicode.beam	2009-12-22 03:23:52 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/win32reg.beam'
 Binary files bootstrap/lib/stdlib/ebin/win32reg.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/win32reg.beam	2009-12-22 03:23:51 +0000 differ
=== modified file 'bootstrap/lib/stdlib/ebin/zip.beam'
 Binary files bootstrap/lib/stdlib/ebin/zip.beam	2009-09-25 23:45:31 +0000 and bootstrap/lib/stdlib/ebin/zip.beam	2009-12-22 03:23:50 +0000 differ
=== modified file 'bootstrap/lib/stdlib/include/erl_compile.hrl'
--- bootstrap/lib/stdlib/include/erl_compile.hrl	2009-09-25 23:45:31 +0000
+++ bootstrap/lib/stdlib/include/erl_compile.hrl	2009-12-22 03:23:51 +0000
@@ -20,9 +20,9 @@
 %% Generic compiler options, passed from the erl_compile module.
 
 -record(options,
-	 {includes=[] :: [string()],		% Include paths (list of
+	 {includes=[] :: [file:filename()],	% Include paths (list of
 						% absolute directory names).
-	  outdir="."  :: string(),		% Directory for result
+	  outdir="."  :: file:filename(),	% Directory for result
 						% (absolute path).
 	  output_type=undefined :: atom(),	% Type of output file.
 	  defines=[]  :: [atom() | {atom(),_}],	% Preprocessor defines.  Each
@@ -35,9 +35,9 @@
 	  verbose=false :: boolean(),		% Verbose (true/false).
 	  optimize=999,				% Optimize options.
 	  specific=[] :: [_],			% Compiler specific options.
-	  outfile=""  :: string(),		% Name of output file (internal
+	  outfile=""  :: file:filename(),	% Name of output file (internal
 						% use in erl_compile.erl).
-	  cwd	      :: string()		% Current working directory
+	  cwd	      :: file:filename()	% Current working directory
 						% for erlc.
 	 }).
 
 
=== modified file 'configure'
--- configure	2009-09-25 23:45:31 +0000
+++ configure	2009-12-22 03:23:48 +0000
@@ -2702,11 +2702,20 @@
 	export LDFLAGS
 fi
 if test X${enable_darwin_64bit} = Xyes; then
-	if test X"$TMPSYS" '!=' X"Darwin-i386"; then
-		{ { echo "$as_me:$LINENO: error: --enable-darwin-64bit only supported on x86 host" >&5
-echo "$as_me: error: --enable-darwin-64bit only supported on x86 host" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
+	case "$TMPSYS" in
+	    Darwin-i386|Darwin-x86_64)
+		;;
+	    Darwin*)
+		{ { echo "$as_me:$LINENO: error: --enable-darwin-64bit only supported on x86 hosts" >&5
+echo "$as_me: error: --enable-darwin-64bit only supported on x86 hosts" >&2;}
+   { (exit 1); exit 1; }; }
+		;;
+	    *)
+		{ { echo "$as_me:$LINENO: error: --enable-darwin-64bit only supported on Darwin" >&5
+echo "$as_me: error: --enable-darwin-64bit only supported on Darwin" >&2;}
+   { (exit 1); exit 1; }; }
+		;;
+	esac
 	enable_hipe=no
 	CFLAGS="-m64 $CFLAGS"
 	export CFLAGS
@@ -3872,3 +3881,16 @@
   echo
   echo '*********************************************************************'
 fi
+if test -f "erts/doc/CONF_INFO"; then
+  echo '*********************************************************************'
+  echo '**********************  DOCUMENTATION INFORMATION  ******************'
+  echo '*********************************************************************'
+  echo
+  printf "%-15s: \n" documentation;
+  for cmd in `cat erts/doc/CONF_INFO`; do
+	echo "                 $cmd is missing."
+  done
+  echo '                 The documentation can not be built.'
+  echo
+  echo '*********************************************************************'
+fi
 
=== modified file 'configure.in'
--- configure.in	2009-09-25 23:45:31 +0000
+++ configure.in	2009-12-22 03:23:50 +0000
@@ -219,9 +219,16 @@
 	export LDFLAGS
 fi
 if test X${enable_darwin_64bit} = Xyes; then
-	if test X"$TMPSYS" '!=' X"Darwin-i386"; then
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on x86 host])	
-	fi
+	case "$TMPSYS" in
+	    Darwin-i386|Darwin-x86_64)
+		;;
+	    Darwin*)
+		AC_MSG_ERROR([--enable-darwin-64bit only supported on x86 hosts])
+		;;
+	    *)
+		AC_MSG_ERROR([--enable-darwin-64bit only supported on Darwin])
+		;;
+	esac
 	enable_hipe=no
 	CFLAGS="-m64 $CFLAGS"
 	export CFLAGS
@@ -275,3 +282,16 @@
   echo
   echo '*********************************************************************'
 fi
+if test -f "erts/doc/CONF_INFO"; then
+  echo '*********************************************************************'
+  echo '**********************  DOCUMENTATION INFORMATION  ******************'
+  echo '*********************************************************************'
+  echo
+  printf "%-15s: \n" documentation; 
+  for cmd in `cat erts/doc/CONF_INFO`; do
+	echo "                 $cmd is missing." 
+  done  
+  echo '                 The documentation can not be built.'
+  echo
+  echo '*********************************************************************'
+fi
 
=== removed file 'debian/analyse.sh'
--- debian/analyse.sh	2009-06-30 14:13:14 +0000
+++ debian/analyse.sh	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-echo "Determining which files goes where through \
-the magic of regular expressions."
-
-# Pretty dead simple.  The pattern files include
-# regular expression that match some files.  Files that
-# match patterns in binary.patterns go into the base
-# package.  Same goes for the X11 package.  Files
-# that don't match anything go into the NO-X package etc.
-
-# Files that match here might also go into
-# erlang-base-hipe.install.
-
-DIR=$1
-
-echo "erlang-base"
-find debian/erlang-stnd -type f | \
-    grep -E -f debian/patterns/erlang-base.patterns | \
-    cut -c 20- > debian/erlang-base.install
-
-echo "erlang-base-hipe"
-find debian/erlang-hipe -type f | \
-    grep -E -f debian/patterns/erlang-base-hipe.patterns | \
-    cut -c 20- > debian/erlang-base-hipe.install
-
-# Here, files that matched above shouldn't
-# be looked at.
-
-echo "erlang-examples"
-find $DIR -type f | \
-    grep -v -E -f debian/patterns/erlang-base.patterns | \
-    grep -v -E -f debian/patterns/erlang-base-hipe.patterns | \
-    grep -E -f debian/patterns/erlang-examples.patterns | \
-    cut -c 20- > debian/erlang-examples.install
-
-echo "erlang-src"
-find $DIR -type f | \
-    grep -v -E -f debian/patterns/erlang-base.patterns | \
-    grep -v -E -f debian/patterns/erlang-base-hipe.patterns | \
-    grep -v -E -f debian/patterns/erlang-examples.patterns | \
-    grep -E -f debian/patterns/erlang-src.patterns | \
-    cut -c 20- > debian/erlang-src.install
-
-echo "erlang-dev"
-find $DIR -type f | \
-    grep -E -e './usr/lib/erlang/usr/include' | \
-    cut -c 20- | sed -e 's!$! usr/lib/erlang/usr/include!' > debian/erlang-dev.install
-
-find $DIR -type f | \
-    grep -v -E -f debian/patterns/erlang-base.patterns | \
-    grep -v -E -f debian/patterns/erlang-base-hipe.patterns | \
-    grep -v -E -f debian/patterns/erlang-examples.patterns | \
-    grep -v -E -f debian/patterns/erlang-src.patterns | \
-    grep -E -f debian/patterns/erlang-dev.patterns | \
-    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'
-
-CMD='grep -v -E -e ./usr/lib/erlang/usr/include |
-     grep -v -E -f debian/patterns/erlang-base.patterns |
-     grep -v -E -f debian/patterns/erlang-base-hipe.patterns |
-     grep -v -E -f debian/patterns/erlang-examples.patterns |
-     grep -v -E -f debian/patterns/erlang-src.patterns |
-     grep -v -E -f debian/patterns/erlang-dev.patterns'
-
-CMD1=$CMD
-MODULES=""
-for fn in $(awk -- '/\.beam$/ {system("basename " $1 " .beam")}' debian/erlang-base.install)
-do
-    MODULES="$MODULES{\"$fn\", \"erlang-base\"},\n"
-done
-PACKAGES2="\"dev\", \"nox\", \"dev\""
-for pkg in $PACKAGES ; do
-    echo erlang-$pkg
-
-    find $DIR -type f | eval $CMD | \
-	grep -E -f debian/patterns/erlang-$pkg.patterns | \
-	cut -c 20- | sort > debian/erlang-$pkg.install
-
-    CMD1="$CMD1 | grep -v -E -f debian/patterns/erlang-$pkg.patterns"
-    for fn in $(awk -- '/\.beam$/ {system("basename " $1 " .beam")}' debian/erlang-$pkg.install)
-    do
-	MODULES="$MODULES{\"$fn\", \"erlang-$pkg\"},\n"
-    done
-    PACKAGES2="$PACKAGES2, \"$pkg\""
-done
-
-sed -i -e "s/@PACKAGES@/$PACKAGES2/" -e "s/@MODULES@/$MODULES/" debian/erlang-depends
-
-echo "FILES WHICH HAVEN'T REACHED ANY PACKAGE"
-find $DIR -type f | eval $CMD1
-
-echo "PACKAGES INTERSECTIONS"
-for pkg1 in $PACKAGES ; do
-    for pkg2 in $PACKAGES ; do
-	if [ $pkg1 != $pkg2 ] ; then
-	    comm -1 -2 debian/erlang-$pkg1.install debian/erlang-$pkg2.install
-	fi
-    done
-done
-echo "---------------------------------------"
-
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-12-07 10:28:47 +0000
+++ debian/changelog	2009-12-22 03:23:48 +0000
@@ -1,3 +1,34 @@
+erlang (1:13.b.3-dfsg-2ubuntu1) lucid; urgency=low
+
+  * Merge with Debian testing; remaining Ubuntu changes:
+    - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
+      supposed to. (LP #438365)
+    - Drop erlang-wx binary.
+    - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
+      do not really need wx. Also drop it from -debugger; the GUI needs wx,
+      but it apparently has CLI bits as well, and is also needed by -megaco,
+      so let's keep the package for now.
+
+ -- Elliot Murphy <[e-mail]>  Mon, 21 Dec 2009 21:54:16 -0500
+
+erlang (1:13.b.3-dfsg-2) unstable; urgency=low
+
+  * Fixed dialyzer(1) manpage which was placed into section 3 and conflicted
+    with dialyzer(3erl).
+
+ -- Sergei Golovan <[e-mail]>  Sun, 20 Dec 2009 09:03:40 +0300
+
+erlang (1:13.b.3-dfsg-1) unstable; urgency=low
+
+  * 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.
+  * 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 <[e-mail]>  Sat, 19 Dec 2009 19:44:54 +0300
+
 erlang (1:13.b.2.1-dfsg-1ubuntu3) lucid; urgency=low
 
   * build-options.patch: Fix to apply to current version.
 
=== modified file 'debian/control'
--- debian/control	2009-11-06 18:54:42 +0000
+++ debian/control	2009-12-22 03:23:50 +0000
@@ -7,14 +7,14 @@
 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,
- dctrl-tools,
+ 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]
 Build-Conflicts: autoconf2.13
 Homepage: http://www.erlang.org/
-Vcs-Svn: http://svn.berlios.de/svnroot/repos/erlang-pkg/erlang/trunk/
-Vcs-Browser: http://svn.berlios.de/viewcvs/erlang-pkg/erlang/trunk/
+Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/erlang/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/erlang/trunk/
 
 Package: erlang-base
 Architecture: any
@@ -181,6 +181,17 @@
  the conventions of the Erlang world.
 
 
+Package: erlang-erl-docgen
+Architecture: any
+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}
@@ -246,6 +257,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
@@ -578,7 +599,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,
 
=== modified file 'debian/erlang-base-hipe.manpages'
--- debian/erlang-base-hipe.manpages	2007-11-21 16:08:08 +0000
+++ debian/erlang-base-hipe.manpages	2009-12-22 03:23:50 +0000
@@ -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 file 'debian/erlang-base.manpages'
--- debian/erlang-base.manpages	2007-11-21 16:08:08 +0000
+++ debian/erlang-base.manpages	2009-12-22 03:23:50 +0000
@@ -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
 
=== added file 'debian/erlang-common-test.links.in'
--- debian/erlang-common-test.links.in	1970-01-01 00:00:00 +0000
+++ debian/erlang-common-test.links.in	2009-12-22 03:23:49 +0000
@@ -0,0 +1,1 @@
+usr/lib/erlang/lib/common_test-@COMMON_TEST_VSN@/priv/bin/run_test	usr/bin/run_test
 
=== added file 'debian/erlang-common-test.manpages'
--- debian/erlang-common-test.manpages	1970-01-01 00:00:00 +0000
+++ debian/erlang-common-test.manpages	2009-12-22 03:23:50 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/man/man1/run_test.1
 
=== removed file 'debian/erlang-depends.1'
--- debian/erlang-depends.1	2009-07-24 15:02:33 +0000
+++ debian/erlang-depends.1	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
-.\" Modified by Sergei Golovan
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ERLANG-DEPENDS 1"
-.TH ERLANG-DEPENDS 1 "2009\-07\-02" "1:13.b.1\-dfsg\-4" "Erlang packages for Debian GNU/Linux"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-erlang\-depends \- calculates Erlang dependencies
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fBerlang-depends\fR [\fIdebhelper\ options\fR]
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-erlang\-depends is a debhelper-like program that is responsible for generating
-the substitution variables for Erlang-dependent packages.
-.PP
-The most useful variable is ${erlang:Depends}. It expands into the list of
-Erlang packages which modules are used in the building package. It is
-introduced in version 1:13.b.1\-dfsg\-3 of erlang-dev package.
-.PP
-Also, ${erlang\-abi:Depends} substitution adds current erlang \s-1ABI\s0 virtual
-package to substvar files. It is useful if your package uses C-based
-extensions which may break in case of \s-1ABI\s0 changes. It is introduced in
-version 1:11.b.4\-4 of erlang\-dev package.
-.PP
-If you want to fine tune your package dependencies then you may want to use
-substvars for all Erlang packages you need. Currently they are:
-${erlang\-base:Depends},
-${erlang\-dev:Depends},
-${erlang\-appmon:Depends},
-${erlang\-asn1:Depends},
-${erlang\-common-test:Depends},
-${erlang\-corba:Depends},
-${erlang\-crypto:Depends},
-${erlang\-debugger:Depends},
-${erlang\-dialyzer:Depends},
-${erlang\-docbuilder:Depends},
-${erlang\-edoc:Depends},
-${erlang\-et:Depends},
-${erlang\-eunit:Depends},
-${erlang\-gs:Depends},
-${erlang\-ic:Depends},
-${erlang\-inets:Depends},
-${erlang\-inviso:Depends},
-${erlang\-megaco:Depends},
-${erlang\-mnesia:Depends},
-${erlang\-observer:Depends},
-${erlang\-odbc:Depends},
-${erlang\-os-mon:Depends},
-${erlang\-parsetools:Depends},
-${erlang\-percept:Depends},
-${erlang\-pman:Depends},
-${erlang\-public-key:Depends},
-${erlang\-reltool:Depends},
-${erlang\-runtime-tools:Depends},
-${erlang\-snmp:Depends},
-${erlang\-ssh:Depends},
-${erlang\-ssl:Depends},
-${erlang\-syntax-tools:Depends},
-${erlang\-test-server:Depends},
-${erlang\-toolbar:Depends},
-${erlang\-tools:Depends},
-${erlang\-tv:Depends},
-${erlang\-typer:Depends},
-${erlang\-webtool:Depends},
-${erlang\-wx:Depends},
-${erlang\-xmerl:Depends}.
-All variables except ${erlang\-base:Depends} and ${erlang\-dev:Depends} were
-introduced in version 1:13.b\-dfsg\-2 of erlang\-dev package.
-.PP
-For compatibility with older versions the variables
-${erlang\-nox:Depends} and ${erlang\-x11:Depends} also works (even since the
-corresponding packages turned into dummy packages).
-.PP
-If you use this program, your package must build-depend on erlang\-dev
-(>= 1:13.b\-dfsg\-2). If you want your package to use automatic calculation
-of dependencies then it must build-depend on erlang\-dev (>= 1:13.b.1\-dfsg\-3).
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\fB\-v\fR, \fB\-\-verbose\fR" 4
-.IX Item "-v, --verbose"
-Verbose mode.
-.IP "\fB\-a\fR, \fB\-\-arch\fR" 4
-.IX Item "-a, --arch"
-Act on all architecture dependent packages.
-.IP "\fB\-i\fR, \fB\-\-indep\fR" 4
-.IX Item "-i, --indep"
-Act on all architecture independent packages.
-.IP "\fB\-p\fR\fIpackage\fR, \fB\-\-package=\fR\fIpackage\fR" 4
-.IX Item "-ppackage, --package=package"
-Act on the package named \*(L"package\*(R". This option may be specified multiple
-times.
-.IP "\fB\-N\fR\fIpackage\fR, \fB\-\-no\-package=\fR\fIpackage\fR" 4
-.IX Item "-Npackage, --no-package=package"
-Do not act on the specified package even if an \-a, \-i, or \-p option lists
-the package as one that should be acted on.
-.IP "\fB\-\-ignore=\fR\fIfile\fR" 4
-.IX Item "--ignore=file"
-Ignore the specified file.
-.IP "\fB\-P\fR\fItmpdir\fR, \fB\-\-tmpdir=\fR\fItmpdir\fR" 4
-.IX Item "-Ptmpdir, --tmpdir=tmpdir"
-Use \*(L"tmpdir\*(R" for package build directory. The default is debian/<package>
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIdebhelper\fR\|(7)
-.PP
-This program is not part of debhelper.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-Torsten Werner <[e-mail]> initially wrote it in Perl,
-Sergei Golovan <[e-mail]> rewrote in Erlang (started from 1:13.b.1\-dfsg\-3).
 
=== removed file 'debian/erlang-depends.in'
--- debian/erlang-depends.in	2009-07-24 15:02:33 +0000
+++ debian/erlang-depends.in	1970-01-01 00:00:00 +0000
@@ -1,662 +0,0 @@
-#! /usr/bin/env escript
-%% -*- erlang -*-
-%%! -smp disable
-
--include_lib("kernel/include/file.hrl").
-
-% The current Erlang version
--define(VERSION, "@SOURCE_VERSION@").
--define(ABI_VERSION, "@ABI_VERSION@").
-
-% The list of HiPE enabled architectures (with added 'all' architecture), isn't used yet
--define(HIPE_ARCHES, split("@HIPE_ARCHES@ all", $\ )).
-
-% Since all packages required built application to run may be unavailable on build stage
-% it's necessary to list all module-package relationships explicitly:
--define(MODULES, [@MODULES@ {"erlang", "erlang-base"}]).
-
-% The erlang packages list (suffixes only)
--define(PACKAGES, [@PACKAGES@]).
-
-
-% main/1 --
-%
-%	Generate debhelper substitution variables for Erlang-dependent
-%	packages.
-%
-% Arguments:
-%	Options		List of debhelper options (-v, -a, -i, -p*, -N*) or
-%			-h.
-%
-% Result:
-%	None.
-%
-% Side effects:
-%	For each of the selected packages the corresponding file
-%	debian/package.substvars is created (if necessary) and filled by erlang
-%	dependencies. If -h or --help is among arguments then the usage info is
-%	printed instead and script is halted.
-
-main(Options) ->
-    {Verbosity, TmpDir, Exclude, NewOptions} =
-	lists:foldl(fun(Opt, {Sum, Dir, Ex, Opts}) ->
-			case Opt of
-			    "-h" ->
-				usage(),
-				halt(2);
-			    "--help" ->
-				usage(),
-				halt(2);
-			    "-v" ->
-				{Sum + 1, Dir, Ex, Opts};
-			    "--verbose" ->
-				{Sum + 1, Dir, Ex, Opts};
-			    "--ignore=" ++ File ->
-				{Sum, Dir, Ex ++ [File], Opts};
-			    "-P" ++ D ->
-				{Sum, D, Ex, Opts};
-			    "--tmpdir=" ++ D ->
-				{Sum, D, Ex, Opts};
-			    _ ->
-				{Sum, Dir, Ex, Opts ++ [Opt]}
-			end
-		    end, {0, [], [], []}, Options),
-    lists:foreach(
-      fun(Package) ->
-	    PkgDir = case TmpDir of
-			 [] ->
-		    	     filename:join("debian", Package);
-			 _ ->
-		    	     TmpDir
-		     end,
-	    delsubstvar(Verbosity, Package, "erlang-abi:Depends"),
-	    addsubstvar(Verbosity, Package, "erlang-abi:Depends",
-			"erlang-abi-" ++ ?ABI_VERSION),
-	    delsubstvar(Verbosity, Package, "erlang-base:Depends"),
-	    addsubstvar(Verbosity, Package, "erlang-base:Depends",
-			"erlang-base (>= " ++ ?VERSION ++
-			") | erlang-base-hipe (>= " ++ ?VERSION ++ ")"),
-	    lists:foreach(
-	      fun(Pkg) ->
-		    delsubstvar(Verbosity, Package, "erlang-" ++ Pkg ++ ":Depends"),
-		    addsubstvar(Verbosity, Package, "erlang-" ++ Pkg ++ ":Depends",
-				"erlang-" ++ Pkg ++ " (>= " ++ ?VERSION ++ ")")
-	      end, ?PACKAGES),
-	    Deps = lists:foldl(
-		     fun(M, Acc) ->
-			    case lists:keysearch(M, 1, ?MODULES) of
-				{value, {_, P}} ->
-				    ordsets:add_element(P, Acc);
-				_ ->
-				    io:format("WARNING: Module ~s not found~n", [M]),
-				    Acc
-			    end
-		     end, ordsets:new(),
-			  get_remote_modules(Verbosity, PkgDir, Exclude)),
-	    delsubstvar(Verbosity, Package, "erlang:Depends"),
-	    case join(lists:map(
-			fun(D) ->
-				"${" ++ D ++ ":Depends}"
-			end, ordsets:to_list(Deps)), ", ") of
-		[] ->
-		    ok;
-		Dep ->
-		    % Add substvar only if it isn't empty
-
-		    addsubstvar(Verbosity, Package, "erlang:Depends", Dep)
-	    end
-      end, get_packages(NewOptions)).
-
-% usage/0 --
-%
-%	Print a short usage info.
-%
-% Arguments:
-%	None.
-%
-% Result:
-%	None.
-%
-% Side effects:
-%	Usage is printed to stdout.
-
-usage() ->
-    io:format("Usage: erlang-depends [options]~n"
-	      "Options:~n"
-	      "    -h, --help       Show this help message~n"
-	      "    -v, --verbose    Verbose mode~n"
-	      "    -a, --arch       Act on architecture dependent packages~n"
-	      "    -i, --indep      Act on architecture independent packages~n"
-	      "    -ppackage, --package=package~n"
-	      "                     Act on package \"package\"~n"
-	      "    -Npackage, --no-package=package~n"
-	      "                     Do not act on package \"package\"~n"
-	      "    -Ptmpdir, --tmpdir=tmpdir~n"
-	      "                     Use \"tmpdir\" for package build directory~n").
-
-% get_remote_modules/3
-%
-%	Return a difference between all modules used in the application and
-%	the local modules which dependencies are satisfied automagically.
-%
-% Arguments:
-%	Verbosity   Verbosity level (0 - silence, 1 - print action).
-%	Dir	    Directory where the local BEAM files are to be searched.
-%	Exclude	    Don't take into account files in this list.
-%
-% Result:
-%	The list of remote modules.
-%
-% Side effects:
-%	None.
-
-get_remote_modules(Verbosity, Dir, Exclude) ->
-    Mods = ordsets:to_list(ordsets:subtract(get_modules(Dir, Exclude),
-					    get_local_modules(Dir, Exclude))),
-    if  Verbosity >= 1 ->
-	    lists:foreach(fun(M) ->
-				io:format("Remote module: ~s~n", [M])
-			  end, Mods);
-	true ->
-	    ok
-    end,
-    Mods.
-
-% get_modules/2
-%
-%	Return an ordset of all modules found in the application.
-%
-% Arguments:
-%	Dir	    Directory where the app BEAM files are to be searched.
-%	Exclude	    Don't take into account files in this list.
-%
-% Result:
-%	The ordset of all used modules.
-%
-% Side effects:
-%	None.
-
-get_modules(Dir, Exclude) ->
-    Modules = lists:map(fun({M, _F, _A}) ->
-			    atom_to_list(M)
-			end, get_imports(Dir, Exclude)),
-    ordsets:from_list(Modules).
-
-% get_local_modules/2
-%
-%	Return an ordset of local modules found in the application (it is
-%	constructed from BEAM filenames).
-%
-% Arguments:
-%	Dir	    Directory where the app BEAM files are to be searched.
-%	Exclude	    Don't take into account files in this list.
-%
-% Result:
-%	The ordset of all local modules.
-%
-% Side effects:
-%	None.
-
-get_local_modules(Dir, Exclude) ->
-    Files = lists:filter(fun(File) ->
-				case lists:member(File, Exclude) of
-				    true ->
-					false;
-				    _ ->
-					true
-				end
-			 end, files(Dir, ".*\\.beam$", true)),
-    Basenames = lists:map(fun(File) ->
-				filename:basename(File, ".beam")
-			  end, Files),
-    ordsets:from_list(Basenames).
-
-% get_imports/2
-%
-%	Get imports from all BEAM files in the specified directory and below.
-%
-% Arguments:
-%	Dir	    Directory where to search for BEAM files
-%	Exclude	    Don't take into account files in this list.
-%
-% Results:
-%	A list of imports from all found BEAM files.
-%
-% Side effects:
-%	None.
-
-get_imports(Dir, Exclude) ->
-    Files = lists:filter(fun(File) ->
-				case lists:member(File, Exclude) of
-				    true ->
-					false;
-				    _ ->
-					true
-				end
-			 end, files(Dir, ".*\\.beam$", true)),
-    lists:foldl(fun(File, Acc) ->
-			case beam_lib:chunks(File, [imports]) of
-			    {ok, {_, [{imports, List}]}} ->
-				Acc ++ List;
-			    _ ->
-				Acc
-			end
-		end, [], Files).
-
-% split/2 --
-%
-%	Split string into a list of tokens using the specified delimiter
-%
-% Arguments:
-%	String	    String to split
-%	Delimiter   Character (delimiter)
-%
-% Results:
-%	A list of strings.
-%
-% Side effects:
-%	None.
-
-split(String, Delimiter) ->
-    split(String, Delimiter, none, []).
-
-split([], _Delimiter, Current, Res) ->
-    case Current of
-	none ->
-	    lists:reverse(Res);
-	_ ->
-	    lists:reverse([lists:reverse(Current) | Res])
-    end;
-
-split([Delimiter | Tail], Delimiter, Current, Res) ->
-    case Current of
-	none ->
-	    split(Tail, Delimiter, [], [[] | Res]);
-	_ ->
-	    split(Tail, Delimiter, [], [lists:reverse(Current) | Res])
-    end;
-
-split([Char | Tail], Delimiter, Current, Res) ->
-    case Current of
-	none ->
-	    split(Tail, Delimiter, [Char], Res);
-	_ ->
-	    split(Tail, Delimiter, [Char | Current], Res)
-    end.
-
-% join/2 --
-%
-%	Join string list into a single string using the specified delimiter
-%
-% Arguments:
-%	List	    List of strings to join
-%	Delimiter   Character or character list (delimiter)
-%
-% Results:
-%	A string.
-%
-% Side effects:
-%	None.
-
-join(List, Delimiter) ->
-    join(List, Delimiter, []).
-
-join([], _Delimiter, Res) ->
-    lists:flatten(lists:reverse(Res));
-
-join([String | Tail], Delimiter, []) ->
-    join(Tail, Delimiter, [String]);
-
-join([String | Tail], Delimiter, Res) ->
-    join(Tail, Delimiter, [String, Delimiter | Res]).
-
-% delsubstvar/3 --
-%
-%	Removes substitution variable from a substvar file for a given
-%	package in debian/ directory.
-%
-% Arguments:
-%	Verbosity   Verbosity level (0 - silence, 1 - print action)
-%	Package	    Name of a package (file Package ++ ".substvars" is used).
-%	Substvar    Name of a substitution variable to delete.
-%
-% Results:
-%	ok or halt.
-%
-% Side effects:
-%	File "debian/" ++ Package ++ ".substvars" is overwritten. The
-%	specified variable is deleted. Program is halted in case of error.
-
-delsubstvar(Verbosity, Package, Substvar) ->
-    SubstvarFile = filename:join("debian", Package ++ ".substvars"),
-    if  Verbosity >= 1 ->
-	    io:format("Deleting substvar ~s from file ~s~n", [Substvar, SubstvarFile]);
-	true ->
-	    ok
-    end,
-    case file:read_file(SubstvarFile) of
-	{ok, BinData} ->
-	    StrData = binary_to_list(BinData),
-
-	    % Remove the trailing newline if any
-
-	    Len = string:len(StrData),
-	    StrData2 = case Len - string:rstr(StrData, "\n") of
-			    0 ->
-				string:left(StrData, Len - 1);
-			    _ ->
-				StrData
-		       end,
-	    Tokens = split(StrData2, $\n),
-	    NewTokens = lists:filter(
-			    fun(S) ->
-				    case string:str(S, Substvar ++ "=") of
-					1 ->
-					    false;
-					_ ->
-					    true
-				    end
-			    end, Tokens),
-	    case file:write_file(SubstvarFile, join(NewTokens, $\n) ++ "\n") of
-		ok ->
-		    ok;
-		{error, Error} ->
-		    io:format("ERROR: Can't write ~s: ~s~n", [SubstvarFile, Error]),
-		    halt(1)
-	    end;
-	{error, enoent} ->
-	    ok;
-	{error, Error} ->
-	    io:format("ERROR: Can't read ~s: ~s~n", [SubstvarFile, Error]),
-	    halt(1)
-    end.
-
-% addsubstvar/4 --
-%
-%	Adds a dependency to a substitution variable in a substvar file
-%	for a given package in debian/ directory.
-%
-% Arguments:
-%	Verbosity   Verbosity level (0 - silence, 1 - print action)
-%	Package	    Name of a package (file Package ++ ".substvars" is used).
-%	Substvar    Name of a substitution variable to add/change.
-%	Dependency  An added substitution dependency string.
-%
-% Results:
-%	ok or halt.
-%
-% Side effects:
-%	File "debian/" ++ Package ++ ".substvars" is overwritten. The specified
-%	depandency string is added to the variable. Program is halted in case
-%	of error.
-
-addsubstvar(Verbosity, Package, Substvar, Dependency) ->
-    SubstvarFile = filename:join("debian", Package ++ ".substvars"),
-    if  Verbosity >= 1 ->
-	    io:format("Adding value ~s to substvar ~s in file ~s~n",
-		      [Substvar, Dependency, SubstvarFile]);
-	true ->
-	    ok
-    end,
-    case file:read_file(SubstvarFile) of
-	{ok, BinData} ->
-	    StrData = binary_to_list(BinData),
-
-	    % Remove the trailing newline if any
-
-	    Len = string:len(StrData),
-	    StrData2 = case Len - string:rstr(StrData, "\n") of
-			    0 ->
-				string:left(StrData, Len - 1);
-			    _ ->
-				StrData
-		       end,
-	    Tokens = split(StrData2, $\n),
-	    {NewTokens, Found} = lists:mapfoldl(
-				    fun(S, F) ->
-					    case string:str(S, Substvar ++ "=") of
-						1 ->
-						    {S ++ ", " ++ Dependency, true};
-						_ ->
-						    {S, F}
-					    end
-				    end, false, Tokens),
-	    NewTokens2 = if Found ->
-				NewTokens;
-			    true ->
-				[Substvar ++ "=" ++ Dependency | NewTokens]
-			 end,
-	    case file:write_file(SubstvarFile, join(NewTokens2, $\n) ++ "\n") of
-		ok ->
-		    ok;
-		{error, Error} ->
-		    io:format("Can't write ~s: ~s~n", [SubstvarFile, Error]),
-		    halt(1)
-	    end;
-	{error, enoent} ->
-	    case file:write_file(SubstvarFile, [Substvar, "=", Dependency, "\n"]) of
-		ok ->
-		    ok;
-		{error, Error} ->
-		    io:format("Can't write ~s: ~s~n", [SubstvarFile, Error]),
-		    halt(1)
-	    end;
-	{error, Error} ->
-	    io:format("Can't read ~s: ~s~n", [SubstvarFile, Error]),
-	    halt(1)
-    end.
-
-% get_packages/1 --
-%
-%	Parses debhelper command line options and debian/control file and
-%	returns packages to act on.
-%
-% Arguments:
-%	ArgList	    Dephelper options (only -a, -i, -p, -N options are
-%		    recognised).
-%
-% Results:
-%	{ok, [Package_names]} to work on or error message and halt if
-%	debian/control is unreadable or unknown option is specified.
-%
-% Side effects:
-%	Program is halted in case of error.
-
-get_packages(ArgList) ->
-    ControlFile = filename:join("debian", "control"),
-    case file:read_file(ControlFile) of
-	{ok, BinData} ->
-	    {Arches, Excluded, Explicit} =
-		lists:foldl(fun(Arg, {A1, E1, E2}) ->
-				case Arg of
-				    % Only the last -a or -i option takes
-				    % effect
-
-				    "-a" ->
-					{arch, E1, E2};
-				    "--arch" ->
-					{arch, E1, E2};
-				    "-i" ->
-					{indep, E1, E2};
-				    "--indep" ->
-					{indep, E1, E2};
-				    "-s" ->
-					io:format("Options -s and --same-arch aren't supported yet~n"),
-					halt(1);
-				    "--same-arch" ->
-					io:format("Options -s and --same-arch aren't supported yet~n"),
-					halt(1);
-				    "-p" ++ Package ->
-					{A1, E1, E2 ++ [Package]};
-				    "--package=" ++ Package ->
-					{A1, E1, E2 ++ [Package]};
-				    "-N" ++ Package ->
-					{A1, E1 ++ [Package], E2};
-				    "--no-package=" ++ Package ->
-					{A1, E1 ++ [Package], E2};
-				    _ ->
-					io:format("Unknown option ~s~n", [Arg]),
-					halt(1)
-				end
-			    end, {all, [], []}, ArgList),
-	    StrData = binary_to_list(BinData),
-
-	    % Add an extra empty line for the case if debian/config doesn't have a trailing LF
-
-	    Tokens = split(StrData, $\n) ++ [[]],
-	    {_Arch, _Package, Packages, AllPackages} =
-		lists:foldl(fun(Line, {A, P, Ps, APs}) ->
-				case Line of
-				    "Package: " ++ Pkg ->
-					{A, string:strip(Pkg), Ps, APs};
-				    "Architecture: " ++ Arc ->
-					{string:strip(Arc), P, Ps, APs};
-				    "" ->
-					case P of
-					    "" ->
-						% Two LF in a row or the end of a source package
-
-						{"", "", Ps, APs};
-					    _ ->
-						case lists:member(P, Excluded) of
-						    true ->
-							% The package is excluded by -Npackage
-
-							{"", "", Ps, APs};
-						    _ ->
-							case lists:member(P, Explicit) of
-							    true ->
-								% The package is explicitly required
-
-								{"", "", Ps ++ [P], APs};
-							    _ ->
-								case A of
-								    "all" ->
-									case Arches of
-									    indep ->
-										% Arch independent packages
-										% are requested
-
-										{"", "", Ps ++ [P], APs};
-									    all ->
-										{"", "", Ps, APs ++ [P]};
-									    _ ->
-										{"", "", Ps, APs}
-									end;
-								    _ ->
-									case Arches of
-									    arch ->
-										% Arch dependent packages
-										% are requested
-
-										{"", "", Ps ++ [P], APs};
-									    all ->
-										{"", "", Ps, APs ++ [P]};
-									    _ ->
-										{"", "", Ps, APs}
-									end
-								end
-							end
-						end
-					end;
-				    _ ->
-					{A, P, Ps, APs}
-				end
-			    end, {"", "", [], []}, Tokens),
-	    case {Arches, Packages} of
-		{all, []} ->
-		    % There aren't explicitly requested packages
-
-		    AllPackages;
-		_ ->
-		    Packages
-	    end;
-	{error, Error} ->
-	    io:format("Can't read ~s: ~s~n", [ControlFile, Error]),
-	    halt(1)
-    end.
-
-% files/3 --
-%
-%	Return all files in a directory which names match a given expression.
-%	(This procedure is borrowed from http://erlang.org/examples/examples-2.0.html
-%	and a bit modified.)
-%
-% Arguments:
-%	Dir	    Directory from which to serach
-%	Re	    Regular expression for filename matching
-%	Recursive   Whether to search for files recursively
-%
-% Result:
-%	A list of filenames.
-%
-% Side effects:
-%	None.
-
-files(Dir, Re, Recursive) ->
-    find_files(Dir, Re, Recursive, []).
-
-find_files(Dir, Re, Recursive, L) ->
-    case file:list_dir(Dir) of
-	{ok, Files} ->
-	    find_files(Files, Dir, Re, Recursive, L);
-	{error, _} ->
-	    L
-    end.
-
-find_files([File | T], Dir, Re, Recursive, L) ->
-    FullName = filename:join(Dir, File),
-    case file_type(FullName) of
-	regular ->
-	    case re:run(FullName, Re) of
-		{match, _}  ->
-		    find_files(T, Dir, Re, Recursive, [FullName | L]);
-		_ ->
-		    find_files(T, Dir, Re, Recursive, L)
-	    end;
-	directory ->
-	    case Recursive of
-		true ->
-		    L1 = find_files(FullName, Re, Recursive, L),
-		    find_files(T, Dir, Re, Recursive, L1);
-		false ->
-		    find_files(T, Dir, Re, Recursive, L)
-	    end;
-	error ->
-	    find_files(T, Dir, Re, Recursive, L)
-    end;
-
-find_files([], _, _, _, L) ->
-    L.
-
-% file_type/1 --
-%
-%	Return file type (regular, directory, or error) for a given filename.
-%	(This procedure is borrowed from http://erlang.org/examples/examples-2.0.html
-%	and a bit modified.)
-%
-% Arguments:
-%	File	    Filename to get type.
-%
-% Result:
-%	A file type.
-%
-% Side effects:
-%	None.
-
-file_type(File) ->
-    case file:read_file_info(File) of
-	{ok, FileInfo} ->
-	    case FileInfo#file_info.type of
-		regular ->
-		    regular;
-		directory ->
-		    directory;
-		_ ->
-		    error
-	    end;
-	_ ->
-	    error
-    end.
-
-% vim:ft=erlang
 
=== modified file 'debian/erlang-dev.manpages'
--- debian/erlang-dev.manpages	2006-12-03 17:07:44 +0000
+++ debian/erlang-dev.manpages	2009-12-22 03:23:51 +0000
@@ -1,1 +1,1 @@
-debian/erlang-depends.1
+debian/manpages/erlang-depends.1
 
=== modified file 'debian/erlang-dialyzer.manpages'
--- debian/erlang-dialyzer.manpages	2009-04-10 16:32:04 +0000
+++ debian/erlang-dialyzer.manpages	2009-12-22 03:23:49 +0000
@@ -1,1 +1,1 @@
-debian/manpages/dialyzer.1
+debian/tmp/usr/share/man/man1/dialyzer.1
 
=== added file 'debian/erlang-manpages.manpages'
--- debian/erlang-manpages.manpages	1970-01-01 00:00:00 +0000
+++ debian/erlang-manpages.manpages	2009-12-22 03:23:51 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man3/*
+debian/tmp/usr/share/man/man4/*
+debian/tmp/usr/share/man/man6/*
 
=== added file 'debian/erlang-manpages.postinst'
--- debian/erlang-manpages.postinst	1970-01-01 00:00:00 +0000
+++ debian/erlang-manpages.postinst	2009-12-22 03:23:49 +0000
@@ -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 file 'debian/erlang-webtool.manpages'
--- debian/erlang-webtool.manpages	2009-04-10 16:32:04 +0000
+++ debian/erlang-webtool.manpages	2009-12-22 03:23:48 +0000
@@ -1,1 +1,1 @@
-debian/manpages/start_webtool.1
+debian/tmp/usr/share/man/man1/start_webtool.1
 
=== added file 'debian/lintian/erlang-erl-docgen.lintian-override'
--- debian/lintian/erlang-erl-docgen.lintian-override	1970-01-01 00:00:00 +0000
+++ debian/lintian/erlang-erl-docgen.lintian-override	2009-12-22 03:23:48 +0000
@@ -0,0 +1,1 @@
+erlang-erl-docgen: image-file-in-usr-lib
 
=== removed file 'debian/manpages/dialyzer.1'
--- debian/manpages/dialyzer.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/dialyzer.1	1970-01-01 00:00:00 +0000
@@ -1,287 +0,0 @@
-.TH dialyzer 1 "dialyzer  2.0.0" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-dialyzer \- The Dialyzer, a DIscrepancy AnalYZer for ERlang programs
-.SH DESCRIPTION
-.LP
-The Dialyzer is a static analysis tool that identifies software discrepancies such as definite type errors, code which has become dead or unreachable due to some programming error, unnecessary tests, etc\&. in single Erlang modules or entire (sets of) applications\&. Dialyzer starts its analysis from either debug-compiled BEAM bytecode or from Erlang source code\&. The file and line number of a discrepancy is reported along with an indication of what the discrepancy is about\&. Dialyzer bases its analysis on the concept of success typings which allows for sound warnings (no false positives)\&.
-.LP
-Read more about Dialyzer and about how to use it from the GUI in Dialyzer User\&'s Guide\&.
-
-.SH USING THE DIALYZER FROM THE COMMAND LINE
-.LP
-Dialyzer also has a command line version for automated use\&. Below is a brief description of the list of its options\&. The same information can be obtained by writing
-
-.nf
-      dialyzer --help
-    
-.fi
-.LP
-in a shell\&. Please refer to the GUI description for more details on the operation of Dialyzer\&.
-.LP
-The exit status of the command line version is:
-
-.nf
-      0 - No problems were encountered during the analysis and no
-          warnings were emitted\&.
-      1 - Problems were encountered during the analysis\&.
-      2 - No problems were encountered, but warnings were emitted\&.
-    
-.fi
-.LP
-Usage:
-
-.nf
-   dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
-                [-pa dir]* [--plt plt] [-Ddefine]* [-I include_dir]* 
-                [--output_plt file] [-Wwarn]* [--src] 
-                [-c applications] [-r applications] [-o outfile]
-                [--build_plt] [--add_to_plt] [--remove_from_plt]
-                [--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
-    
-.fi
-.LP
-Options:
-.RS 2
-.TP 4
-.B
-\fI-c applications\fR(or \fI--command-line applications\fR):
-use Dialyzer from the command line (no GUI) to detect defects in the specified applications (directories or \fI\&.erl\fR or \fI\&.beam\fR files)
-.TP 4
-.B
-\fI-r applications\fR:
-same as \fI-c\fR only that directories are searched recursively for subdirectories containing \fI\&.erl\fR or \fI\&.beam\fR files (depending on the type of analysis)
-.TP 4
-.B
-\fI-o outfile\fR(or \fI--output outfile\fR):
-when using Dialyzer from the command line, send the analysis results in the specified \fIoutfile\fR rather than in stdout
-.TP 4
-.B
-\fI--src\fR:
-overide the default, which is to analyze debug compiled BEAM bytecode, and analyze starting from Erlang source code instead
-.TP 4
-.B
-\fI--raw\fR:
-When using Dialyzer from the command line, output the raw analysis results (Erlang terms) instead of the formatted result\&. The raw format is easier to post-process (for instance, to filter warnings or to output HTML pages)\&.
-.TP 4
-.B
-\fI-Dname\fR(or \fI-Dname=value\fR):
-when analyzing from source, pass the define to Dialyzer (**)
-.TP 4
-.B
-\fI-I include_dir\fR:
-when analyzing from source, pass the \fIinclude_dir\fR to Dialyzer (**)
-.TP 4
-.B
-\fI-pa dir\fR:
-Include \fIdir\fR in the path for Erlang\&. Useful when analyzing files that have \fI-include_lib()\fR directives\&.
-.TP 4
-.B
-\fI--output_plt file\fR:
-Store the PLT at the specified location after building it\&.
-.TP 4
-.B
-\fI--plt plt\fR:
-Use the specified plt as the initial persistent lookup table\&.
-.TP 4
-.B
-\fI-Wwarn\fR:
-a family of option which selectively turn on/off warnings\&. (for help on the names of warnings use \fIdialyzer -Whelp\fR)
-.TP 4
-.B
-\fI--shell\fR:
-do not disable the Erlang shell while running the GUI
-.TP 4
-.B
-\fI--version (or -v)\fR:
-prints the Dialyzer version and some more information and exits
-.TP 4
-.B
-\fI--help (or -h)\fR:
-prints this message and exits
-.TP 4
-.B
-\fI--quiet (or -q)\fR:
-makes Dialyzer a bit more quiet
-.TP 4
-.B
-\fI--verbose\fR:
-makes Dialyzer a bit more verbose
-.TP 4
-.B
-\fI--check_plt\fR:
-Only checks if the initial PLT is up to date and rebuilds it if this is not the case
-.TP 4
-.B
-\fI--no_check_plt (or -n)\fR:
-Skip the PLT integrity check when running Dialyzer\&. Useful when working with installed PLTs that never change\&.
-.TP 4
-.B
-\fI--build_plt\fR:
-The analysis starts from an empty PLT and creates a new one from the files specified with -c and -r\&. Only works for beam files\&. Use --plt or --output_plt to override the default PLT location\&.
-.TP 4
-.B
-\fI--add_to_plt\fR:
-The PLT is extended to also include the files specified with -c and -r\&. Use --plt to specify wich PLT to start from, and --output_plt to specify where to put the PLT\&. Note that the analysis might include files from the PLT if they depend on the new files\&. This option only works with beam files\&.
-.TP 4
-.B
-\fI--remove_from_plt\fR:
-The information from the files specified with -c and -r is removed from the PLT\&. Note that this may cause a re-analysis of the remaining dependent files\&.
-.TP 4
-.B
-\fI--get_warnings\fR:
-Makes Dialyzer emit warnings even when manipulating the PLT\&. Only emits warnings for files that are actually analyzed\&. The default is to not emit any warnings when manipulating the PLT\&. This option has no effect when performing a normal analysis\&.
-.RE
-.SS Note:
-.LP
-* denotes that multiple occurrences of these options are possible\&.
-.LP
-** options \fI-D\fR and \fI-I\fR work both from command-line and in the Dialyzer GUI; the syntax of defines and includes is the same as that used by \fIerlc\fR\&.
-
-.LP
-Warning options:
-.RS 2
-.TP 4
-.B
-\fI-Wno_return\fR:
-Suppress warnings for functions of no return\&.
-.TP 4
-.B
-\fI-Wno_unused\fR:
-Suppress warnings for unused functions\&.
-.TP 4
-.B
-\fI-Wno_improper_lists\fR:
-Suppress warnings for construction of improper lists\&.
-.TP 4
-.B
-\fI-Wno_fun_app\fR:
-Suppress warnings for fun applications that will fail\&.
-.TP 4
-.B
-\fI-Wno_match\fR:
-Suppress warnings for patterns that are unused or cannot match\&.
-.TP 4
-.B
-\fI-Werror_handling\fR***:
-Include warnings for functions that only return by means of an exception\&.
-.TP 4
-.B
-\fI-Wunmatched_returns\fR***:
-Include warnings for function calls which ignore a structured return value or do not match against one of many possible return value(s)\&.
-.TP 4
-.B
-\fI-Wunderspecs\fR***:
-Warn about underspecified functions (the -spec is strictly more allowing than the success typing)
-.TP 4
-.B
-\fI-Woverspecs\fR***:
-Warn about overspecified functions (the -spec is strictly less allowing than the success typing)
-.TP 4
-.B
-\fI-Wspecdiffs\fR***:
-Warn when the -spec is different than the success typing
-.RE
-.SS Note:
-.LP
-*** These are options that turn on warnings rather than turning them off\&.
-
-.SH USING THE DIALYZER FROM ERLANG
-.LP
-You can also use Dialyzer directly from Erlang\&. Both the GUI and the command line version are available\&. The options are similar to the ones given from the command line, so please refer to the sections above for a description of these\&.
-.SH EXPORTS
-.LP
-.B
-gui() -> ok | {error, Msg}
-.br
-.B
-gui(OptList) -> ok | {error, Msg}
-.br
-.RS
-.TP
-Types
-OptList -- see below
-.br
-.RE
-.RS
-.LP
-Dialyzer GUI version\&.
-
-.nf
-OptList  : [Option]
-Option   : {files,          [Filename : string()]}
-         | {files_rec,      [DirName : string()]}
-         | {defines,        [{Macro: atom(), Value : term()}]}
-         | {from,           src_code | byte_code} %% Defaults to byte_code
-         | {init_plt,       FileName : string()}  %% If changed from default
-         | {include_dirs,   [DirName : string()]} 
-         | {output_file,    FileName : string()}
-         | {output_plt,     FileName :: string()}
-         | {analysis_type,  \&'success_typings\&' | \&'plt_add\&' | \&'plt_build\&' | \&'plt_check\&' | \&'plt_remove\&'}
-         | {warnings,       [WarnOpts]}
-         | {get_warnings,   bool()}
-
-WarnOpts : no_return
-         | no_unused
-         | no_improper_lists
-         | no_fun_app
-         | no_match
-         | no_fail_call
-         | error_handling
-         | unmatched_returns
-         | overspecs
-         | underspecs
-         | specdiffs
-        
-.fi
-.RE
-.LP
-.B
-run(OptList) -> Warnings
-.br
-.RS
-.TP
-Types
-OptList -- see gui/0, 1
-.br
-Warnings -- see below 
-.br
-.RE
-.RS
-.LP
-Dialyzer command line version\&.
-
-.nf
-Warnings :: [{Tag, Id, Msg}]
-Tag : \&'warn_return_no_exit\&' | \&'warn_return_only_exit\&'
-         | \&'warn_not_called\&' | \&'warn_non_proper_list\&'
-         | \&'warn_fun_app\&' | \&'warn_matching\&'
-         | \&'warn_failing_call\&' | \&'warn_contract_types\&'
-         | \&'warn_contract_syntax\&' | \&'warn_contract_not_equal\&'
-         | \&'warn_contract_subtype\&' | \&'warn_contract_supertype\&'
-Id = {File :: string(), Line :: integer()}
-Msg = msg() -- Undefined
-
-.fi
-.RE
-.LP
-.B
-format_warning(Msg) -> string()
-.br
-.RS
-.TP
-Types
-Msg = {Tag, Id, msg()} -- See run/1
-.br
-.RE
-.RS
-.LP
-Get a string from warnings as returned by dialyzer:run/1\&.
-.RE
-.LP
-.B
-plt_info(string()) -> {\&'ok\&', [{atom(), any()}]} | {\&'error\&', atom()}
-.br
-.RS
-.LP
-Returns information about the specified plt\&.
-.RE
 
=== removed file 'debian/manpages/epmd.1'
--- debian/manpages/epmd.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/epmd.1	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-.TH epmd 1 "erts  5.7.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-epmd \- Erlang Port Mapper Daemon 
-.SH DESCRIPTION
-.LP
-This daemon acts as a name server on all hosts involved in distributed Erlang computations\&. When an Erlang node starts, the node has a name and it obtains an address from the host OS kernel\&. The name and the address are sent to the \fIepmd\fR daemon running on the local host\&. In a TCP/IP environment, the address consists of the IP address and a port number\&. The name of the node is an atom on the form of \fIName@Node\fR\&. The job of the \fIepmd\fR daemon is to keep track of which node name listens on which address\&. Hence, \fIepmd\fR map symbolic node names to machine addresses\&.
-.LP
-The daemon is started automatically by the Erlang start-up script\&.
-.LP
-The program \fIepmd\fR can also be used for a variety of other purposes, for example checking the DNS (Domain Name System) configuration of a host\&.
-
-.SH EXPORTS
-.LP
-.B
-epmd [-daemon] 
-.br
-.RS
-.LP
-Starts a name server as a daemon\&. If it has no argument, the \fIepmd\fR runs as a normal program with the controlling terminal of the shell in which it is started\&. Normally, it should run as a daemon\&.
-.RE
-.LP
-.B
-epmd -names
-.br
-.RS
-.LP
-Requests the names of the local Erlang nodes \fIepmd\fR has registered\&.
-.RE
-.LP
-.B
-epmd -kill
-.br
-.RS
-.LP
-Kills the \fIepmd\fR process\&.
-.RE
-.LP
-.B
-epmd -help
-.br
-.RS
-.LP
-Write short info about the usage including some debugging options not listed here\&.
-.RE
-.SH ENVIRONMENT VARIABLES
-.RS 2
-.TP 4
-.B
-\fIERL_EPMD_PORT\fR:
-This environment variable can contain the port number epmd will use\&. The default port will work fine in most cases\&. A different port can be specified to allow several instances of epmd, representing independant clusters of nodes, to co-exist on the same host\&. All nodes in a cluster must use the same epmd port number\&.
-.RE
-.SH LOGGING
-.LP
-On some operating systems \fIsyslog\fR will be used for error reporting when epmd runs as an daemon\&. To enable the error logging you have to edit /etc/syslog\&.conf() file and add an entry
-
-.nf
-      !epmd
-      *\&.*<TABs>/var/log/epmd\&.log
-    
-.fi
-.LP
-where <TABs> are at least one real tab character\&. Spaces will silently be ignored\&. 
 
=== removed file 'debian/manpages/erl.1'
--- debian/manpages/erl.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/erl.1	1970-01-01 00:00:00 +0000
@@ -1,752 +0,0 @@
-.TH erl 1 "erts  5.7.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-erl \- The Erlang Emulator
-.SH DESCRIPTION
-.LP
-The \fIerl\fR program starts an Erlang runtime system\&. The exact details (for example, whether \fIerl\fR is a script or a program and which other programs it calls) are system-dependent\&.
-.LP
-Windows users probably wants to use the \fIwerl\fR program instead, which runs in its own window with scrollbars and supports command-line editing\&. The \fIerl\fR program on Windows provides no line editing in its shell, and on Windows 95 there is no way to scroll back to text which has scrolled off the screen\&. The \fIerl\fR program must be used, however, in pipelines or if you want to redirect standard input or output\&.
-
-.SH EXPORTS
-.LP
-.B
-erl <arguments>
-.br
-.RS
-.LP
-Starts an Erlang runtime system\&.
-.LP
-The arguments can be divided into \fIemulator flags\fR, \fIflags\fR and \fIplain arguments\fR:
-.RS 2
-.TP 2
-*
-Any argument starting with the character \fI+\fR is interpreted as an emulator flag\&.
-.RS 2
-.LP
-
-.LP
-As indicated by the name, emulator flags controls the behavior of the emulator\&.
-.RE
-.TP 2
-*
-Any argument starting with the character \fI-\fR (hyphen) is interpreted as a flag which should be passed to the Erlang part of the runtime system, more specifically to the \fIinit\fR system process, see init(3erl)\&.
-.RS 2
-.LP
-
-.LP
-The \fIinit\fR process itself interprets some of these flags, the \fIinit flags\fR\&. It also stores any remaining flags, the \fIuser flags\fR\&. The latter can be retrieved by calling \fIinit:get_argument/1\fR\&.
-.LP
-
-.LP
-It can be noted that there are a small number of "-" flags which now actually are emulator flags, see the description below\&.
-.RE
-.TP 2
-*
-Plain arguments are not interpreted in any way\&. They are also stored by the \fIinit\fR process and can be retrieved by calling \fIinit:get_plain_arguments/0\fR\&. Plain arguments can occur before the first flag, or after a \fI--\fR flag\&. Additionally, the flag \fI-extra\fR causes everything that follows to become plain arguments\&.
-.RE
-.LP
-Example:
-
-.nf
-% erl +W w -sname arnie +R 9 -s my_init -extra +bertie
-
-(arnie@host)1> init:get_argument(sname)\&.
-
-{ok,[["arnie"]]}
-(arnie@host)2> init:get_plain_arguments()\&.
-
-["+bertie"]
-.fi
-.LP
-Here \fI+W w\fR and \fI+R 9\fR are emulator flags\&. \fI-s my_init\fR is an init flag, interpreted by \fIinit\fR\&. \fI-sname arnie\fR is a user flag, stored by \fIinit\fR\&. It is read by Kernel and will cause the Erlang runtime system to become distributed\&. Finally, everything after \fI-extra\fR (that is, \fI+bertie\fR) is considered as plain arguments\&.
-
-.nf
-% erl -myflag 1
-
-1> init:get_argument(myflag)\&.
-
-{ok,[["1"]]}
-2> init:get_plain_arguments()\&.
-
-[]
-.fi
-.LP
-Here the user flag \fI-myflag 1\fR is passed to and stored by the \fIinit\fR process\&. It is a user defined flag, presumably used by some user defined application\&.
-.RE
-.SH FLAGS
-.LP
-In the following list, init flags are marked (init flag)\&. Unless otherwise specified, all other flags are user flags, for which the values can be retrieved by calling \fIinit:get_argument/1\fR\&. Note that the list of user flags is not exhaustive, there may be additional, application specific flags which instead are documented in the corresponding application documentation\&.
-.RS 2
-.TP 4
-.B
-\fI--\fR(init flag):
-Everything following \fI--\fR up to the next flag (\fI-flag\fR or \fI+flag\fR) is considered plain arguments and can be retrieved using \fIinit:get_plain_arguments/0\fR\&.
-.TP 4
-.B
-\fI-Application Par Val\fR:
-Sets the application configuration parameter \fIPar\fR to the value \fIVal\fR for the application \fIApplication\fR, see app(4) and application(3erl)\&.
-.TP 4
-.B
-\fI-args_file FileName\fR:
- 
-.RS 4
-.LP
-Command line arguments are read from the file \fIFileName\fR\&. The arguments read from the file replace the \&'\fI-args_file FileName\fR\&' flag on the resulting command line\&.
-.LP
-
-.LP
-The file \fIFileName\fR should be a plain text file and may contain comments and command line arguments\&. A comment begins with a # character and continues until next end of line character\&. Backslash (\e) is used as quoting character\&. All command line arguments accepted by \fIerl\fR are allowed, also the \fI-args_file FileName\fR flag\&. Be careful not to cause circular dependencies between files containing the \fI-args_file\fR flag, though\&.
-.LP
-
-.LP
-The \fI-extra\fR flag is treated specially\&. Its scope ends at the end of the file\&. Arguments following an \fI-extra\fR flag are moved on the command line into the \fI-extra\fR section, i\&.e\&. the end of the command line following after an \fI-extra\fR flag\&.
-.RE
-.TP 4
-.B
-\fI-async_shell_start\fR:
-The initial Erlang shell does not read user input until the system boot procedure has been completed (Erlang 5\&.4 and later)\&. This flag disables the start synchronization feature and lets the shell start in parallel with the rest of the system\&.
-.TP 4
-.B
-\fI-boot File\fR:
-Specifies the name of the boot file, \fIFile\&.boot\fR, which is used to start the system\&. See init(3erl)\&. Unless \fIFile\fR contains an absolute path, the system searches for \fIFile\&.boot\fR in the current and \fI$ROOT/bin\fR directories\&.
-.RS 4
-.LP
-
-.LP
-Defaults to \fI$ROOT/bin/start\&.boot\fR\&.
-.RE
-.TP 4
-.B
-\fI-boot_var Var Dir\fR:
-If the boot script contains a path variable \fIVar\fR other than \fI$ROOT\fR, this variable is expanded to \fIDir\fR\&. Used when applications are installed in another directory than \fI$ROOT/lib\fR, see systools:make_script/1,2\&.
-.TP 4
-.B
-\fI-code_path_cache\fR:
-Enables the code path cache of the code server, see code(3erl)\&.
-.TP 4
-.B
-\fI-compile Mod1 Mod2 \&.\&.\&.\fR:
-Compiles the specified modules and then terminates (with non-zero exit code if the compilation of some file did not succeed)\&. Implies \fI-noinput\fR\&. Not recommended - use erlc instead\&.
-.TP 4
-.B
-\fI-config Config\fR:
-Specifies the name of a configuration file, \fIConfig\&.config\fR, which is used to configure applications\&. See app(4) and application(3erl)\&.
-.TP 4
-.B
-\fI-connect_all false\fR:
- 
-.RS 4
-.LP
-If this flag is present, \fIglobal\fR will not maintain a fully connected network of distributed Erlang nodes, and then global name registration cannot be used\&. See global(3erl)\&.
-.RE
-.TP 4
-.B
-\fI-cookie Cookie\fR:
-Obsolete flag without any effect and common misspelling for \fI-setcookie\fR\&. Use \fI-setcookie\fR instead\&.
-.TP 4
-.B
-\fI-detached\fR:
-Starts the Erlang runtime system detached from the system console\&. Useful for running daemons and backgrounds processes\&.
-.TP 4
-.B
-\fI-emu_args\fR:
-Useful for debugging\&. Prints out the actual arguments sent to the emulator\&.
-.TP 4
-.B
-\fI-env Variable Value\fR:
-Sets the host OS environment variable \fIVariable\fR to the value \fIValue\fR for the Erlang runtime system\&. Example:
-.RS 4
-.LP
-
-
-.nf
-% erl -env DISPLAY gin:0
-
-.fi
-.LP
-
-.LP
-In this example, an Erlang runtime system is started with the \fIDISPLAY\fR environment variable set to \fIgin:0\fR\&.
-.RE
-.TP 4
-.B
-\fI-eval Expr\fR(init flag):
-Makes \fIinit\fR evaluate the expression \fIExpr\fR, see init(3erl)\&.
-.TP 4
-.B
-\fI-extra\fR(init flag):
-Everything following \fI-extra\fR is considered plain arguments and can be retrieved using \fIinit:get_plain_arguments/0\fR\&.
-.TP 4
-.B
-\fI-heart\fR:
-Starts heart beat monitoring of the Erlang runtime system\&. See heart(3erl)\&.
-.TP 4
-.B
-\fI-hidden\fR:
-Starts the Erlang runtime system as a hidden node, if it is run as a distributed node\&. Hidden nodes always establish hidden connections to all other nodes except for nodes in the same global group\&. Hidden connections are not published on neither of the connected nodes, i\&.e\&. neither of the connected nodes are part of the result from \fInodes/0\fR on the other node\&. See also hidden global groups, global_group(3erl)\&.
-.TP 4
-.B
-\fI-hosts Hosts\fR:
-Specifies the IP addresses for the hosts on which Erlang boot servers are running, see erl_boot_server(3erl)\&. This flag is mandatory if the \fI-loader inet\fR flag is present\&.
-.RS 4
-.LP
-
-.LP
-The IP addresses must be given in the standard form (four decimal numbers separated by periods, for example \fI"150\&.236\&.20\&.74"\fR\&. Hosts names are not acceptable, but a broadcast address (preferably limited to the local network) is\&.
-.RE
-.TP 4
-.B
-\fI-id Id\fR:
-Specifies the identity of the Erlang runtime system\&. If it is run as a distributed node, \fIId\fR must be identical to the name supplied together with the \fI-sname\fR or \fI-name\fR flag\&.
-.TP 4
-.B
-\fI-init_debug\fR:
-Makes \fIinit\fR write some debug information while interpreting the boot script\&.
-.TP 4
-.B
-\fI-instr\fR(emulator flag):
- 
-.RS 4
-.LP
-Selects an instrumented Erlang runtime system (virtual machine) to run, instead of the ordinary one\&. When running an instrumented runtime system, some resource usage data can be obtained and analysed using the module \fIinstrument\fR\&. Functionally, it behaves exactly like an ordinary Erlang runtime system\&.
-.RE
-.TP 4
-.B
-\fI-loader Loader\fR:
-Specifies the method used by \fIerl_prim_loader\fR to load Erlang modules into the system\&. See erl_prim_loader(3erl)\&. Two \fILoader\fR methods are supported, \fIefile\fR and \fIinet\fR\&. \fIefile\fR means use the local file system, this is the default\&. \fIinet\fR means use a boot server on another machine, and the \fI-id\fR, \fI-hosts\fR and \fI-setcookie\fR flags must be specified as well\&. If \fILoader\fR is something else, the user supplied \fILoader\fR port program is started\&.
-.TP 4
-.B
-\fI-make\fR:
-Makes the Erlang runtime system invoke \fImake:all()\fR in the current working directory and then terminate\&. See make(3erl)\&. Implies \fI-noinput\fR\&.
-.TP 4
-.B
-\fI-man Module\fR:
-Displays the manual page for the Erlang module \fIModule\fR\&. Only supported on Unix\&.
-.TP 4
-.B
-\fI-mode interactive | embedded\fR:
-Indicates if the system should load code dynamically (\fIinteractive\fR), or if all code should be loaded during system initialization (\fIembedded\fR), see code(3erl)\&. Defaults to \fIinteractive\fR\&.
-.TP 4
-.B
-\fI-name Name\fR:
-Makes the Erlang runtime system into a distributed node\&. This flag invokes all network servers necessary for a node to become distributed\&. See net_kernel(3erl)\&. It is also ensured that \fIepmd\fR runs on the current host before Erlang is started\&. See epmd(1)\&.
-.RS 4
-.LP
-
-.LP
-The name of the node will be \fIName@Host\fR, where \fIHost\fR is the fully qualified host name of the current host\&. For short names, use the \fI-sname\fR flag instead\&.
-.RE
-.TP 4
-.B
-\fI-noinput\fR:
-Ensures that the Erlang runtime system never tries to read any input\&. Implies \fI-noshell\fR\&.
-.TP 4
-.B
-\fI-noshell\fR:
-Starts an Erlang runtime system with no shell\&. This flag makes it possible to have the Erlang runtime system as a component in a series of UNIX pipes\&.
-.TP 4
-.B
-\fI-nostick\fR:
-Disables the sticky directory facility of the Erlang code server, see code(3erl)\&.
-.TP 4
-.B
-\fI-oldshell\fR:
-Invokes the old Erlang shell from Erlang 3\&.3\&. The old shell can still be used\&.
-.TP 4
-.B
-\fI-pa Dir1 Dir2 \&.\&.\&.\fR:
-Adds the specified directories to the beginning of the code path, similar to \fIcode:add_pathsa/1\fR\&. See code(3erl)\&. As an alternative to \fI-pa\fR, if several directories are to be prepended to the code and the directories have a common parent directory, that parent directory could be specified in the \fIERL_LIBS\fR environment variable\&. See code(3erl)\&.
-.TP 4
-.B
-\fI-pz Dir1 Dir2 \&.\&.\&.\fR:
-Adds the specified directories to the end of the code path, similar to \fIcode:add_pathsz/1\fR\&. See code(3erl)\&.
-.TP 4
-.B
-\fI-remsh Node\fR:
-Starts Erlang with a remote shell connected to \fINode\fR\&.
-.TP 4
-.B
-\fI-rsh Program\fR:
-Specifies an alternative to \fIrsh\fR for starting a slave node on a remote host\&. See slave(3erl)\&.
-.TP 4
-.B
-\fI-run Mod [Func [Arg1, Arg2, \&.\&.\&.]]\fR(init flag):
-Makes \fIinit\fR call the specified function\&. \fIFunc\fR defaults to \fIstart\fR\&. If no arguments are provided, the function is assumed to be of arity 0\&. Otherwise it is assumed to be of arity 1, taking the list \fI[Arg1, Arg2, \&.\&.\&.]\fR as argument\&. All arguments are passed as strings\&. See init(3erl)\&.
-.TP 4
-.B
-\fI-s Mod [Func [Arg1, Arg2, \&.\&.\&.]]\fR(init flag):
-Makes \fIinit\fR call the specified function\&. \fIFunc\fR defaults to \fIstart\fR\&. If no arguments are provided, the function is assumed to be of arity 0\&. Otherwise it is assumed to be of arity 1, taking the list \fI[Arg1, Arg2, \&.\&.\&.]\fR as argument\&. All arguments are passed as atoms\&. See init(3erl)\&.
-.TP 4
-.B
-\fI-setcookie Cookie\fR:
-Sets the magic cookie of the node to \fICookie\fR, see erlang:set_cookie/2\&.
-.TP 4
-.B
-\fI-shutdown_time Time\fR:
-Specifies how long time (in milliseconds) the \fIinit\fR process is allowed to spend shutting down the system\&. If \fITime\fR ms have elapsed, all processes still existing are killed\&. Defaults to \fIinfinity\fR\&.
-.TP 4
-.B
-\fI-sname Name\fR:
-Makes the Erlang runtime system into a distributed node, similar to \fI-name\fR, but the host name portion of the node name \fIName@Host\fR will be the short name, not fully qualified\&.
-.RS 4
-.LP
-
-.LP
-This is sometimes the only way to run distributed Erlang if the DNS (Domain Name System) is not running\&. There can be no communication between nodes running with the \fI-sname\fR flag and those running with the \fI-name\fR flag, as node names must be unique in distributed Erlang systems\&.
-.RE
-.TP 4
-.B
-\fI-smp [enable|auto|disable]\fR:
- 
-.RS 4
-.LP
-\fI-smp enable\fR and \fI-smp\fR starts the Erlang runtime system with SMP support enabled\&. This may fail if no runtime system with SMP support is available\&. \fI-smp auto\fR starts the Erlang runtime system with SMP support enabled if it is available and more than one logical processor are detected\&. \fI-smp disable\fR starts a runtime system without SMP support\&. By default \fI-smp auto\fR will be used unless a conflicting parameter has been passed, then \fI-smp disable\fR will be used\&. Currently only the \fI-hybrid\fR parameter conflicts with \fI-smp auto\fR\&.
-.LP
-
-.LP
-\fINOTE\fR: The runtime system with SMP support will not be available on all supported platforms\&. See also the +S flag\&.
-.RE
-.TP 4
-.B
-\fI-version\fR(emulator flag):
-Makes the emulator print out its version number\&. The same as \fIerl +V\fR\&.
-.RE
-.SH EMULATOR FLAGS
-.LP
-\fIerl\fR invokes the code for the Erlang emulator (virtual machine), which supports the following flags:
-.RS 2
-.TP 4
-.B
-\fI+a size\fR:
- 
-.RS 4
-.LP
-Suggested stack size, in kilowords, for threads in the async-thread pool\&. Valid range is 16-8192 kilowords\&. The default suggested stack size is 16 kilowords, i\&.e, 64 kilobyte on 32-bit architectures\&. This small default size has been chosen since the amount of async-threads might be quite large\&. The default size is enough for drivers delivered with Erlang/OTP, but might not be sufficiently large for other dynamically linked in drivers that use the driver_async() functionality\&. Note that the value passed is only a suggestion, and it might even be ignored on some platforms\&.
-.RE
-.TP 4
-.B
-\fI+A size\fR:
- 
-.RS 4
-.LP
-Sets the number of threads in async thread pool, valid range is 0-1024\&. Default is 0\&.
-.RE
-.TP 4
-.B
-\fI+B [c | d | i]\fR:
-The \fIc\fR option makes \fICtrl-C\fR interrupt the current shell instead of invoking the emulator break handler\&. The \fId\fR option (same as specifying \fI+B\fR without an extra option) disables the break handler\&. The \fIi\fR option makes the emulator ignore any break signal\&.
-.RS 4
-.LP
-
-.LP
-If the \fIc\fR option is used with \fIoldshell\fR on Unix, \fICtrl-C\fR will restart the shell process rather than interrupt it\&.
-.LP
-
-.LP
-Note that on Windows, this flag is only applicable for \fIwerl\fR, not \fIerl\fR (\fIoldshell\fR)\&. Note also that \fICtrl-Break\fR is used instead of \fICtrl-C\fR on Windows\&.
-.RE
-.TP 4
-.B
-\fI+c\fR:
-Disable compensation for sudden changes of system time\&.
-.RS 4
-.LP
-
-.LP
-Normally, \fIerlang:now/0\fR will not immediately reflect sudden changes in the system time, in order to keep timers (including \fIreceive-after\fR) working\&. Instead, the time maintained by \fIerlang:now/0\fR is slowly adjusted towards the new system time\&. (Slowly means in one percent adjustments; if the time is off by one minute, the time will be adjusted in 100 minutes\&.)
-.LP
-
-.LP
-When the \fI+c\fR option is given, this slow adjustment will not take place\&. Instead \fIerlang:now/0\fR will always reflect the current system time\&. Note that timers are based on \fIerlang:now/0\fR\&. If the system time jumps, timers then time out at the wrong time\&.
-.RE
-.TP 4
-.B
-\fI+d\fR:
-If the emulator detects an internal error (or runs out of memory), it will by default generate both a crash dump and a core dump\&. The core dump will, however, not be very useful since the content of process heaps is destroyed by the crash dump generation\&.
-.RS 4
-.LP
-
-.LP
-The \fI+d\fR option instructs the emulator to only produce a core dump and no crash dump if an internal error is detected\&.
-.LP
-
-.LP
-Calling \fIerlang:halt/1\fR with a string argument will still produce a crash dump\&.
-.RE
-.TP 4
-.B
-\fI+h Size\fR:
-Sets the default heap size of processes to the size \fISize\fR\&.
-.TP 4
-.B
-\fI+K true | false\fR:
-Enables or disables the kernel poll functionality if the emulator supports it\&. Default is \fIfalse\fR (disabled)\&. If the emulator does not support kernel poll, and the \fI+K\fR flag is passed to the emulator, a warning is issued at startup\&.
-.TP 4
-.B
-\fI+l\fR:
-Enables auto load tracing, displaying info while loading code\&.
-.TP 4
-.B
-\fI+MFlag Value\fR:
- 
-.RS 4
-.LP
-Memory allocator specific flags, see erts_alloc(3erl) for further information\&.
-.RE
-.TP 4
-.B
-\fI+P Number\fR:
- 
-.RS 4
-.LP
-Sets the maximum number of concurrent processes for this system\&. \fINumber\fR must be in the range 16\&.\&.134217727\&. Default is 32768\&.
-.RE
-.TP 4
-.B
-\fI+R ReleaseNumber\fR:
- 
-.RS 4
-.LP
-Sets the compatibility mode\&.
-.LP
-
-.LP
-The distribution mechanism is not backwards compatible by default\&. This flags sets the emulator in compatibility mode with an earlier Erlang/OTP release \fIReleaseNumber\fR\&. The release number must be in the range \fI7\&.\&.<current release>\fR\&. This limits the emulator, making it possible for it to communicate with Erlang nodes (as well as C- and Java nodes) running that earlier release\&.
-.LP
-
-.LP
-For example, an R10 node is not automatically compatible with an R9 node, but R10 nodes started with the \fI+R 9\fR flag can co-exist with R9 nodes in the same distributed Erlang system, they are R9-compatible\&.
-.LP
-
-.LP
-Note: Make sure all nodes (Erlang-, C-, and Java nodes) of a distributed Erlang system is of the same Erlang/OTP release, or from two different Erlang/OTP releases X and Y, where \fIall\fR Y nodes have compatibility mode X\&.
-.LP
-
-.LP
-For example: A distributed Erlang system can consist of R10 nodes, or of R9 nodes and R9-compatible R10 nodes, but not of R9 nodes, R9-compatible R10 nodes and "regular" R10 nodes, as R9 and "regular" R10 nodes are not compatible\&.
-.RE
-.TP 4
-.B
-\fI+r\fR:
-Force ets memory block to be moved on realloc\&.
-.TP 4
-.B
-\fI+S Schedulers:SchedulerOnline\fR:
- 
-.RS 4
-.LP
-Sets the amount of scheduler threads to create and scheduler threads to set online when SMP support has been enabled\&. Valid range for both values are 1-1024\&. If the Erlang runtime system is able to determine the amount of logical processors configured and logical processors available, \fISchedulers\fR will default to logical processors configured, and \fISchedulersOnline\fR will default to logical processors available; otherwise, the default values will be 1\&. \fISchedulers\fR may be omitted if \fI:SchedulerOnline\fR is not and vice versa\&. The amount of schedulers online can be changed at run time via erlang:system_flag(schedulers_online, SchedulersOnline)\&. 
-.LP
-
-.LP
-This flag will be ignored if the emulator doesn\&'t have SMP support enabled (see the -smp flag)\&.
-.RE
-.TP 4
-.B
-\fI+sFlag Value\fR:
-Scheduling specific flags\&.
-.RS 4
-.LP
-
-.RS 2
-.TP 4
-.B
-+sbt BindType:
- 
-.RS 4
-.LP
-Set scheduler bind type\&. Currently valid \fIBindType\fRs: 
-.LP
-
-.RS 2
-.TP 4
-.B
-\fIu\fR:
-Same as erlang:system_flag(scheduler_bind_type, unbound)\&. 
-.TP 4
-.B
-\fIns\fR:
-Same as erlang:system_flag(scheduler_bind_type, no_spread)\&. 
-.TP 4
-.B
-\fIts\fR:
-Same as erlang:system_flag(scheduler_bind_type, thread_spread)\&. 
-.TP 4
-.B
-\fIps\fR:
-Same as erlang:system_flag(scheduler_bind_type, processor_spread)\&. 
-.TP 4
-.B
-\fIs\fR:
-Same as erlang:system_flag(scheduler_bind_type, spread)\&. 
-.TP 4
-.B
-\fInnts\fR:
-Same as erlang:system_flag(scheduler_bind_type, no_node_thread_spread)\&. 
-.TP 4
-.B
-\fInnps\fR:
-Same as erlang:system_flag(scheduler_bind_type, no_node_processor_spread)\&. 
-.TP 4
-.B
-\fItnnps\fR:
-Same as erlang:system_flag(scheduler_bind_type, thread_no_node_processor_spread)\&. 
-.TP 4
-.B
-\fIdb\fR:
-Same as erlang:system_flag(scheduler_bind_type, default_bind)\&. 
-.RE
-.LP
-
-.LP
-Binding of schedulers are currently only supported on newer Linux and Solaris systems\&.
-.LP
-
-.LP
-If no CPU topology is available when the \fI+sbt\fR flag is processed and \fIBindType\fR is any other type than \fIu\fR, the runtime system will fail to start\&. CPU topology can be defined using the +sct flag\&. Note that the \fI+sct\fR flag may have to be passed before the \fI+sbt\fR flag on the command line (in case no CPU topology has been automatically detected)\&.
-.LP
-
-.LP
-For more information, see erlang:system_flag(scheduler_bind_type, SchedulerBindType)\&. 
-.RE
-.TP 4
-.B
-\fI+sct CpuTopology\fR:
- 
-.RS 4
-.RS 2
-.TP 2
-*
-\fI<Id> = integer(); when 0 =< <Id> =< 65535\fR
-.TP 2
-*
-\fI<IdRange> = <Id>-<Id>\fR
-.TP 2
-*
-\fI<IdOrIdRange> = <Id> | <IdRange>\fR
-.TP 2
-*
-\fI<IdList> = <IdOrIdRange>, <IdOrIdRange> | <IdOrIdRange>\fR
-.TP 2
-*
-\fI<LogicalIds> = L<IdList>\fR
-.TP 2
-*
-\fI<ThreadIds> = T<IdList> | t<IdList>\fR
-.TP 2
-*
-\fI<CoreIds> = C<IdList> | c<IdList>\fR
-.TP 2
-*
-\fI<ProcessorIds> = P<IdList> | p<IdList>\fR
-.TP 2
-*
-\fI<NodeIds> = N<IdList> | n<IdList>\fR
-.TP 2
-*
-\fI<IdDefs> = <LogicalIds><ThreadIds><CoreIds><ProcessorIds><NodeIds> | <LogicalIds><ThreadIds><CoreIds><NodeIds><ProcessorIds>\fR
-.TP 2
-*
-\fICpuTopology = <IdDefs>:<IdDefs> | <IdDefs>\fR
-.RE
-.LP
-
-.LP
-Upper-case letters signify real identifiers and lower-case letters signify fake identifiers only used for description of the topology\&. Identifiers passed as real identifiers may be used by the runtime system when trying to access specific hardware and if they are not correct the behavior is undefined\&. Faked logical CPU identifiers are not accepted since there is no point in defining the CPU topology without real logical CPU identifiers\&. Thread, core, processor, and node identifiers may be left out\&. If left out, thread id defaults to \fIt0\fR, core id defaults to \fIc0\fR, processor id defaults to \fIp0\fR, and node id will be left undefined\&. Either each logical processor must belong to one and only one NUMA node, or no logical processors must belong to any NUMA nodes\&. 
-.LP
-
-.LP
-Both increasing and decreasing \fI<IdRange>\fRs are allowed\&.
-.LP
-
-.LP
-NUMA node identifiers are system wide\&. That is, each NUMA node on the system have to have a unique identifier\&. Processor identifiers are also system wide\&. Core identifiers are processor wide\&. Thread identifiers are core wide\&.
-.LP
-
-.LP
-The order of the identifier types imply the hierarchy of the CPU topology\&. Valid orders are either \fI<LogicalIds><ThreadIds><CoreIds><ProcessorIds><NodeIds>\fR, or \fI<LogicalIds><ThreadIds><CoreIds><NodeIds><ProcessorIds>\fR\&. That is, thread is part of a core which is part of a processor which is part of a NUMA node, or thread is part of a core which is part of a NUMA node which is part of a processor\&. A cpu topology can consist of both processor external, and processor internal NUMA nodes as long as each logical processor belongs to one and only one NUMA node\&. If \fI<ProcessorIds>\fR is left out, its default position will be before \fI<NodeIds>\fR\&. That is, the default is processor external NUMA nodes\&. 
-.LP
-
-.LP
-If a list of identifiers is used in an \fI<IdDefs>\fR:
-.LP
-
-.RS 2
-.TP 2
-*
-\fI<LogicalIds>\fR have to be a list of identifiers\&.
-.TP 2
-*
-At least one other identifier type apart from \fI<LogicalIds>\fR also have to have a list of identifiers\&.
-.TP 2
-*
-All lists of identifiers have to produce the same amount of identifiers\&.
-.RE
-.LP
-
-.LP
-A simple example\&. A single quad core processor may be described this way:
-.LP
-
-
-.nf
-% erl +sct L0-3c0-3
-
-1> erlang:system_info(cpu_topology)\&.
-
-[{processor,[{core,{logical,0}},
-             {core,{logical,1}},
-             {core,{logical,2}},
-             {core,{logical,3}}]}]
-
-.fi
-.LP
-
-.LP
-A little more complicated example\&. Two quad core processors\&. Each processor in its own NUMA node\&. The ordering of logical processors is a little weird\&. This in order to give a better example of identifier lists:
-.LP
-
-
-.nf
-% erl +sct L0-1,3-2c0-3p0N0:L7,4,6-5c0-3p1N1
-
-1> erlang:system_info(cpu_topology)\&.
-
-[{node,[{processor,[{core,{logical,0}},
-                    {core,{logical,1}},
-                    {core,{logical,3}},
-                    {core,{logical,2}}]}]},
- {node,[{processor,[{core,{logical,7}},
-                    {core,{logical,4}},
-                    {core,{logical,6}},
-                    {core,{logical,5}}]}]}]
-
-.fi
-.LP
-
-.LP
-As long as real identifiers are correct it is okay to pass a CPU topology that is not a correct description of the CPU topology\&. When used with care this can actually be very useful\&. This in order to trick the emulator to bind its schedulers as you want\&. For example, if you want to run multiple Erlang runtime systems on the same machine, you want to reduce the amount of schedulers used and manipulate the CPU topology so that they bind to different logical CPUs\&. An example, with two Erlang runtime systems on a quad core machine:
-.LP
-
-
-.nf
-% erl +sct L0-3c0-3 +sbt db +S3:2 -detached -noinput -noshell -sname one
-
-% erl +sct L3-0c0-3 +sbt db +S3:2 -detached -noinput -noshell -sname two
-
-
-.fi
-.LP
-
-.LP
-In this example each runtime system have two schedulers each online, and all schedulers online will run on different cores\&. If we change to one scheduler online on one runtime system, and three schedulers online on the other, all schedulers online will still run on different cores\&.
-.LP
-
-.LP
-Note that a faked CPU topology that does not reflect how the real CPU topology looks like is likely to decrease the performance of the runtime system\&.
-.LP
-
-.LP
-For more information, see erlang:system_flag(cpu_topology, CpuTopology)\&.
-.RE
-.RE
-.RE
-.TP 4
-.B
-\fI+sss size\fR:
- 
-.RS 4
-.LP
-Suggested stack size, in kilowords, for scheduler threads\&. Valid range is 4-8192 kilowords\&. The default stack size is OS dependent\&.
-.RE
-.TP 4
-.B
-\fI+T Level\fR:
- 
-.RS 4
-.LP
-Enables modified timing and sets the modified timing level\&. Currently valid range is 0-9\&. The timing of the runtime system will change\&. A high level usually means a greater change than a low level\&. Changing the timing can be very useful for finding timing related bugs\&.
-.LP
-
-.LP
-Currently, modified timing affects the following:
-.LP
-
-.RS 2
-.TP 4
-.B
-Process spawning:
-A process calling \fIspawn\fR, \fIspawn_link\fR, \fIspawn_monitor\fR, or \fIspawn_opt\fR will be scheduled out immediately after completing the call\&. When higher modified timing levels are used, the caller will also sleep for a while after being scheduled out\&.
-.TP 4
-.B
-Context reductions:
-The amount of reductions a process is a allowed to use before being scheduled out is increased or reduced\&.
-.TP 4
-.B
-Input reductions:
-The amount of reductions performed before checking I/O is increased or reduced\&.
-.RE
-.LP
-
-.LP
-\fINOTE:\fR Performance will suffer when modified timing is enabled\&. This flag is \fIonly\fR intended for testing and debugging\&. Also note that \fIreturn_to\fR and \fIreturn_from\fR trace messages will be lost when tracing on the spawn BIFs\&. This flag may be removed or changed at any time without prior notice\&.
-.RE
-.TP 4
-.B
-\fI+V\fR:
-Makes the emulator print out its version number\&.
-.TP 4
-.B
-\fI+v\fR:
-Verbose\&.
-.TP 4
-.B
-\fI+W w | i\fR:
-Sets the mapping of warning messages for \fIerror_logger\fR\&. Messages sent to the error logger using one of the warning routines can be mapped either to errors (default), warnings (\fI+W w\fR), or info reports (\fI+W i\fR)\&. The current mapping can be retrieved using \fIerror_logger:warning_map/0\fR\&. See error_logger(3erl) for further information\&.
-.RE
-.SH ENVIRONMENT VARIABLES
-.RS 2
-.TP 4
-.B
-\fIERL_CRASH_DUMP\fR:
-If the emulator needs to write a crash dump, the value of this variable will be the file name of the crash dump file\&. If the variable is not set, the name of the crash dump file will be \fIerl_crash\&.dump\fR in the current directory\&.
-.TP 4
-.B
-\fIERL_CRASH_DUMP_NICE\fR:
-\fIUnix systems\fR: If the emulator needs to write a crash dump, it will use the value of this variable to set the nice value for the process, thus lowering its priority\&. The allowable range is 1 through 39 (higher values will be replaced with 39)\&. The highest value, 39, will give the process the lowest priority\&.
-.TP 4
-.B
-\fIERL_CRASH_DUMP_SECONDS\fR:
-\fIUnix systems\fR: This variable gives the number of seconds that the emulator will be allowed to spend writing a crash dump\&. When the given number of seconds have elapsed, the emulator will be terminated by a SIGALRM signal\&.
-.TP 4
-.B
-\fIERL_AFLAGS\fR:
-The content of this environment variable will be added to the beginning of the command line for \fIerl\fR\&.
-.RS 4
-.LP
-
-.LP
-The \fI-extra\fR flag is treated specially\&. Its scope ends at the end of the environment variable content\&. Arguments following an \fI-extra\fR flag are moved on the command line into the \fI-extra\fR section, i\&.e\&. the end of the command line following after an \fI-extra\fR flag\&.
-.RE
-.TP 4
-.B
-\fIERL_ZFLAGS\fRand \fIERL_FLAGS\fR:
-The content of these environment variables will be added to the end of the command line for \fIerl\fR\&.
-.RS 4
-.LP
-
-.LP
-The \fI-extra\fR flag is treated specially\&. Its scope ends at the end of the environment variable content\&. Arguments following an \fI-extra\fR flag are moved on the command line into the \fI-extra\fR section, i\&.e\&. the end of the command line following after an \fI-extra\fR flag\&.
-.RE
-.TP 4
-.B
-\fIERL_LIBS\fR:
-This environment variable contains a list of additional library directories that the code server will search for applications and add to the code path\&. See code(3erl)\&.
-.TP 4
-.B
-\fIERL_EPMD_PORT\fR:
-This environment variable can contain the port number to use when communicating with epmd\&. The default port will work fine in most cases\&. A different port can be specified to allow nodes of independant clusters to co-exist on the same host\&. All nodes in a cluster must use the same epmd port number\&.
-.RE
-.SH SEE ALSO
-.LP
-init(3erl), erl_prim_loader(3erl), erl_boot_server(3erl), code(3erl), application(3erl), heart(3erl), net_kernel(3erl), auth(3erl), make(3erl), epmd(1), erts_alloc(3erl)
 
=== removed file 'debian/manpages/erl_call.1'
--- debian/manpages/erl_call.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/erl_call.1	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-.TH erl_call 1 "erl_interface  3.6.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-erl_call \- Call/Start a Distributed Erlang Node
-.SH DESCRIPTION
-.LP
-\fIerl_call\fR makes it possible to start and/or communicate with a distributed Erlang node\&. It is built upon the \fIerl_interface\fR library as an example application\&. Its purpose is to use an Unix shell script to interact with a distributed Erlang node\&. It performs all communication with the Erlang \fIrex server\fR, using the standard Erlang RPC facility\&. It does not require any special software to be run at the Erlang target node\&.
-.LP
-The main use is to either start a distributed Erlang node or to make an ordinary function call\&. However, it is also possible to pipe an Erlang module to \fIerl_call\fR and have it compiled, or to pipe a sequence of Erlang expressions to be evaluated (similar to the Erlang shell)\&.
-.LP
-Options, which cause \fIstdin\fR to be read, can be used with advantage as scripts from within (Unix) shell scripts\&. Another nice use of \fIerl_call\fR could be from (http) CGI-bin scripts\&.
-
-.SH EXPORTS
-.LP
-.B
-erl_call <options>
-.br
-.RS
-.LP
-Each option flag is described below with its name, type and meaning\&. 
-.RS 2
-.TP 4
-.B
--a [Mod [Fun [Args]]]]:
-(\fIoptional\fR): Applies the specified function and returns the result\&. \fIMod\fR must be specified, however \fI[]\fR is assumed for unspecified \fIFun\fR and \fIArgs\fR\&. \fIArgs\fR should be in the same format as for \fIerlang:apply/3\fR\&. Note that this flag takes exactly one argument, so quoting may be necessary in order to group \fIMod\fR, \fIFun\fR and \fIArgs\fR, in a manner dependent on the behavior of your command shell\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--c Cookie:
-(\fIoptional\fR): Use this option to specify a certain cookie\&. If no cookie is specified, the \fI~/\&.erlang\&.cookie\fR file is read and its content are used as cookie\&. The Erlang node we want to communicate with must have the same cookie\&.
-.TP 4
-.B
--d:
-(\fIoptional\fR): Debug mode\&. This causes all IO to be output to the file \fI~/\&.erl_call\&.out\&.Nodename\fR, where \fINodename\fR is the node name of the Erlang node in question\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--e:
-(\fIoptional\fR): Reads a sequence of Erlang expressions, separated by \&'\fI,\fR\&' and ended with a \&'\fI\&.\fR\&', from \fIstdin\fR until EOF (Control-D)\&. Evaluates the expressions and returns the result from the last expression\&. Returns \fI{ok, Result}\fR if successful\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--h HiddenName:
-(\fIoptional\fR): Specifies the name of the hidden node that \fIerl_call\fR represents\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--m:
-(\fIoptional\fR): Reads an Erlang module from \fIstdin\fR and compiles it\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--n Node:
-(one of \fI-n, -name, -sname\fR is required): Has the same meaning as \fI-name\fR and can still be used for backwards compatibility reasons\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--name Node:
-(one of \fI-n, -name, -sname\fR is required): \fINode\fR is the name of the node to be started or communicated with\&. It is assumed that \fINode\fR is started with \fIerl -name\fR, which means that fully qualified long node names are used\&. If the \fI-s\fR option is given, an Erlang node will (if necessary) be started with \fIerl -name\fR\&. 
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--q:
-(\fIoptional\fR): Halts the Erlang node specified with the -n switch\&. This switch overrides the -s switch\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--r:
-(\fIoptional\fR): Generates a random name of the hidden node that \fIerl_call\fR represents\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--s:
-(\fIoptional\fR): Starts a distributed Erlang node if necessary\&. This means that in a sequence of calls, where the \&'\fI-s\fR\&' and \&'\fI-n Node\fR\&' are constant, only the first call will start the Erlang node\&. This makes the rest of the communication very fast\&. This flag is currently only available on the Unix platform\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--sname Node:
-(one of \fI-n, -name, -sname\fR is required): \fINode\fR is the name of the node to be started or communicated with\&. It is assumed that \fINode\fR is started with \fIerl -sname\fR which means that short node names are used\&. If \fI-s\fR option is given, an Erlang node will be started (if necessary) with \fIerl -sname\fR\&. 
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--v:
-(\fIoptional\fR): Prints a lot of \fIverbose\fR information\&. This is only useful for the developer and maintainer of \fIerl_call\fR\&.
-.RS 4
-.LP
-
-.LP
-
-.RE
-.TP 4
-.B
--x ErlScript:
-(\fIoptional\fR): Specifies another name of the Erlang start-up script to be used\&. If not specified, the standard \fIerl\fR start-up script is used\&.
-.RE
-.RE
-.SH EXAMPLES
-.LP
-Starts an Erlang node and calls \fIerlang:time/0\fR\&.
-
-.nf
-erl_call -s -a \&'erlang time\&' -n madonna
-{18,27,34}
-    
-.fi
-.LP
-Terminates an Erlang node by calling \fIerlang:halt/0\fR\&.
-
-.nf
-erl_call -s -a \&'erlang halt\&' -n madonna
-    
-.fi
-.LP
-An apply with several arguments\&.
-
-.nf
-erl_call -s -a \&'lists map [{math,sqrt},[1,4,9,16,25]]\&' -n madonna
-    
-.fi
-.LP
-Evaluates a couple of expressions\&. The input ends with EOF (Control-D)\&.
-
-.nf
-erl_call -s -e -n madonna
-statistics(runtime),
-X=1,
-Y=2,
-{_,T}=statistics(runtime),
-{X+Y,T}\&.
-^D
-{ok,{3,0}}
-    
-.fi
-.LP
-Compiles a module and runs it\&. Again, the input ends with EOF (Control-D)\&. (In the example shown, the output has been formatted afterwards)\&.
-
-.nf
-erl_call -s -m -a lolita -n madonna
--module(lolita)\&.
--compile(export_all)\&.
-start() ->
-        P = processes(),
-        F = fun(X) -> {X,process_info(X,registered_name)} end,
-        lists:map(F,[],P)\&.
-^D
-[{<madonna@chivas\&.du\&.etx\&.ericsson\&.se,0,0>,
-                  {registered_name,init}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,2,0>,
-                  {registered_name,erl_prim_loader}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,4,0>,
-                  {registered_name,error_logger}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,5,0>,
-                  {registered_name,application_controller}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,6,0>,
-                  {registered_name,kernel}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,7,0>,
-                  []},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,8,0>,
-                  {registered_name,kernel_sup}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,9,0>,
-                  {registered_name,net_sup}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,10,0>,
-                  {registered_name,net_kernel}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,11,0>,
-                  []},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,12,0>,
-                  {registered_name,global_name_server}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,13,0>,
-                  {registered_name,auth}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,14,0>,
-                  {registered_name,rex}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,15,0>,
-                  []},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,16,0>,
-                  {registered_name,file_server}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,17,0>,
-                  {registered_name,code_server}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,20,0>,
-                  {registered_name,user}},
- {<madonna@chivas\&.du\&.etx\&.ericsson\&.se,38,0>,
-                  []}]
-    
-.fi
 
=== added file 'debian/manpages/erlang-depends.1'
--- debian/manpages/erlang-depends.1	1970-01-01 00:00:00 +0000
+++ debian/manpages/erlang-depends.1	2009-12-22 03:23:49 +0000
@@ -0,0 +1,237 @@
+.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
+.\" Modified by Sergei Golovan
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "ERLANG-DEPENDS 1"
+.TH ERLANG-DEPENDS 1 "2009\-07\-02" "1:13.b.1\-dfsg\-4" "Erlang packages for Debian GNU/Linux"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+erlang\-depends \- calculates Erlang dependencies
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBerlang-depends\fR [\fIdebhelper\ options\fR]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+erlang\-depends is a debhelper-like program that is responsible for generating
+the substitution variables for Erlang-dependent packages.
+.PP
+The most useful variable is ${erlang:Depends}. It expands into the list of
+Erlang packages which modules are used in the building package. It is
+introduced in version 1:13.b.1\-dfsg\-3 of erlang-dev package.
+.PP
+Also, ${erlang\-abi:Depends} substitution adds current erlang \s-1ABI\s0 virtual
+package to substvar files. It is useful if your package uses C-based
+extensions which may break in case of \s-1ABI\s0 changes. It is introduced in
+version 1:11.b.4\-4 of erlang\-dev package.
+.PP
+If you want to fine tune your package dependencies then you may want to use
+substvars for all Erlang packages you need. Currently they are:
+${erlang\-base:Depends},
+${erlang\-dev:Depends},
+${erlang\-appmon:Depends},
+${erlang\-asn1:Depends},
+${erlang\-common-test:Depends},
+${erlang\-corba:Depends},
+${erlang\-crypto:Depends},
+${erlang\-debugger:Depends},
+${erlang\-dialyzer:Depends},
+${erlang\-docbuilder:Depends},
+${erlang\-edoc:Depends},
+${erlang\-et:Depends},
+${erlang\-eunit:Depends},
+${erlang\-gs:Depends},
+${erlang\-ic:Depends},
+${erlang\-inets:Depends},
+${erlang\-inviso:Depends},
+${erlang\-megaco:Depends},
+${erlang\-mnesia:Depends},
+${erlang\-observer:Depends},
+${erlang\-odbc:Depends},
+${erlang\-os-mon:Depends},
+${erlang\-parsetools:Depends},
+${erlang\-percept:Depends},
+${erlang\-pman:Depends},
+${erlang\-public-key:Depends},
+${erlang\-reltool:Depends},
+${erlang\-runtime-tools:Depends},
+${erlang\-snmp:Depends},
+${erlang\-ssh:Depends},
+${erlang\-ssl:Depends},
+${erlang\-syntax-tools:Depends},
+${erlang\-test-server:Depends},
+${erlang\-toolbar:Depends},
+${erlang\-tools:Depends},
+${erlang\-tv:Depends},
+${erlang\-typer:Depends},
+${erlang\-webtool:Depends},
+${erlang\-wx:Depends},
+${erlang\-xmerl:Depends}.
+All variables except ${erlang\-base:Depends} and ${erlang\-dev:Depends} were
+introduced in version 1:13.b\-dfsg\-2 of erlang\-dev package.
+.PP
+For compatibility with older versions the variables
+${erlang\-nox:Depends} and ${erlang\-x11:Depends} also works (even since the
+corresponding packages turned into dummy packages).
+.PP
+If you use this program, your package must build-depend on erlang\-dev
+(>= 1:13.b\-dfsg\-2). If you want your package to use automatic calculation
+of dependencies then it must build-depend on erlang\-dev (>= 1:13.b.1\-dfsg\-3).
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-v\fR, \fB\-\-verbose\fR" 4
+.IX Item "-v, --verbose"
+Verbose mode.
+.IP "\fB\-a\fR, \fB\-\-arch\fR" 4
+.IX Item "-a, --arch"
+Act on all architecture dependent packages.
+.IP "\fB\-i\fR, \fB\-\-indep\fR" 4
+.IX Item "-i, --indep"
+Act on all architecture independent packages.
+.IP "\fB\-p\fR\fIpackage\fR, \fB\-\-package=\fR\fIpackage\fR" 4
+.IX Item "-ppackage, --package=package"
+Act on the package named \*(L"package\*(R". This option may be specified multiple
+times.
+.IP "\fB\-N\fR\fIpackage\fR, \fB\-\-no\-package=\fR\fIpackage\fR" 4
+.IX Item "-Npackage, --no-package=package"
+Do not act on the specified package even if an \-a, \-i, or \-p option lists
+the package as one that should be acted on.
+.IP "\fB\-\-ignore=\fR\fIfile\fR" 4
+.IX Item "--ignore=file"
+Ignore the specified file.
+.IP "\fB\-P\fR\fItmpdir\fR, \fB\-\-tmpdir=\fR\fItmpdir\fR" 4
+.IX Item "-Ptmpdir, --tmpdir=tmpdir"
+Use \*(L"tmpdir\*(R" for package build directory. The default is debian/<package>
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIdebhelper\fR\|(7)
+.PP
+This program is not part of debhelper.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+Torsten Werner <[e-mail]> initially wrote it in Perl,
+Sergei Golovan <[e-mail]> rewrote in Erlang (started from 1:13.b.1\-dfsg\-3).
 
=== removed file 'debian/manpages/erlc.1'
--- debian/manpages/erlc.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/erlc.1	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-.TH erlc 1 "erts  5.7.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-erlc \- Compiler
-.SH DESCRIPTION
-.LP
-The \fIerlc\fR program provides a common way to run all compilers in the Erlang system\&. Depending on the extension of each input file, \fIerlc\fR will invoke the appropriate compiler\&. Regardless of which compiler is used, the same flags are used to provide parameters such as include paths and output directory\&.
-.LP
-The current working directory, \fI"\&."\fR, will not be included in the code path when running the compiler (to avoid loading Beam files from the current working directory that could potentially be in conflict with the compiler or Erlang/OTP system used by the compiler)\&.
-
-.SH EXPORTS
-.LP
-.B
-erlc flags file1\&.ext file2\&.ext\&.\&.\&.
-.br
-.RS
-.LP
-\fIErlc\fR compiles one or more files\&. The files must include the extension, for example \fI\&.erl\fR for Erlang source code, or \fI\&.yrl\fR for Yecc source code\&. \fIErlc\fR uses the extension to invoke the correct compiler\&.
-.RE
-.SH GENERALLY USEFUL FLAGS
-.LP
-The following flags are supported: 
-.RS 2
-.TP 4
-.B
--I \fIdirectory\fR:
-Instructs the compiler to search for include files in the specified directory\&. When encountering an \fI-include\fR or \fI-include_dir\fR directive, the compiler searches for header files in the following directories:
-.RS 4
-.LP
-
-.RS 2
-.TP 4
-1.
-\fI"\&."\fR, the current working directory of the file server;
-.TP 4
-2.
-the base name of the compiled file;
-.TP 4
-3.
-the directories specified using the \fI-I\fR option\&. The directory specified last is searched first\&.
-.RE
-.RE
-.TP 4
-.B
--o \fIdirectory\fR:
-The directory where the compiler should place the output files\&. If not specified, output files will be placed in the current working directory\&.
-.TP 4
-.B
--D\fIname\fR:
-Defines a macro\&.
-.TP 4
-.B
--D\fIname\fR=\fIvalue\fR:
-Defines a macro with the given value\&. The value can be any Erlang term\&. Depending on the platform, the value may need to be quoted if the shell itself interprets certain characters\&. On Unix, terms which contain tuples and list must be quoted\&. Terms which contain spaces must be quoted on all platforms\&.
-.TP 4
-.B
--W\fInumber\fR:
-Sets warning level to \fInumber\fR\&. Default is \fI1\fR\&. Use \fI-W0\fR to turn off warnings\&.
-.TP 4
-.B
--W:
-Same as \fI-W1\fR\&. Default\&.
-.TP 4
-.B
--v:
-Enables verbose output\&.
-.TP 4
-.B
--b \fIoutput-type\fR:
-Specifies the type of output file\&. Generally, \fIoutput-type\fR is the same as the file extension of the output file but without the period\&. This option will be ignored by compilers that have a a single output format\&.
-.TP 4
-.B
--hybrid:
-Compile using the hybrid-heap emulator\&. This is mainly useful for compiling native code, which needs to be compiled with the same run-time system that it should be run on\&.
-.TP 4
-.B
--smp:
-Compile using the SMP emulator\&. This is mainly useful for compiling native code, which needs to be compiled with the same run-time system that it should be run on\&.
-.TP 4
-.B
---:
-Signals that no more options will follow\&. The rest of the arguments will be treated as file names, even if they start with hyphens\&.
-.TP 4
-.B
-+\fIterm\fR:
-A flag starting with a plus (\&'\fI+\fR\&') rather than a hyphen will be converted to an Erlang term and passed unchanged to the compiler\&. For instance, the \fIexport_all\fR option for the Erlang compiler can be specified as follows:
-.RS 4
-.LP
-
-
-.nf
-erlc +export_all file\&.erl
-.fi
-.LP
-
-.LP
-Depending on the platform, the value may need to be quoted if the shell itself interprets certain characters\&. On Unix, terms which contain tuples and list must be quoted\&. Terms which contain spaces must be quoted on all platforms\&.
-.RE
-.RE
-.SH SPECIAL FLAGS
-.LP
-The flags in this section are useful in special situations such as re-building the OTP system\&.
-.RS 2
-.TP 4
-.B
--pa \fIdirectory\fR:
-Appends \fIdirectory\fR to the front of the code path in the invoked Erlang emulator\&. This can be used to invoke another compiler than the default one\&.
-.TP 4
-.B
--pz \fIdirectory\fR:
-Appends \fIdirectory\fR to the code path in the invoked Erlang emulator\&.
-.RE
-.SH SUPPORTED COMPILERS
-.RS 2
-.TP 4
-.B
-\&.erl:
-Erlang source code\&. It generates a \fI\&.beam\fR file\&.
-.RS 4
-.LP
-
-.LP
-The options -P, -E, and -S are equivalent to +\&'P\&', +\&'E\&', and +\&'S\&', except that it is not necessary to include the single quotes to protect them from the shell\&.
-.LP
-
-.LP
-Supported options: -I, -o, -D, -v, -W, -b\&.
-.RE
-.TP 4
-.B
-\&.yrl:
-Yecc source code\&. It generates an \fI\&.erl\fR file\&.
-.RS 4
-.LP
-
-.LP
-Use the -I option with the name of a file to use that file as a customized prologue file (the \fIincludefile\fR option)\&.
-.LP
-
-.LP
-Supported options: -o, -v, -I, -W (see above)\&.
-.RE
-.TP 4
-.B
-\&.mib:
-MIB for SNMP\&. It generates a \fI\&.bin\fR file\&.
-.RS 4
-.LP
-
-.LP
-Supported options: -I, -o, -W\&.
-.RE
-.TP 4
-.B
-\&.bin:
-A compiled MIB for SNMP\&. It generates a \fI\&.hrl\fR file\&.
-.RS 4
-.LP
-
-.LP
-Supported options: -o, -v\&.
-.RE
-.TP 4
-.B
-\&.rel:
-Script file\&. It generates a boot file\&.
-.RS 4
-.LP
-
-.LP
-Use the -I to name directories to be searched for application files (equivalent to the \fIpath\fR in the option list for \fIsystools:make_script/2\fR)\&.
-.LP
-
-.LP
-Supported options: -o\&.
-.RE
-.TP 4
-.B
-\&.asn1:
-ASN1 file\&.
-.RS 4
-.LP
-
-.LP
-Creates an \fI\&.erl\fR, \fI\&.hrl\fR, and \fI\&.asn1db\fR file from an \fI\&.asn1\fR file\&. Also compiles the \fI\&.erl\fR using the Erlang compiler unless the \fI+noobj\fR options is given\&.
-.LP
-
-.LP
-Supported options: -I, -o, -b, -W\&.
-.RE
-.TP 4
-.B
-\&.idl:
-IC file\&.
-.RS 4
-.LP
-
-.LP
-Runs the IDL compiler\&.
-.LP
-
-.LP
-Supported options: -I, -o\&.
-.RE
-.RE
-.SH ENVIRONMENT VARIABLES
-.RS 2
-.TP 4
-.B
-ERLC_EMULATOR:
-The command for starting the emulator\&. Default is \fIerl\fR in the same directory as the \fIerlc\fR program itself, or if it doesn\&'t exist, \fIerl\fR in any of the directories given in the \fIPATH\fR environment variable\&.
-.RE
-.SH SEE ALSO
-.LP
-erl(1), compile(3erl), yecc(3erl), snmp(3erl)
 
=== removed file 'debian/manpages/escript.1'
--- debian/manpages/escript.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/escript.1	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-.TH escript 1 "erts  5.7.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-escript \- Erlang scripting support
-.SH DESCRIPTION
-.LP
-\fIescript\fR provides support for running short Erlang programs without having to compile them first and an easy way to retrieve the command line arguments\&.
-
-.SH EXPORTS
-.LP
-.B
-script-name script-arg1 script-arg2\&.\&.\&.
-.br
-.B
-escript escript-flags script-name script-arg1 script-arg2\&.\&.\&.
-.br
-.RS
-.LP
-\fIescript\fR runs a script written in Erlang\&.
-.LP
-Here follows an example\&.
-
-.nf
-$ cat factorial
-
-#!/usr/bin/env escript
-%% -*- erlang -*-
-%%! -smp enable -sname factorial -mnesia debug verbose
-main([String]) ->
-    try
-        N = list_to_integer(String),
-        F = fac(N),
-        io:format("factorial ~w = ~w\en", [N,F])
-    catch
-        _:_ ->
-            usage()
-    end;
-main(_) ->
-    usage()\&.
-        
-usage() ->
-    io:format("usage: factorial integer\en"),
-    halt(1)\&.
-        
-fac(0) -> 1;
-fac(N) -> N * fac(N-1)\&.
-$ factorial 5
-
-factorial 5 = 120
-$ factorial
-
-usage: factorial integer
-$ factorial five
-
-usage: factorial integer        
-.fi
-.LP
-The header of an Erlang script differs from a normal Erlang module\&. The first line is intended to be the interpreter line, which invokes \fIescript\fR\&. However if you invoke \fIescript\fR like this
-
-.nf
-$ escript factorial 5
-        
-.fi
-.LP
-the contents of the first line does not matter, but it cannot contain Erlang code as it will be \fIignored\fR\&.
-.LP
-The second line in the example, contains an optional directive to the \fIEmacs\fR editor which causes it to enter the major mode for editing Erlang source files\&. If the directive is present it must be located on the second line\&.
-.LP
-On the third line (or second line depending on the presence of the Emacs directive), it is possible to give arguments to the emulator, such as 
-
-.nf
-%%! -smp enable -sname factorial -mnesia debug verbose
-.fi
-.LP
-Such an argument line must start with \fI%%!\fR and the rest of the line will interpreted as arguments to the emulator\&.
-.LP
-If you know the location of the \fIescript\fR executable, the first line can directly give the path to \fIescript\fR\&. For instance:
-
-.nf
-#!/usr/bin/escript        
-.fi
-.LP
-As any other kind of scripts, Erlang scripts will not work on Unix platforms if the execution bit for the script file is not set\&. (Use \fIchmod +x script-name\fR to turn on the execution bit\&.) 
-.LP
-The rest of the Erlang script file may either contain Erlang source code, an inlined \fIbeam\fR file or an inlined archive file\&.
-.LP
-An Erlang script file must always contain the function \fImain/1\fR\&. When the script is run, the \fImain/1\fR will be called with a list of strings representing the arguments given to the script (not changed or interpreted in any way)\&.
-.LP
-If the \fImain/1\fR function in the script returns successfully, the exit status for the script will be 0\&. If an exception is generated during execution, a short message will be printed and the script terminated with exit status 127\&.
-.LP
-To return your own non-zero exit code, call \fIhalt(ExitCode)\fR; for instance:
-
-.nf
-halt(1)\&.
-.fi
-.LP
-Call \fIescript:script_name/0\fR from your to script to retrieve the pathname of the script (the pathname is usually, but not always, absolute)\&.
-.LP
-If the file contains source code (as in the example above), it will be processed by the preprocessor \fIepp\fR\&. This means that you for example may use pre-defined macros (such as \fI?MODULE\fR) as well as include directives like the \fI-include_lib\fR directive\&. For instance, use
-
-.nf
--include_lib("kernel/include/file\&.hrl")\&.        
-.fi
-.LP
-to include the record definitions for the records used by the \fIfile:read_file_info/1\fR function\&.
-.LP
-The script will be checked for syntactic and semantic correctness before being run\&. If there are warnings (such as unused variables), they will be printed and the script will still be run\&. If there are errors, they will be printed and the script will not be run and its exit status will be 127\&.
-.LP
-Both the module declaration and the export declaration of the \fImain/1\fR function are optional\&.
-.LP
-By default, the script will be interpreted\&. You can force it to be compiled by including the following line somewhere in the script file:
-
-.nf
--mode(compile)\&.
-.fi
-.LP
-Execution of interpreted code is slower than compiled code\&. If much of the execution takes place in interpreted code it may be worthwile to compile it, even though the compilation itself will take a little while\&.
-.LP
-As mentioned earlier, it is possible to have a script which contains precompiled \fIbeam\fR code\&. In a precompiled script, the interpretation of the script header is exactly the same as in a script containing source code\&. That means that you can make a \fIbeam\fR file executable by prepending the file with the lines starting with \fI#!\fR and \fI%%!\fR mentioned above\&. In a precompiled script, the function \fImain/1\fR must be exported\&.
-.LP
-As yet another option it is possible to have an entire Erlang archive in the script\&. In a archive script, the interpretation of the script header is exactly the same as in a script containing source code\&. That means that you can make an archive file executable by prepending the file with the lines starting with \fI#!\fR and \fI%%!\fR mentioned above\&. In an archive script, the function \fImain/1\fR must be exported\&. By default the \fImain/1\fR function in the module with the same name as the basename of the \fIescript\fR file will be invoked\&. This behavior can be overridden by setting the flag \fI-escript main Module\fR as one of the emulator flags\&. The \fIModule\fR must be the name of a module which has an exported \fImain/1\fR function\&. See code(3erl) for more information about archives and code loading\&.
-.SS Warning:
-.LP
-The support for loading of code from archive files is experimental\&. The sole purpose of releasing it before it is ready is to obtain early feedback\&. The file format, semantics, interfaces etc\&. may be changed in a future release\&. The flag \fI-escript\fR is also experimental\&.
-
-.RE
-.SH OPTIONS ACCEPTED BY ESCRIPT
-.RS 2
-.TP 4
-.B
--s:
-Only perform a syntactic and semantic check of the script file\&. Warnings and errors (if any) are written to the standard output, but the script will not be run\&. The exit status will be 0 if there were no errors, and 127 otherwise\&.
-.RE
 
=== removed file 'debian/manpages/run_erl.1'
--- debian/manpages/run_erl.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/run_erl.1	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-.TH run_erl 1 "erts  5.7.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-run_erl \- Redirect Erlang input and output streams on Solaris(R)
-.SH DESCRIPTION
-.LP
-This describes the \fIrun_erl\fR program specific to Solaris/Linux\&. This program redirect the standard input and standard output streams so that all output can be logged\&. It also let the program \fIto_erl\fR connect to the Erlang console making it possible to monitor and debug an embedded system remotely\&.
-.LP
-You can read more about the use in the \fIEmbedded System User\&'s Guide\fR\&.
-
-.SH EXPORTS
-.LP
-.B
-run_erl [-daemon] pipe_dir/ log_dir "exec command [command_arguments]"
-.br
-.RS
-.LP
-The \fIrun_erl\fR program arguments are:
-.RS 2
-.TP 4
-.B
--daemon:
-This option is highly recommended\&. It makes run_erl run in the background completely detached from any controlling terminal and the command returns to the caller immediately\&. Without this option, run_erl must be started using several tricks in the shell to detach it completely from the terminal in use when starting it\&. The option must be the first argument to run_erl on the command line\&.
-.TP 4
-.B
-pipe_dir:
-This is where to put the named pipe, usually \fI/tmp/\fR\&. It shall be suffixed by a \fI/\fR (slash), i\&.e\&. not \fI/tmp/epipies\fR, but \fI/tmp/epipes/\fR\&.
-.TP 4
-.B
-log_dir:
-This is where the log files are written\&. There will be one log file, \fIrun_erl\&.log\fR that log progress and warnings from the \fIrun_erl\fR program itself and there will be up to five log files at maximum 100KB each (both number of logs and sizes can be changed by environment variables, see below) with the content of the standard streams from and to the command\&. When the logs are full \fIrun_erl\fR will delete and reuse the oldest log file\&.
-.TP 4
-.B
-"exec command [command_arguments]":
-In the third argument \fIcommand\fR is the to execute where everything written to stdin and stdout is logged to \fIlog_dir\fR\&.
-.RE
-.RE
-.SH NOTES CONCERNING THE LOG FILES
-.LP
-While running, run_erl (as stated earlier) sends all output, uninterpreted, to a log file\&. The file is called \fIerlang\&.log\&.N\fR, where N is a number\&. When the log is "full", default after 100KB, run_erl starts to log in file \fIerlang\&.log\&.(N+1)\fR, until N reaches a certain number (default 5), where after N starts at 1 again and the oldest files start getting overwritten\&. If no output comes from the erlang shell, but the erlang machine still seems to be alive, an "ALIVE" message is written to the log, it is a timestamp and is written, by default, after 15 minutes of inactivity\&. Also, if output from erlang is logged but it\&'s been more than 5 minutes (default) since last time we got anything from erlang, a timestamp is written in the log\&. The "ALIVE" messages look like this:
-
-.nf
-      ===== ALIVE <date-time-string>
-    
-.fi
-.LP
-while the other timestamps look like this:
-
-.nf
-      ===== <date-time-string>
-    
-.fi
-.LP
-The \fIdate-time-string\fR is the date and time the message is written, default in local time (can be changed to GMT if one wants to) and is formatted with the ANSI-C function \fIstrftime\fR using the format string \fI%a %b %e %T %Z %Y\fR, which produces messages on the line of \fI===== ALIVE Thu May 15 10:13:36 MEST 2003\fR, this can be changed, see below\&.
-.SH ENVIRONMENT VARIABLES
-.LP
-The following environment variables are recognized by run_erl and change the logging behavior\&. Also see the notes above to get more info on how the log behaves\&.
-.RS 2
-.TP 4
-.B
-RUN_ERL_LOG_ALIVE_MINUTES:
-How long to wait for output (in minutes) before writing an "ALIVE" message to the log\&. Default is 15, can never be less than 1\&.
-.TP 4
-.B
-RUN_ERL_LOG_ACTIVITY_MINUTES:
-How long erlang need to be inactive before output will be preceded with a timestamp\&. Default is RUN_ERL_LOG_ALIVE_MINUTES div 3, but never less than 1\&.
-.TP 4
-.B
-RUN_ERL_LOG_ALIVE_FORMAT:
-Specifies another format string to be used in the strftime C library call\&. i\&.e specifying this to \fI"%e-%b-%Y, %T %Z"\fR will give log messages with timestamps looking like \fI15-May-2003, 10:23:04 MET\fR etc\&. See the documentation for the C library function strftime for more information\&. Default is \fI"%a %b %e %T %Z %Y"\fR\&.
-.TP 4
-.B
-RUN_ERL_LOG_ALIVE_IN_UTC:
-If set to anything else than "0", it will make all times displayed by run_erl to be in UTC (GMT,CET,MET, without DST), rather than in local time\&. This does not affect data coming from erlang, only the logs output directly by run_erl\&. The application \fIsasl\fR can be modified accordingly by setting the erlang application variable \fIutc_log\fR to \fItrue\fR\&.
-.TP 4
-.B
-RUN_ERL_LOG_GENERATIONS:
-Controls the number of log files written before older files are being reused\&. Default is 5, minimum is 2, maximum is 1000\&.
-.TP 4
-.B
-RUN_ERL_LOG_MAXSIZE:
-The size (in bytes) of a log file before switching to a new log file\&. Default is 100000, minimum is 1000 and maximum is approximately 2^30\&.
-.RE
-.SH SEE ALSO
-.LP
-start_embedded(1)
 
=== removed file 'debian/manpages/start_embedded.1'
--- debian/manpages/start_embedded.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/start_embedded.1	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-.TH start_embedded 1 "erts  5.7.3" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-start_embedded \- OTP start script example for Unix
-.SH DESCRIPTION
-.LP
-This describes the \fIstart\fR script that is an example script on how to startup the Erlang system in embedded mode on Unix\&.
-.LP
-You can read more about the use in the \fIEmbedded System User\&'s Guide\fR\&.
-
-.SH EXPORTS
-.LP
-.B
-start [ data_file ]
-.br
-.RS
-.LP
-In the example there is one argument
-.RS 2
-.TP 4
-.B
-data_file:
-Optional, specifies what \fIstart_erl\&.data\fR file to use\&.
-.RE
-.LP
-There is also an environment variable \fIRELDIR\fR that can be set prior to calling this example that set the directory where to find the release files\&.
-.RE
-.SH SEE ALSO
-.LP
-run_erl(1)
 
=== removed file 'debian/manpages/start_webtool.1'
--- debian/manpages/start_webtool.1	2009-04-10 16:32:04 +0000
+++ debian/manpages/start_webtool.1	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-.TH start_webtool 1 "webtool  0.8.4" "Ericsson AB" "USER COMMANDS"
-.SH NAME
-start_webtool \- WebTool Start Script
-.SH DESCRIPTION
-.LP
-The \fIstart_webtool\fR script starts WebTool, a WebTool application and a web browser pointing to this application\&.
-
-.SH EXPORTS
-.LP
-.B
-start_webtool application [ browser ]
-.br
-.RS
-.LP
-Starts WebTool, the given WebTool Application and a web browser pointing to this application\&. 
-.LP
-If no argument is given, a list of available applications is displayed, e\&.g\&.
-
-.nf
->start_webtool
-Starting webtool\&.\&.\&.
-WebTool is available at http://localhost:8888/
-Or  http://127\&.0\&.0\&.1:8888/
-
-Usage: start_webtool application [ browser ]
-
-Available applications are: [orber,appmon,crashdump_viewer,webcover]
-Default browser is \&'iexplore\&' (Internet Explorer) on Windows or else \&'netscape\&'        
-.fi
-.LP
-To start any of the listed applications, give the application name as the first argument, e\&.g\&.
-
-.nf
->start_webtool webcover
-Starting webtool\&.\&.\&.
-WebTool is available at http://localhost:8888/
-Or  http://127\&.0\&.0\&.1:8888/
-Starting webcover\&.\&.\&.
-Sending URL to netscape\&.\&.\&.done        
-.fi
-.LP
-The WebTool application WebCover is then started and the default browser is used\&. The default broser is Internet Explorer on Windows or else Netscape\&. 
-.LP
-To use another browser, give the browser\&'s start command as the second argument, e\&.g\&.
-
-.nf
->start_webtool webcover mozilla
-Starting webtool\&.\&.\&.
-WebTool is available at http://localhost:8888/
-Or  http://127\&.0\&.0\&.1:8888/
-Starting webcover\&.\&.\&.
-Sending URL to mozilla\&.\&.\&.done        
-.fi
-.LP
-If the given browser name is not known to WebTool, WebTool will run it as a command with the start URL as the only argument, e\&.g\&.
-
-.nf
->start_webtool webcover mybrowser
-Starting webtool\&.\&.\&.
-WebTool is available at http://localhost:8888/
-Or  http://127\&.0\&.0\&.1:8888/
-Starting webcover\&.\&.\&.
-Starting mybrowser\&.\&.\&.        
-.fi
-.LP
-Here the command \fI"mybrowser http://localhost:8888/webcover"\fR is executed\&. 
-.RE
-.SH SEE ALSO
-.LP
-webtool(3erl)
 
=== modified file 'debian/manpages/typer.1'
--- debian/manpages/typer.1	2009-09-25 23:45:31 +0000
+++ debian/manpages/typer.1	2009-12-22 03:23:48 +0000
@@ -1,4 +1,4 @@
-.TH typer 1 "typer  0.1.7.2" "Ericsson AB" "USER COMMANDS"
+.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
 
=== modified file 'debian/patches/build-options.patch'
--- debian/patches/build-options.patch	2009-12-07 10:28:47 +0000
+++ debian/patches/build-options.patch	2009-12-22 03:23:48 +0000
@@ -7,10 +7,8 @@
 
 Also, add debug info to VM binaries if DEB_BUILD_OPTIONS contains "debug".
 
-Index: erlang-13.b.2.1-dfsg/Makefile.in
-===================================================================
---- erlang-13.b.2.1-dfsg.orig/Makefile.in	2009-12-07 10:29:19.000000000 +0100
-+++ erlang-13.b.2.1-dfsg/Makefile.in	2009-12-07 10:29:50.000000000 +0100
+--- erlang-13.b.3-dfsg.orig/Makefile.in
++++ erlang-13.b.3-dfsg/Makefile.in
 @@ -16,6 +16,9 @@
  # 
  # %CopyrightEnd%
@@ -21,10 +19,8 @@
  # Toplevel makefile for building the Erlang system
  #
  
-Index: erlang-13.b.2.1-dfsg/erts/etc/common/Makefile.in
-===================================================================
---- erlang-13.b.2.1-dfsg.orig/erts/etc/common/Makefile.in	2009-06-05 14:52:54.000000000 +0200
-+++ erlang-13.b.2.1-dfsg/erts/etc/common/Makefile.in	2009-12-07 10:29:50.000000000 +0100
+--- 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
@@ -41,10 +37,8 @@
              -e 's;%EMULATOR_NUMBER%;$(EMULATOR_NUMBER);' \
              -e 's;%VSN%;$(VSN);' \
                    ../unix/erl.src.src > erl.src
-Index: erlang-13.b.2.1-dfsg/erts/emulator/Makefile.in
-===================================================================
---- erlang-13.b.2.1-dfsg.orig/erts/emulator/Makefile.in	2009-09-18 16:06:45.000000000 +0200
-+++ erlang-13.b.2.1-dfsg/erts/emulator/Makefile.in	2009-12-07 10:31:47.000000000 +0100
+--- 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
@@ -63,11 +57,9 @@
  # rem liberts_internal.a
  endif
  
-Index: erlang-13.b.2.1-dfsg/make/otp.mk.in
-===================================================================
---- erlang-13.b.2.1-dfsg.orig/make/otp.mk.in	2009-03-12 13:26:33.000000000 +0100
-+++ erlang-13.b.2.1-dfsg/make/otp.mk.in	2009-12-07 10:29:50.000000000 +0100
-@@ -54,18 +54,17 @@
+--- 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
 
=== modified file 'debian/patches/clean.patch'
--- debian/patches/clean.patch	2009-09-25 23:45:31 +0000
+++ debian/patches/clean.patch	2009-12-22 03:23:48 +0000
@@ -3,9 +3,9 @@
 Erlang leaves many files after make clean. This patch contains
 a hack to remove them.
 
---- erlang-13.b.2-dfsg.orig/Makefile.in
-+++ erlang-13.b.2-dfsg/Makefile.in
-@@ -838,6 +838,7 @@
+--- erlang-13.b.3-dfsg.orig/Makefile.in
++++ erlang-13.b.3-dfsg/Makefile.in
+@@ -777,6 +777,7 @@
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
  	cd lib  && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
  	cd lib/dialyzer && ERL_TOP=$(ERL_TOP) $(MAKE) clean
@@ -13,7 +13,7 @@
  
  #
  # Just wipe out emulator, not libraries
-@@ -872,3 +873,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 file 'debian/patches/docs.patch'
--- debian/patches/docs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/docs.patch	2009-12-22 03:23:48 +0000
@@ -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"&#10;</xsl:text>
+-      <xsl:text>.SH MODULE&#10;</xsl:text>
++      <xsl:text>.SH NAME&#10;</xsl:text>
+       <xsl:value-of select="module"/><xsl:text> \- </xsl:text><xsl:value-of select="modulesummary"/><xsl:text>&#10;</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"&#10;</xsl:text>
+       <xsl:text>.SH NAME&#10;</xsl:text>
+-      <xsl:value-of select="file"/><xsl:text> \- </xsl:text><xsl:value-of select="filesummary"/><xsl:text>&#10;</xsl:text>  
++      <xsl:value-of select="app"/><xsl:text> \- </xsl:text><xsl:value-of select="appsummary"/><xsl:text>&#10;</xsl:text>  
+       <xsl:apply-templates/>
+   </xsl:template>
+ 
+@@ -268,7 +268,7 @@
+     <xsl:text>&#10;.TP</xsl:text>
+     <xsl:text>&#10;Types</xsl:text>
+     <xsl:apply-templates/>
+-    <xsl:text>&#10;.RE</xsl:text>
++    <xsl:text>&#10;.RE </xsl:text>
+   </xsl:template>
+ 
+ 
+@@ -288,7 +288,7 @@
+   <xsl:template match="desc">
+     <xsl:text>&#10;.RS</xsl:text>
+     <xsl:apply-templates/>
+-    <xsl:text>&#10;.RE</xsl:text>
++    <xsl:text>&#10;.RE </xsl:text>
+   </xsl:template>
+ 
+ 
+@@ -305,4 +305,60 @@
+     <xsl:value-of select="normalize-space()"/>
+   </xsl:template>
+ 
++  <!-- Authors -->
++  <xsl:template match="authors">
++    <xsl:text>&#10;.SH AUTHORS</xsl:text>
++    <xsl:apply-templates/>
++  </xsl:template>
++
++  <!-- Aname -->
++  <xsl:template match="authors/aname">
++    <xsl:text>&#10;.LP&#10;</xsl:text>
++    <xsl:apply-templates/>
++  </xsl:template>
++
++  <!-- Email -->
++  <xsl:template match="authors/email">
++    <xsl:text>&#10;.I&#10;&lt;</xsl:text>
++    <xsl:apply-templates/>
++    <xsl:text>&gt;</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="&quot;&apos;&quot;" />
++        <xsl:with-param name="with" select="&quot;\&amp;&apos;&quot;" />
++      </xsl:call-template>
++    </xsl:variable>
++    <xsl:call-template name="replace-string">
++      <xsl:with-param name="text" select="$rep1" />
++      <xsl:with-param name="replace" select="&quot;.&quot;" />
++      <xsl:with-param name="with" select="&quot;\&amp;.&quot;" />
++    </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 file 'debian/patches/emacs.patch'
--- debian/patches/emacs.patch	2009-09-25 23:45:31 +0000
+++ debian/patches/emacs.patch	2009-12-22 03:23:51 +0000
@@ -1,40 +1,9 @@
-emacs.patch by Sergei Golovan <[e-mail]>
-
-(1) Fixes bug with clause arrow syntax highlighting
-(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413052).
-
-(2) Fixes (partially) $' and $" patterns syntax highlighting.
-
-(3) Adds support of compressed manual pages search.
-
-(4) Patch by Balint Reczey <[e-mail]> fixes backquote
+Patch by Balint Reczey <[e-mail]> fixes backquote
 syntax (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494823).
 
-(5) Patch by Francois-Denis Gonthier
-(adapted from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=428054)
-fixes parentheses (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=536891).
-
---- erlang-13.b.2-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-13.b.2-dfsg/lib/tools/emacs/erlang.el
-@@ -474,7 +474,7 @@
- Should the flag the nil, the directory is absolute, should it be non-nil
- the directory is relative to the variable `erlang-root-dir'.")
- 
--(defvar erlang-man-max-menu-size 20
-+(defvar erlang-man-max-menu-size 35
-   "*The maximum number of menu items in one menu allowed.")
- 
- (defvar erlang-man-display-function 'erlang-man-display
-@@ -1839,7 +1839,7 @@
- 
- (defvar erlang-font-lock-keywords-arrow
-   (list
--   (list "\\(->\\|:-\\)\\(\\s \\|$\\)" 2 'font-lock-function-name-face))
-+   (list "\\(->\\|:-\\)\\(\\s \\|$\\)" 1 'font-lock-function-name-face))
-   "Font lock keyword highlighting clause arrow.")
- 
- (defvar erlang-font-lock-keywords-lc
-@@ -2058,27 +2058,23 @@
+--- erlang-13.b.3-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-13.b.3-dfsg/lib/tools/emacs/erlang.el
+@@ -2367,23 +2367,22 @@
  (or (fboundp 'eval-when-compile)
      (defmacro eval-when-compile (&rest rest) nil))
  
@@ -45,83 +14,20 @@
  (or (fboundp 'unless)
      (defmacro unless (condition &rest body)
        "(unless CONDITION BODY...): If CONDITION is false, do BODY, else return nil."
--      (` (if (, condition) 
--	     nil 
--	   (,@ body)))))
+-      `((if (, condition) nil ,@body))))
 +      (cons 'if  (cons condition (cons nil body)))))
  
  (or (fboundp 'when)
      (defmacro when (condition &rest body)
        "(when CONDITION BODY...): If CONDITION is true, do BODY, else return nil."
--      (` (if (, condition)
--	     (progn (,@ body)) 
--	   nil))))
+-      `((if (, condition) (progn ,@body) nil))))
 +      (list 'if condition (cons 'progn body) nil)))
-+
  
  (or (fboundp 'char-before)
      (defmacro char-before (&optional pos)
        "Return the character in the current buffer just before POS."
--      (` (char-after (1- (or (, pos) (point)))))))
+-      `( (char-after (1- (or ,pos (point)))))))
 +      (list 'char-after (list '1- (list 'or  pos '(point))))))
  
- (eval-when-compile
-   (if (or (featurep 'bytecomp)
-@@ -2189,7 +2185,7 @@
- 	(modify-syntax-entry ?\n ">" table)
- 	(modify-syntax-entry ?\" "\"" table)
- 	(modify-syntax-entry ?# "." table)
--	(modify-syntax-entry ?$ "'" table)
-+	(modify-syntax-entry ?$ "/" table)
- 	(modify-syntax-entry ?% "<" table)
- 	(modify-syntax-entry ?& "." table)
- 	(modify-syntax-entry ?\' "\"" table)
-@@ -2819,7 +2815,7 @@
- 
- (defun erlang-man-make-menu-item (file)
-   "Create a menu item containing the name of the man page."
--  (and (string-match ".*/\\([^/]+\\)\\.[^.]$" file)
-+  (and (string-match ".*/\\([^/]+\\)\\.\\([124-9]\\|3erl\\)?\\(\\.gz\\)?$" file)
-        (let ((page (substring file (match-beginning 1) (match-end 1))))
- 	 (list (capitalize page)
- 	       (list 'lambda '()
-@@ -2830,7 +2826,7 @@
- 
- (defun erlang-man-get-files (dir)
-   "Return files in directory DIR."
--  (directory-files dir t ".*\\.[0-9]\\'"))
-+  (directory-files dir t ".*\\.\\([124-9]\\|3erl\\)?\\(\\.gz\\)?\\'"))
- 
- 
- (defun erlang-man-module (&optional module)
-@@ -2850,7 +2846,7 @@
-   (if (or (null module) (string= module ""))
-       (error "No Erlang module name given"))
-   (let ((dir-list erlang-man-dirs)
--	(pat (concat "/" (regexp-quote module) "\\.[^.]$"))
-+	(pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3erl\\)?\\(\\.gz\\)?$"))
- 	(file nil)
- 	file-list)
-     (while (and dir-list (null file))
-@@ -2991,7 +2987,7 @@
-     (error nil))
-   (if file
-       (let ((process-environment (copy-sequence process-environment)))
--	(if (string-match "\\(.*\\)/man[^/]*/\\([^/]+\\)\\.[^.]$" file)
-+	(if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3erl\\)?\\(\\.gz\\)?$" file)
- 	    (let ((dir (substring file (match-beginning 1) (match-end 1)))
- 		  (page (substring file (match-beginning 2) (match-end 2))))
- 	      (if (fboundp 'setenv)
-@@ -3548,10 +3544,9 @@
- 	       (error "Missing `end'"))
- 	     ))
- 	    ((eq (car (car stack)) 'begin) 
--	     (error "Missing `end'") 
-+	     (error "Missing `end'")) 
- 	     (t
--	      (error "Unbalanced parenthesis"))
--	     ))
-+	      (error "Unbalanced parenthesis")))
-       (forward-char 1))
-      
-      ;; Character quote: Skip it and the quoted char.
+ ;; defvar some obsolete variables, which we still support for
+ ;; backwardscompatibility reasons.
 
=== modified file 'debian/patches/gnu.patch'
--- debian/patches/gnu.patch	2009-09-25 23:45:31 +0000
+++ debian/patches/gnu.patch	2009-12-22 03:23:48 +0000
@@ -10,9 +10,9 @@
 
 (4) Skips building SSL certificate examples for GNU/Hurd (Debian GNU/Hurd has
     no a random translator yet).
---- erlang-13.b.2-dfsg.orig/erts/configure.in
-+++ erlang-13.b.2-dfsg/erts/configure.in
-@@ -329,7 +329,7 @@
+--- erlang-13.b.3-dfsg.orig/erts/configure.in
++++ erlang-13.b.3-dfsg/erts/configure.in
+@@ -339,7 +339,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -21,7 +21,7 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -965,7 +965,7 @@
+@@ -996,7 +996,7 @@
  	    solaris*)
  		enable_child_waiter_thread=yes
  		;;
@@ -30,8 +30,8 @@
  		AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX,[1],
  			[Define if malloc should use a recursive mutex])
  		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
---- erlang-13.b.2-dfsg.orig/lib/common_test/Makefile
-+++ erlang-13.b.2-dfsg/lib/common_test/Makefile
+--- erlang-13.b.3-dfsg.orig/lib/common_test/Makefile
++++ erlang-13.b.3-dfsg/lib/common_test/Makefile
 @@ -30,9 +30,13 @@
  ifeq ($(findstring solaris,$(TARGET)),solaris)
  SUB_DIRECTORIES = doc/src src priv
@@ -46,8 +46,8 @@
  
  include vsn.mk
  VSN = $(COMMON_TEST_VSN)
---- erlang-13.b.2-dfsg.orig/lib/common_test/priv/Makefile.in
-+++ erlang-13.b.2-dfsg/lib/common_test/priv/Makefile.in
+--- erlang-13.b.3-dfsg.orig/lib/common_test/priv/Makefile.in
++++ erlang-13.b.3-dfsg/lib/common_test/priv/Makefile.in
 @@ -43,9 +43,13 @@
  ifeq ($(findstring solaris,$(TARGET)),solaris)
  XNIX = true
@@ -62,8 +62,8 @@
  
  ifneq ($(findstring win32,$(TARGET)),win32)
  
---- erlang-13.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-13.b.2-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-13.b.3-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-13.b.3-dfsg/lib/os_mon/c_src/memsup.c
 @@ -110,6 +110,11 @@
  #include <memLib.h>
  #endif
@@ -76,8 +76,8 @@
  #ifdef BSD4_4
  #include <sys/types.h>
  #include <sys/sysctl.h>
---- erlang-13.b.2-dfsg.orig/lib/ssl/Makefile
-+++ erlang-13.b.2-dfsg/lib/ssl/Makefile
+--- erlang-13.b.3-dfsg.orig/lib/ssl/Makefile
++++ erlang-13.b.3-dfsg/lib/ssl/Makefile
 @@ -32,8 +32,15 @@
  SKIP_BUILDING_BINARIES := true
  endif
 
=== modified file 'debian/patches/m68k.patch'
--- debian/patches/m68k.patch	2009-09-25 23:45:31 +0000
+++ debian/patches/m68k.patch	2009-12-22 03:23:50 +0000
@@ -7,8 +7,8 @@
 
 (2) Non-working networking besause of blind conversion of long to a pointer.
 
---- erlang-13.b.2-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-13.b.2-dfsg/erts/emulator/beam/binary.c
+--- erlang-13.b.3-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-13.b.3-dfsg/erts/emulator/beam/binary.c
 @@ -31,6 +31,10 @@
  #include "erl_binary.h"
  #include "erl_bits.h"
@@ -20,9 +20,9 @@
  #ifdef DEBUG
  static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
  #else
---- erlang-13.b.2-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-13.b.2-dfsg/erts/emulator/beam/erl_driver.h
-@@ -516,7 +516,7 @@
+--- erlang-13.b.3-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-13.b.3-dfsg/erts/emulator/beam/erl_driver.h
+@@ -570,7 +570,7 @@
  EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
  extern const ErlDrvTermData driver_term_nil;
  EXTERN ErlDrvTermData driver_mk_term_nil(void);
 
=== modified file 'debian/patches/man.patch'
--- debian/patches/man.patch	2009-09-25 23:45:31 +0000
+++ debian/patches/man.patch	2009-12-22 03:23:49 +0000
@@ -4,9 +4,9 @@
 (Erlang manual pages are placed to /usr/share/man/ hierarchy
 as required by Debian policy.)
 
---- erlang-13.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-13.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -697,8 +697,10 @@
+--- erlang-13.b.3-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-13.b.3-dfsg/erts/etc/common/erlexec.c
+@@ -699,8 +699,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";
@@ -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 file 'debian/patches/native.patch'
--- debian/patches/native.patch	2009-05-01 10:14:38 +0000
+++ debian/patches/native.patch	2009-12-22 03:23:48 +0000
@@ -2,9 +2,9 @@