[Pkg-erlang-commits] r1079 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-09-23 16:02:55 +0000 (Wed, 23 Sep 2009)
New Revision: 1079

Removed:
   erlang/trunk/debian/patches/reltool.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/rules
Log:
[erlang]
  * New upstream release.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2009-09-22 19:38:01 UTC (rev 1078)
+++ erlang/trunk/debian/changelog	2009-09-23 16:02:55 UTC (rev 1079)
@@ -1,11 +1,10 @@
-erlang (1:13.b.2-dfsg-1) unstable; urgency=low
+erlang (1:13.b.2.1-dfsg-1) unstable; urgency=low
 
   * New upstream release (closes: #539269).
   * New maintainer's email address pkg-erlang-devel at lists.alioth.debian.org
     mailing list.
-  * Added a patch by upstream which fixes bug in reltool.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 22 Sep 2009 22:40:35 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 23 Sep 2009 19:55:43 +0400
 
 erlang (1:13.b.1-dfsg-6) unstable; urgency=low
 

Deleted: erlang/trunk/debian/patches/reltool.patch
===================================================================
--- erlang/trunk/debian/patches/reltool.patch	2009-09-22 19:38:01 UTC (rev 1078)
+++ erlang/trunk/debian/patches/reltool.patch	2009-09-23 16:02:55 UTC (rev 1079)
@@ -1,27 +0,0 @@
-Patch by upstream fixes bug in reltool application.
-
-The bug is triggered when you generate a target system with archive
-files and your library directories are given with absolute paths. (Library
-directories are given with the ERL_LIBS environment variable or with the
-lib_dirs configuration parameter.)
-
---- otp_src_R13B02/lib/reltool/src/reltool_target.erl	2009-09-18 16:25:49.000000000 +0200
-+++ otp_src_R13B02_patched/lib/reltool/src/reltool_target.erl	2009-09-22 17:45:33.000000000 +0200
-@@ -1014,7 +1014,7 @@
-     TargetDir2 = filename:join([TargetDir, Dir]),
-     cleanup_spec(Files, TargetDir2),
-     file:del_dir(TargetDir2);
--cleanup_spec({create_dir, _OldDir, NewDir, Files}, TargetDir) ->
-+cleanup_spec({create_dir, NewDir, _OldDir, Files}, TargetDir) ->
-     TargetDir2 = filename:join([TargetDir, NewDir]),
-     cleanup_spec(Files, TargetDir2),
-     file:del_dir(TargetDir2);
-@@ -1152,7 +1152,7 @@
- 			       "Progname=erl\r\n",
- 			       "Rootdir=", NativeRootDir, "\r\n"],
- 		    IniFile = filename:join([BinDir, "erl.ini"]),
--                    file:write(IniFile, IniData);
-+                    ok = file:write_file(IniFile, IniData);
- 		_ ->
- 		    subst_src_scripts(start_scripts(), ErtsBinDir, BinDir, 
- 				      [{"FINAL_ROOTDIR", TargetDir2}, {"EMU", "beam"}],

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2009-09-22 19:38:01 UTC (rev 1078)
+++ erlang/trunk/debian/patches/series	2009-09-23 16:02:55 UTC (rev 1079)
@@ -7,4 +7,3 @@
 m68k.patch
 #native.patch
 #build-options.patch
-reltool.patch

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2009-09-22 19:38:01 UTC (rev 1078)
+++ erlang/trunk/debian/rules	2009-09-23 16:02:55 UTC (rev 1079)
@@ -489,8 +489,8 @@
 
 binary: binary-indep binary-arch
 
-REL=R13B02
-DEB_REL=13.b.2-dfsg
+REL=R13B02-1
+DEB_REL=13.b.2.1-dfsg
 
 get-orig-source:
 	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \