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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Mar 6 10:32:56 UTC 2014 

Author: sgolovan
Date: 2014-03-06 10:32:56 +0000 (Thu, 06 Mar 2014)
New Revision: 1604

Modified:
   erlang/branches/experimental/debian/changelog
   erlang/branches/experimental/debian/control
   erlang/branches/experimental/debian/erlang-common-test.links.in
   erlang/branches/experimental/debian/patches/clean.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/powerpc.patch
   erlang/branches/experimental/debian/patches/rpath.patch
   erlang/branches/experimental/debian/patches/sparc.patch
   erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns
   erlang/branches/experimental/debian/patterns/erlang-base.patterns
   erlang/branches/experimental/debian/patterns/erlang-src.patterns
   erlang/branches/experimental/debian/rules
Log:
[erlang-experimental]
  * New upstream release candidate.
  * Fixed symlinks to jquery.min.js and jquery.tablesorter.min.js.


Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/changelog	2014-03-06 10:32:56 UTC (rev 1604)
@@ -1,8 +1,9 @@
-erlang (1:17.0~rc1-dfsg-2) UNRELEASED; urgency=low
+erlang (1:17.0~rc2-dfsg-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release candidate.
+  * Fixed symlinks to jquery.min.js and jquery.tablesorter.min.js.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 01 Feb 2014 15:19:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 06 Mar 2014 14:28:23 +0400
 
 erlang (1:17.0~rc1-dfsg-1) experimental; urgency=low
 

Modified: erlang/branches/experimental/debian/control
===================================================================
--- erlang/branches/experimental/debian/control	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/control	2014-03-06 10:32:56 UTC (rev 1604)
@@ -30,6 +30,7 @@
   compiler - compiles Erlang code to byte-code;
   erts - the Erlang runtime system application;
   kernel - code necessary to run the Erlang runtime system itself;
+  ose - code for Enea OSE operating system;
   sasl - the system architecture support libraries application;
   stdlib - modules for manipulating lists, strings, files etc.
 
@@ -50,6 +51,7 @@
   compiler - compiles Erlang code to byte-code;
   erts - the Erlang runtime system application;
   kernel - code necessary to run the Erlang runtime system itself;
+  ose - code for Enea OSE operating system;
   sasl - the system architecture support libraries application;
   stdlib - modules for manipulating lists, strings, files etc.
 

Modified: erlang/branches/experimental/debian/erlang-common-test.links.in
===================================================================
--- erlang/branches/experimental/debian/erlang-common-test.links.in	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/erlang-common-test.links.in	2014-03-06 10:32:56 UTC (rev 1604)
@@ -1,3 +1,3 @@
 usr/lib/erlang/bin/ct_run	usr/bin/ct_run
-usr/share/javascript/jquery/jquery.min.js   usr/lib/erlang/lib/common-test- at COMMON_TEST_VSN@/priv/jquery-latest.js
-usr/share/javascript/jquery-tablesorter/jquery.tablesorter.min.js   usr/lib/erlang/lib/common-test- at COMMON_TEST_VSN@/priv/jquery.tablesorter.min.js
+usr/share/javascript/jquery/jquery.min.js   usr/lib/erlang/lib/common_test- at COMMON_TEST_VSN@/priv/jquery-latest.js
+usr/share/javascript/jquery-tablesorter/jquery.tablesorter.min.js   usr/lib/erlang/lib/common_test- at COMMON_TEST_VSN@/priv/jquery.tablesorter.min.js

Modified: erlang/branches/experimental/debian/patches/clean.patch
===================================================================
--- erlang/branches/experimental/debian/patches/clean.patch	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/clean.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -5,15 +5,15 @@
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -995,6 +995,7 @@
- 	find . -type f -name SKIP -print | xargs $(RM)
+@@ -1087,6 +1087,7 @@
+ 	rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
  	cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
  	cd lib  && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
 +	$(MAKE) additional_clean
  
- #
- # Just wipe out emulator, not libraries
-@@ -1032,3 +1033,209 @@
+ distclean: clean
+ 	find . -type f -name SKIP              -print | xargs $(RM)
+@@ -1128,3 +1129,209 @@
  		|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
  
  # ----------------------------------------------------------------------

Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/emacs.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -16,7 +16,7 @@
    "*The man directories displayed in the Erlang menu.
  
  Each item in the list should be a list with three elements, the first
-@@ -1283,23 +1283,22 @@
+@@ -1287,23 +1287,22 @@
  (or (fboundp 'eval-when-compile)
      (defmacro eval-when-compile (&rest rest) nil))
  
@@ -44,7 +44,7 @@
  
  ;; defvar some obsolete variables, which we still support for
  ;; backwards compatibility reasons.
-@@ -2018,7 +2017,7 @@
+@@ -2022,7 +2021,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 '()
-@@ -2029,7 +2028,7 @@
+@@ -2033,7 +2032,7 @@
  
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -62,7 +62,7 @@
  
  
  (defun erlang-man-module (&optional module)
-@@ -2049,7 +2048,7 @@
+@@ -2053,7 +2052,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))
-@@ -2190,9 +2189,9 @@
+@@ -2194,9 +2193,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	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/gnu.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -13,7 +13,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -439,7 +439,7 @@
+@@ -479,7 +479,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -22,7 +22,7 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1271,7 +1271,7 @@
+@@ -1319,7 +1319,7 @@
  	    solaris*)
  		enable_child_waiter_thread=yes
  		;;
@@ -47,7 +47,7 @@
  #include <sys/sysctl.h>
 --- a/erts/emulator/drivers/common/inet_drv.c
 +++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -557,6 +557,11 @@
+@@ -665,6 +665,11 @@
          inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
     } while(0)
  
@@ -61,7 +61,7 @@
  
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -1557,7 +1557,7 @@
+@@ -1561,7 +1561,7 @@
      if (!bindir) {
  	/* Determine bindir from absolute path to executable */
  	char *p;
@@ -70,7 +70,7 @@
  	strncpy(buffer, argv[0], sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
  	
-@@ -1571,7 +1571,7 @@
+@@ -1575,7 +1575,7 @@
      if (!rootdir) {
  	/* Determine rootdir from absolute path to bindir */
  	char *p;

Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/hppa.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -2062,6 +2062,14 @@
+@@ -2121,6 +2121,14 @@
  AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
  
  disable_vfork=false

Modified: erlang/branches/experimental/debian/patches/java.patch
===================================================================
--- erlang/branches/experimental/debian/patches/java.patch	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/java.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -4574,7 +4574,8 @@
+@@ -4653,7 +4653,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,
@@ -20,7 +20,7 @@
      unset -v JAVAC
 --- a/lib/test_server/src/configure.in
 +++ b/lib/test_server/src/configure.in
-@@ -445,7 +445,8 @@
+@@ -468,7 +468,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,

Modified: erlang/branches/experimental/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/powerpc.patch	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/powerpc.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -4,7 +4,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -631,6 +631,7 @@
+@@ -671,6 +671,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	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/rpath.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -6,7 +6,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -4432,9 +4432,9 @@
+@@ -4511,9 +4511,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	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patches/sparc.patch	2014-03-06 10:32:56 UTC (rev 1604)
@@ -7,7 +7,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -620,7 +620,7 @@
+@@ -660,7 +660,7 @@
  fi
  
  case $chk_arch_ in
@@ -18,7 +18,7 @@
      i86pc)	ARCH=x86;;
 --- a/erts/emulator/beam/beam_emu.c
 +++ b/erts/emulator/beam/beam_emu.c
-@@ -988,16 +988,6 @@
+@@ -989,16 +989,6 @@
   * in registers.
   */
  
@@ -35,7 +35,7 @@
  #  define REG_x0
  #  define REG_xregs
  #  define REG_htop
-@@ -1006,7 +996,6 @@
+@@ -1007,7 +997,6 @@
  #  define REG_fcalls
  #  define REG_tmp_arg1
  #  define REG_tmp_arg2

Modified: erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns
===================================================================
--- erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patterns/erlang-base-hipe.patterns	2014-03-06 10:32:56 UTC (rev 1604)
@@ -1,4 +1,5 @@
 ./usr/lib/erlang/Install
+./usr/lib/erlang/OTP_VERSION
 ./usr/lib/erlang/misc/
 ./usr/lib/erlang/releases/[^.]*(\.[^s]|\.s[^r]|\.sr[^c]|\.src.)?[^.]*$
 ./usr/lib/erlang/bin/[^cd][^y].*([^t]|[^s]t)$
@@ -11,6 +12,7 @@
 ./usr/lib/erlang/lib/hipe-.*/ebin/
 ./usr/lib/erlang/lib/kernel-.*/ebin/
 ./usr/lib/erlang/lib/kernel-.*/include/
+./usr/lib/erlang/lib/ose-.*/ebin/
 ./usr/lib/erlang/lib/sasl-.*/ebin/
 ./usr/lib/erlang/lib/stdlib-.*/ebin/
 ./usr/lib/erlang/lib/stdlib-.*/include/

Modified: erlang/branches/experimental/debian/patterns/erlang-base.patterns
===================================================================
--- erlang/branches/experimental/debian/patterns/erlang-base.patterns	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patterns/erlang-base.patterns	2014-03-06 10:32:56 UTC (rev 1604)
@@ -1,4 +1,5 @@
 ./usr/lib/erlang/Install
+./usr/lib/erlang/OTP_VERSION
 ./usr/lib/erlang/misc/
 ./usr/lib/erlang/releases/[^.]*(\.[^s]|\.s[^r]|\.sr[^c]|\.src.)?[^.]*$
 ./usr/lib/erlang/bin/[^cd][^y].*([^t]|[^s]t)$
@@ -11,6 +12,7 @@
 ./usr/lib/erlang/lib/hipe-.*/ebin/
 ./usr/lib/erlang/lib/kernel-.*/ebin/
 ./usr/lib/erlang/lib/kernel-.*/include/
+./usr/lib/erlang/lib/ose-.*/ebin/
 ./usr/lib/erlang/lib/sasl-.*/ebin/
 ./usr/lib/erlang/lib/stdlib-.*/ebin/
 ./usr/lib/erlang/lib/stdlib-.*/include/

Modified: erlang/branches/experimental/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/branches/experimental/debian/patterns/erlang-src.patterns	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/patterns/erlang-src.patterns	2014-03-06 10:32:56 UTC (rev 1604)
@@ -44,6 +44,7 @@
 ./usr/lib/erlang/lib/odbc-.*/src/
 ./usr/lib/erlang/lib/orber-.*/COSS/CosNaming/
 ./usr/lib/erlang/lib/orber-[^/]*/src/
+./usr/lib/erlang/lib/ose-.*/src/
 ./usr/lib/erlang/lib/os_mon-.*/src/
 ./usr/lib/erlang/lib/otp_mibs-.*/src/
 ./usr/lib/erlang/lib/parsetools-.*/src/

Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules	2014-02-25 10:06:21 UTC (rev 1603)
+++ erlang/branches/experimental/debian/rules	2014-03-06 10:32:56 UTC (rev 1604)
@@ -489,17 +489,18 @@
 
 binary: binary-indep binary-arch
 
-REL=17.0-rc1
-RELDIR=17
-DEB_REL=17.0~rc1-dfsg
+REL=17.0-rc2
+RELDIR=17.0-rc2
+DEB_REL=17.0~rc2-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
 	cd $$TMPDIR && \
 	wget -O - http://www.erlang.org/download/otp_src_$(REL).tar.gz | tar -zx && \
 	(cd otp_src_$(RELDIR) && \
-	 ./otp_build save_bootstrap && \
-	 for f in `cat prebuilt.files` ; do rm -f $$f ; done) && \
+	 if ./otp_build save_bootstrap ; then \
+	    for f in `cat prebuilt.files` ; do rm -f $$f ; done \
+	 fi) && \
 	rm -rvf otp_src_$(RELDIR)/lib/*/doc/standard/ && \
 	rm -rvf otp_src_$(RELDIR)/lib/*/doc/archive/ && \
 	rm -rvf otp_src_$(RELDIR)/lib/common_test/priv/*.js && \

More information about the Pkg-erlang-commits mailing list