[Pkg-erlang-commits] r1302 - in erlang/branches/experimental/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Fri Dec 10 15:34:53 UTC 2010 

Author: sgolovan
Date: 2010-12-10 15:34:52 +0000 (Fri, 10 Dec 2010)
New Revision: 1302

Modified:
   erlang/branches/experimental/debian/changelog
   erlang/branches/experimental/debian/control
   erlang/branches/experimental/debian/erlang-common-test.manpages
   erlang/branches/experimental/debian/patches/clean.patch
   erlang/branches/experimental/debian/patches/docs.patch
   erlang/branches/experimental/debian/patches/emacs.patch
   erlang/branches/experimental/debian/patches/gnu.patch
   erlang/branches/experimental/debian/patches/hppa.patch
   erlang/branches/experimental/debian/patches/java.patch
   erlang/branches/experimental/debian/patches/m68k.patch
   erlang/branches/experimental/debian/patches/man.patch
   erlang/branches/experimental/debian/patches/native.patch
   erlang/branches/experimental/debian/patches/powerpc.patch
   erlang/branches/experimental/debian/patches/rpath.patch
   erlang/branches/experimental/debian/patches/sparc.patch
   erlang/branches/experimental/debian/patches/ssl.patch
   erlang/branches/experimental/debian/rules
Log:
[erlang-experimental]
  * New upstream release.


Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/changelog	2010-12-10 15:34:52 UTC (rev 1302)
@@ -1,8 +1,8 @@
-erlang (1:14.b-dfsg-2) UNRELEASED; urgency=low
+erlang (1:14.b.1-dfsg-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 31 Oct 2010 02:10:30 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 10 Dec 2010 18:33:39 +0300
 
 erlang (1:14.b-dfsg-1) experimental; urgency=low
 

Modified: erlang/branches/experimental/debian/control
===================================================================
--- erlang/branches/experimental/debian/control	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/control	2010-12-10 15:34:52 UTC (rev 1302)
@@ -78,7 +78,7 @@
 
 Package: erlang-common-test
 Architecture: any
-Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-debugger (= ${binary:Version}), erlang-inets (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-snmp (= ${binary:Version}), erlang-ssh (= ${binary:Version}), erlang-test-server (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-webtool (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: erlang, erlang-manpages, erlang-doc
 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 (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
 Description: Erlang/OTP application for automated testing
@@ -196,7 +196,7 @@
 
 Package: erlang-erl-docgen
 Architecture: any
-Depends: ${erlang-base}, ${misc:Depends}
+Depends: ${erlang-base}, erlang-edoc (= ${binary:Version}), erlang-xmerl (= ${binary:Version}), ${misc:Depends}
 Suggests: xsltproc, fop, erlang, erlang-manpages, erlang-doc
 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 (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
 Description: Erlang/OTP documentation stylesheets
@@ -588,7 +588,7 @@
 Package: erlang-examples
 Architecture: all
 Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends}
-Recommends: erlang-asn1, erlang-gs, erlang-megaco, erlang-snmp, erlang-ssl, erlang-syntax-tools, erlang-wx
+Recommends: erlang-asn1, erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-wx
 Suggests: erlang, erlang-manpages, erlang-doc
 Replaces: erlang (<< ${binary:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-dev (<< ${binary:Version}), erlang-src (<< ${binary:Version}), erlang-mode (<< 1:12.b.1-dfsg-2)
 Description: Erlang/OTP application examples
@@ -667,7 +667,7 @@
   * Dynamic code replacement at runtime.
  .
  The Erlang distribution also includes OTP (Open Telecom Platform) which
- provides a reach set of libraries and applications.
+ provides a rich set of libraries and applications.
  .
  This package is a dummy package which will install Erlang/OTP runtime,
  applications, sources, code examples and the Erlang editing mode for Emacs.

Modified: erlang/branches/experimental/debian/erlang-common-test.manpages
===================================================================
--- erlang/branches/experimental/debian/erlang-common-test.manpages	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/erlang-common-test.manpages	2010-12-10 15:34:52 UTC (rev 1302)
@@ -1 +1 @@
-debian/erlang-docs/usr/lib/erlang/man/man1/run_test.1
+debian/erlang-docs/usr/lib/erlang/man/man1/ct_run.1

Modified: erlang/branches/experimental/debian/patches/clean.patch
===================================================================
--- erlang/branches/experimental/debian/patches/clean.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/clean.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -3,9 +3,9 @@
 Erlang leaves many files after make clean. This patch contains
 a hack to remove them.
 
---- erlang-14.b-dfsg.orig/Makefile.in
-+++ erlang-14.b-dfsg/Makefile.in
-@@ -992,6 +992,7 @@
+--- erlang-14.b.1-dfsg.orig/Makefile.in
++++ erlang-14.b.1-dfsg/Makefile.in
+@@ -995,6 +995,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
-@@ -1027,3 +1028,191 @@
+@@ -1030,3 +1031,170 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------
@@ -31,6 +31,7 @@
 +	rm -rf $(ERL_TOP)/bootstrap/lib/syntax_tools
 +	rm -rf $(ERL_TOP)/bootstrap/lib/test_server
 +	rm -rf $(ERL_TOP)/bootstrap/lib/wx
++	rm -rf $(ERL_TOP)/bootstrap/target
 +	rm -rf $(ERL_TOP)/erts/config.log
 +	rm -rf $(ERL_TOP)/erts/config.status
 +	rm -rf $(ERL_TOP)/erts/emulator/$(TARGET)
@@ -57,13 +58,12 @@
 +	rm -rf $(ERL_TOP)/erts/obj.debug/$(TARGET)
 +	rm -rf $(ERL_TOP)/erts/start_scripts/RELEASES.src
 +	rm -rf $(ERL_TOP)/erts/start_scripts/tmp
-+	rm -rf $(ERL_TOP)/lib/asn1/c_src/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/asn1/priv/lib/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/asn1/priv/obj/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/common_test/config.log
 +	rm -rf $(ERL_TOP)/lib/common_test/config.status
-+	rm -rf $(ERL_TOP)/lib/common_test/install.sh
 +	rm -rf $(ERL_TOP)/lib/common_test/priv/$(TARGET)
++	rm -rf $(ERL_TOP)/lib/common_test/priv/install.sh
 +	rm -rf $(ERL_TOP)/lib/config.log
 +	rm -rf $(ERL_TOP)/lib/config.status
 +	rm -rf $(ERL_TOP)/lib/cosEventDomain/include/CosEventDomainAdmin_EventDomainFactory.hrl
@@ -81,9 +81,6 @@
 +	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/et/doc/html/.html
-+	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)
@@ -93,11 +90,9 @@
 +	rm -rf $(ERL_TOP)/lib/ic/priv/ic.jar
 +	rm -rf $(ERL_TOP)/lib/ic/priv/lib/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/ic/priv/obj/$(TARGET)
++	rm -rf $(ERL_TOP)/lib/jinterface/pom.xml
 +	rm -rf $(ERL_TOP)/lib/jinterface/priv/com
 +	rm -rf $(ERL_TOP)/lib/jinterface/priv/OtpErlang.jar
-+	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
@@ -111,13 +106,6 @@
 +	rm -rf $(ERL_TOP)/lib/mnesia/doc/src/Mnesia_chap4.xml
 +	rm -rf $(ERL_TOP)/lib/mnesia/doc/src/Mnesia_chap5.xml
 +	rm -rf $(ERL_TOP)/lib/mnesia/doc/src/Mnesia_chap7.xml
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_AttrNames.erl
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_Checkpoints.erl
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_Indices.erl
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_KeyList.erl
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_NodeList.erl
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_Recordlist.erl
-+	rm -rf $(ERL_TOP)/lib/mnesia_session/src/mnesia_TableList.erl
 +	rm -rf $(ERL_TOP)/lib/odbc/config.log
 +	rm -rf $(ERL_TOP)/lib/odbc/config.status
 +	rm -rf $(ERL_TOP)/lib/odbc/c_src/$(TARGET)
@@ -129,20 +117,12 @@
 +	rm -rf $(ERL_TOP)/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_NotEmpty.erl
 +	rm -rf $(ERL_TOP)/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_NotFound.erl
 +	rm -rf $(ERL_TOP)/lib/orber/c_src/$(TARGET)
-+	rm -rf $(ERL_TOP)/lib/orber/priv/bin/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/orber/priv/obj/$(TARGET)
-+	rm -rf $(ERL_TOP)/lib/orber/src/OrberCSIv2.beam
-+	rm -rf $(ERL_TOP)/lib/orber/src/PKIX1Explicit88.asn1db
-+	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
-+	rm -rf $(ERL_TOP)/lib/percept/c_src/$(TARGET)
-+	rm -rf $(ERL_TOP)/lib/percept/priv/lib
-+	rm -rf $(ERL_TOP)/lib/percept/priv/obj/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/runtime_tools/c_src/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/runtime_tools/priv/lib/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/runtime_tools/priv/obj/$(TARGET)
@@ -151,8 +131,6 @@
 +	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)
 +	rm -rf $(ERL_TOP)/lib/ssl/priv/obj/$(TARGET)
 +	rm -rf $(ERL_TOP)/lib/test_server/src/configure
@@ -165,7 +143,8 @@
 +	rm -rf $(ERL_TOP)/lib/wx/c_src/Makefile
 +	rm -rf $(ERL_TOP)/lib/wx/doc/src/ref_man.xml
 +	rm -rf $(ERL_TOP)/lib/wx/$(TARGET)
-+	rm -rf $(ERL_TOP)/lib/wx/priv/$(TARGET)
++	rm -rf $(ERL_TOP)/lib/wx/priv/erl_gl.so
++	rm -rf $(ERL_TOP)/lib/wx/priv/wxe_driver.so
 +	rm -rf $(ERL_TOP)/lib/xmerl/doc/src/xmerl_ug.xml
 +	rm -rf $(ERL_TOP)/make/emd2exml
 +	rm -rf $(ERL_TOP)/make/$(TARGET)
@@ -191,8 +170,8 @@
 +	rm -rf $(ERL_TOP)/system/doc/installation_guide/INSTALL-CROSS.xml
 +	rm -rf $(ERL_TOP)/system/doc/installation_guide/INSTALL-WIN32.xml
 +	rm -rf $(ERL_TOP)/system/doc/installation_guide/INSTALL.xml
-+	rm -rf $(ERL_TOP)/system/doc/pdf/otp-system-documentation-5.8.fo
-+	rm -rf $(ERL_TOP)/system/doc/pdf/otp-system-documentation-5.8.pdf
++	rm -rf $(ERL_TOP)/system/doc/pdf/otp-system-documentation-*.fo
++	rm -rf $(ERL_TOP)/system/doc/pdf/otp-system-documentation-*.pdf
 +	rm -rf $(ERL_TOP)/system/doc/programming_examples/funs.xml
 +	rm -rf $(ERL_TOP)/system/doc/top/ebin/erl_html_tools.beam
 +	rm -rf $(ERL_TOP)/system/doc/top/ebin/erlresolvelinks.beam

Modified: erlang/branches/experimental/debian/patches/docs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/docs.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/docs.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -1,37 +1,31 @@
 Author: Sergei Golovan <sgolovan at debian.org>
-Description: Fixes a bug with .RE macro in the Erlang manpages.
-Last-modified:Sat, 27 Feb 2010 09:35:21 +0300
+Description: Fixes a bug with .RE macro in the Erlang manpages
+ and a few bugs with docs installation.
+Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
 
---- erlang-14.b-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-14.b-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
-@@ -53,7 +53,7 @@
-   <xsl:template match="list">
-     <xsl:text>&#10;.RS 2</xsl:text>
-     <xsl:apply-templates/>
--    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE&#10;</xsl:text>
-   </xsl:template>
+--- erlang-14.b.1-dfsg.orig/Makefile.in
++++ erlang-14.b.1-dfsg/Makefile.in
+@@ -409,7 +409,7 @@
+ 	  ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
  
-   <xsl:template match="list/item">
-@@ -66,7 +66,7 @@
-   <xsl:template match="taglist">
-     <xsl:text>&#10;.RS 2</xsl:text>
-     <xsl:apply-templates select="tag|item"/>
--    <xsl:text>&#10;.RE</xsl:text>
-+    <xsl:text>&#10;.RE&#10;</xsl:text>
-   </xsl:template>
-   
-   <xsl:template match="taglist/tag">
-@@ -91,7 +91,7 @@
-         <xsl:text>&#10;.RS 2</xsl:text>     
-         <xsl:text>&#10;.LP&#10;&#10;.LP&#10;</xsl:text>     
+ mod2app:
+-	$(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
++	$(ERL_TOP)/bin/escript $(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+ 
+ # ----------------------------------------------------------------------
+ ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts
+--- erlang-14.b.1-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-14.b.1-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+@@ -361,7 +361,7 @@
+         <xsl:text>&#10;.RS 2</xsl:text>
+         <xsl:text>&#10;.LP&#10;&#10;.LP&#10;</xsl:text>
          <xsl:value-of select="$content"/>
--        <xsl:text>&#10;.RE</xsl:text>     
-+        <xsl:text>&#10;.RE&#10;</xsl:text>     
+-        <xsl:text>&#10;.RE</xsl:text>
++        <xsl:text>&#10;.RE&#10;</xsl:text>
        </xsl:otherwise>
      </xsl:choose>
    </xsl:template>
-@@ -287,7 +287,7 @@
+@@ -573,7 +573,7 @@
      <xsl:text>&#10;.TP</xsl:text>
      <xsl:text>&#10;Types</xsl:text>
      <xsl:apply-templates/>
@@ -40,7 +34,7 @@
    </xsl:template>
  
  
-@@ -307,7 +307,7 @@
+@@ -593,7 +593,7 @@
    <xsl:template match="desc">
      <xsl:text>&#10;.RS</xsl:text>
      <xsl:apply-templates/>
@@ -49,8 +43,8 @@
    </xsl:template>
  
  
---- erlang-14.b-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-14.b-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-14.b.1-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-14.b.1-dfsg/lib/megaco/doc/src/Makefile
 @@ -247,8 +247,6 @@
  	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
  	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
@@ -69,18 +63,18 @@
  endif
  endif
  
---- erlang-14.b-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-14.b-dfsg/lib/stdlib/doc/src/re.xml
-@@ -353,7 +353,7 @@
+--- erlang-14.b.1-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-14.b.1-dfsg/lib/stdlib/doc/src/re.xml
+@@ -348,7 +348,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
+       match. This option only affects the behavior of the circumflex
 -      metacharacter. It does not affect \A.</item>
 +      metacharacter. It does not affect \\A.</item>
  
        <tag><c>noteol</c></tag>
  
-@@ -362,8 +362,8 @@
+@@ -357,8 +357,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

Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/emacs.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -3,8 +3,8 @@
 Also, it fixes manpage name regexp matching only 3erl manpages in
 section 3.
 
---- erlang-14.b-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-14.b-dfsg/lib/tools/emacs/erlang.el
+--- erlang-14.b.1-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-14.b.1-dfsg/lib/tools/emacs/erlang.el
 @@ -492,8 +492,8 @@
  (defvar erlang-man-dirs
    '(("Man - Commands" "/man/man1" t)
@@ -44,7 +44,7 @@
  
  ;; defvar some obsolete variables, which we still support for
  ;; backwardscompatibility reasons.
-@@ -1919,7 +1918,7 @@
+@@ -1935,7 +1934,7 @@
  
  (defun erlang-man-make-menu-item (file)
    "Create a menu item containing the name of the man page."
@@ -53,7 +53,7 @@
         (let ((page (substring file (match-beginning 1) (match-end 1))))
  	 (list (capitalize page)
  	       (list 'lambda '()
-@@ -1930,7 +1929,7 @@
+@@ -1946,7 +1945,7 @@
  
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -62,7 +62,7 @@
  
  
  (defun erlang-man-module (&optional module)
-@@ -1950,7 +1949,7 @@
+@@ -1966,7 +1965,7 @@
    (if (or (null module) (string= module ""))
        (error "No Erlang module name given"))
    (let ((dir-list erlang-man-dirs)
@@ -71,7 +71,7 @@
  	(file nil)
  	file-list)
      (while (and dir-list (null file))
-@@ -2091,9 +2090,9 @@
+@@ -2107,9 +2106,9 @@
      (error nil))
    (if file
        (let ((process-environment (copy-sequence process-environment)))

Modified: erlang/branches/experimental/debian/patches/gnu.patch
===================================================================
--- erlang/branches/experimental/debian/patches/gnu.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/gnu.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -5,9 +5,10 @@
     with 'gnu' substring in OS name. Fixes FTBFS on GNU/kFreeBSD and GNU/Hurd.
 
 (2) Undefines BSD4_4 for os_mon application for GNU/Hurd;
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -378,7 +378,7 @@
+
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -385,7 +385,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -16,7 +17,7 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1177,7 +1177,7 @@
+@@ -1184,7 +1184,7 @@
  	    solaris*)
  		enable_child_waiter_thread=yes
  		;;
@@ -25,8 +26,8 @@
  		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
  		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
  		    AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
---- erlang-14.b-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-14.b-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-14.b.1-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-14.b.1-dfsg/lib/os_mon/c_src/memsup.c
 @@ -110,6 +110,11 @@
  #include <memLib.h>
  #endif

Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/hppa.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -6,9 +6,9 @@
 Forwarded: no
 Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
 
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -1730,6 +1730,14 @@
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -1802,6 +1802,14 @@
  AC_FUNC_SETVBUF_REVERSED	
  
  disable_vfork=false

Modified: erlang/branches/experimental/debian/patches/java.patch
===================================================================
--- erlang/branches/experimental/debian/patches/java.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/java.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -6,9 +6,9 @@
 Forwarded: yes
 Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
 
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -4005,7 +4005,8 @@
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -4101,7 +4101,8 @@
    dnl Make sure it's at least JDK 1.5
    AC_CACHE_CHECK(for JDK version 1.5, 
       ac_cv_prog_javac_ver_1_5,
@@ -18,8 +18,8 @@
          ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
    if test $ac_cv_prog_javac_ver_1_5 = no; then
      unset -v JAVAC
---- erlang-14.b-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-14.b-dfsg/lib/test_server/src/configure.in
+--- erlang-14.b.1-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-14.b.1-dfsg/lib/test_server/src/configure.in
 @@ -399,7 +399,8 @@
    dnl Make sure it's at least JDK 1.5
    AC_CACHE_CHECK(for JDK version 1.5, 

Modified: erlang/branches/experimental/debian/patches/m68k.patch
===================================================================
--- erlang/branches/experimental/debian/patches/m68k.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/m68k.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -7,8 +7,8 @@
 
 (2) Non-working networking besause of blind conversion of long to a pointer.
 
---- erlang-14.b-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-14.b-dfsg/erts/emulator/beam/binary.c
+--- erlang-14.b.1-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-14.b.1-dfsg/erts/emulator/beam/binary.c
 @@ -31,6 +31,10 @@
  #include "erl_binary.h"
  #include "erl_bits.h"
@@ -20,8 +20,8 @@
  #ifdef DEBUG
  static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
  #else
---- erlang-14.b-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-14.b-dfsg/erts/emulator/beam/erl_driver.h
+--- erlang-14.b.1-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-14.b.1-dfsg/erts/emulator/beam/erl_driver.h
 @@ -562,7 +562,7 @@
  EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
  extern const ErlDrvTermData driver_term_nil;

Modified: erlang/branches/experimental/debian/patches/man.patch
===================================================================
--- erlang/branches/experimental/debian/patches/man.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/man.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -4,13 +4,13 @@
 (Erlang manual pages are placed to /usr/share/man/ hierarchy
 as required by Debian policy.)
 
---- erlang-14.b-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-14.b-dfsg/erts/etc/common/erlexec.c
-@@ -714,8 +714,10 @@
+--- erlang-14.b.1-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-14.b.1-dfsg/erts/etc/common/erlexec.c
+@@ -720,8 +720,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";
--			sprintf(tmpStr, "%s/man", rootdir);
+-			erts_snprintf(tmpStr, sizeof(tmpStr), "%s/man", rootdir);
 -			set_env("MANPATH", tmpStr);
 +			/*
 +			* Conform to erlang-manpages content.

Modified: erlang/branches/experimental/debian/patches/native.patch
===================================================================
--- erlang/branches/experimental/debian/patches/native.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/native.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -2,8 +2,8 @@
 
 Adds native code to all Erlang binaries if HiPE is enabled.
 
---- erlang-14.b-dfsg.orig/make/otp.mk.in
-+++ erlang-14.b-dfsg/make/otp.mk.in
+--- erlang-14.b.1-dfsg.orig/make/otp.mk.in
++++ erlang-14.b.1-dfsg/make/otp.mk.in
 @@ -89,6 +89,11 @@
        ERL_COMPILE_FLAGS += +slim
      else

Modified: erlang/branches/experimental/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/powerpc.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/powerpc.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -2,9 +2,9 @@
 Description: Patch defines HiPE architecture ppc for powerpc arch.
 Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
 
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -613,6 +613,7 @@
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -620,6 +620,7 @@
      x86_64)	ARCH=amd64;;
      amd64)	ARCH=amd64;;
      macppc)	ARCH=ppc;;

Modified: erlang/branches/experimental/debian/patches/rpath.patch
===================================================================
--- erlang/branches/experimental/debian/patches/rpath.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/rpath.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -3,9 +3,10 @@
  satisfy Debian policy.
 Forwarded: no
 Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -3861,9 +3861,9 @@
+
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -3957,9 +3957,9 @@
  SSL_CC_RUNTIME_LIBRARY_PATH=
  SSL_LD_RUNTIME_LIBRARY_PATH=
  SSL_DED_LD_RUNTIME_LIBRARY_PATH=

Modified: erlang/branches/experimental/debian/patches/sparc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/sparc.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/sparc.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -5,9 +5,9 @@
 
 (2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
 
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -602,7 +602,7 @@
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -609,7 +609,7 @@
  fi
  
  case $chk_arch_ in
@@ -16,8 +16,8 @@
      sparc64)	ARCH=sparc64;;
      sun4v)	ARCH=ultrasparc;;
      i86pc)	ARCH=x86;;
---- erlang-14.b-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-14.b-dfsg/erts/emulator/beam/beam_emu.c
+--- erlang-14.b.1-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-14.b.1-dfsg/erts/emulator/beam/beam_emu.c
 @@ -1022,16 +1022,6 @@
   * in registers.
   */

Modified: erlang/branches/experimental/debian/patches/ssl.patch
===================================================================
--- erlang/branches/experimental/debian/patches/ssl.patch	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/patches/ssl.patch	2010-12-10 15:34:52 UTC (rev 1302)
@@ -2,20 +2,20 @@
 
 Patch adds support for IPv6 to the ssl application.
 
---- erlang-14.b-dfsg.orig/erts/configure.in
-+++ erlang-14.b-dfsg/erts/configure.in
-@@ -1713,6 +1713,8 @@
- 	esac
- fi
- AC_CHECK_FUNCS([getnameinfo getipnodebyname getipnodebyaddr gethostbyname2])
+--- erlang-14.b.1-dfsg.orig/erts/configure.in
++++ erlang-14.b.1-dfsg/erts/configure.in
+@@ -1785,6 +1785,8 @@
+ 
+ 
+ AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
 +AC_CHECK_FUNCS([inet_pton])
 +AC_CHECK_TYPES([struct sockaddr_storage],,,[#include <netinet/in.h>])
  
  AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
  		pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang-14.b-dfsg.orig/erts/config.h.in
-+++ erlang-14.b-dfsg/erts/config.h.in
-@@ -287,6 +287,9 @@
+--- erlang-14.b.1-dfsg.orig/erts/config.h.in
++++ erlang-14.b.1-dfsg/erts/config.h.in
+@@ -290,6 +290,9 @@
  /* Define if ipv6 is present */
  #undef HAVE_IN6
  
@@ -25,7 +25,7 @@
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
-@@ -476,6 +479,9 @@
+@@ -485,6 +488,9 @@
  /* Define to 1 if `ssf_data' is member of `struct sctp_send_failed'. */
  #undef HAVE_STRUCT_SCTP_SEND_FAILED_SSF_DATA
  
@@ -35,8 +35,8 @@
  /* Define to 1 if you have the <syslog.h> header file. */
  #undef HAVE_SYSLOG_H
  
---- erlang-14.b-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-14.b-dfsg/lib/ssl/c_src/esock.c
+--- erlang-14.b.1-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang-14.b.1-dfsg/lib/ssl/c_src/esock.c
 @@ -132,6 +132,11 @@
  #define INADDR_NONE 0xffffffff  /* Should be in <netinet/in.h>.  */
  #endif
@@ -304,8 +304,8 @@
  static Connection *new_connection(int state, FD fd)
  {
      Connection *cp;
---- erlang-14.b-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-14.b-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang-14.b.1-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang-14.b.1-dfsg/lib/ssl/src/ssl_broker.erl
 @@ -471,7 +471,7 @@
      debug(St, "peername: client = ~w~n", [Client]),
      Reply = case ssl_server:peername(St#st.fd) of
@@ -428,8 +428,8 @@
  get_tagged_opt(Tag, Opts, Default) ->
      case lists:keysearch(Tag, 1, Opts) of
  	{value, {_, Value}} ->
---- erlang-14.b-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-14.b-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang-14.b.1-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang-14.b.1-dfsg/lib/ssl/src/ssl_prim.erl
 @@ -118,7 +118,7 @@
  peername(#st{fd = Fd, status = open}) ->
      case ssl_server:peername_prim(ssl_server_prim, Fd) of
@@ -448,8 +448,8 @@
  	    {ok, {At, Port}};
  	Error ->
  	    Error
---- erlang-14.b-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-14.b-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang-14.b.1-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang-14.b.1-dfsg/lib/ssl/src/ssl_server.erl
 @@ -1363,7 +1363,10 @@
  
  ip_to_string({A,B,C,D}) ->

Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules	2010-12-05 20:31:48 UTC (rev 1301)
+++ erlang/branches/experimental/debian/rules	2010-12-10 15:34:52 UTC (rev 1302)
@@ -417,7 +417,7 @@
 	dh_installmenu -i
 	dh_link -i
 	dh_strip -i
-	dh_compress -i -X.txt -X.erl -X.hrl -X.c -X.js -X.kwc -X.pdf -X.eix
+	dh_compress -i -X.txt -X.erl -X.hrl -X.c -X.js -X.kwc -X.pdf -X.eix -X.src -X.beam
 	dh_fixperms -i
 	dh_makeshlibs -i
 	dh_installdeb -i
@@ -504,8 +504,8 @@
 
 binary: binary-indep binary-arch
 
-REL=R14B
-DEB_REL=14.b-dfsg
+REL=R14B01
+DEB_REL=14.b.1-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \

More information about the Pkg-erlang-commits mailing list