monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] org.debian.monotone: e872bc8327a17d536a4eb90215


From: code
Subject: [Monotone-commits-diffs] org.debian.monotone: e872bc8327a17d536a4eb90215138d0b553b0312
Date: Mon, 11 Mar 2013 21:54:53 +0100 (CET)

revision:            e872bc8327a17d536a4eb90215138d0b553b0312
date:                2009-05-22T23:37:55
author:              address@hidden
branch:              org.debian.monotone
changelog:
  * New upstream release.
  * Rebuilt against libbotan 1.8.2 (closes: #527314).
  * Revert to unversioned boost build-dependencies now that we have
    boost-defaults.

manifest:
format_version "1"

new_manifest [f3c9f512efe832f48add71c4a447af72ddbb7a0f]

old_revision [a8e035e6860231417732d0a78aea2051e8fc44e8]

delete "patches/00upstream-fix-test-spawn-redirected-hook-helper.diff"

patch "changelog"
 from [83cf180b320326785f89dc1f6cde2ee5956fe2d9]
   to [91a6a657ac37b2930ae9e03995201eb90527909b]

patch "control"
 from [133b28ab0045bc2e6d23952c276a6ad7bf5b76e5]
   to [3f529ad41e6a8eb788ae1bfdf763f0528b762119]

patch "patches/series"
 from [2f9214be9ad3a6486b5776484a163bd4855e9f98]
   to [a9cedff979e581682473c4fbc9cc727893cfaa9a]
============================================================
--- changelog	83cf180b320326785f89dc1f6cde2ee5956fe2d9
+++ changelog	91a6a657ac37b2930ae9e03995201eb90527909b
@@ -1,3 +1,12 @@
+monotone (0.44-1) unstable; urgency=low
+
+  * New upstream release.
+  * Rebuilt against libbotan 1.8.2 (closes: #527314).
+  * Revert to unversioned boost build-dependencies now that we have
+    boost-defaults.
+
+ -- Zack Weinberg <address@hidden>  Tue, 12 May 2009 17:43:48 -0700
+
 monotone (0.43-3) unstable; urgency=low
 
   * Verified to build with libboost1.38-dev, add to boost alternatives.
============================================================
--- control	133b28ab0045bc2e6d23952c276a6ad7bf5b76e5
+++ control	3f529ad41e6a8eb788ae1bfdf763f0528b762119
@@ -7,9 +7,8 @@ Build-Depends: debhelper (>= 7), autotoo
 Homepage: http://monotone.ca/
 Vcs-Browser: http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone
 Build-Depends: debhelper (>= 7), autotools-dev, po-debconf, quilt, patch,
- libboost-dev (>= 1.34.1-2) | libboost1.35-dev | libboost1.37-dev | libboost1.38-dev, 
- libz-dev, libbotan1.8-dev, libsqlite3-dev, libpcre3-dev, libidn11-dev,
- liblua5.1-0-dev, libpcre3-dev
+ libboost-dev, libbotan1.8-dev, libidn11-dev, liblua5.1-0-dev, libpcre3-dev,
+ libsqlite3-dev, libz-dev
 Build-Depends-Indep: texinfo, xpdf-utils, ps2eps, texlive-generic-recommended,
  texlive-latex-base
 Standards-Version: 3.8.1
============================================================
--- patches/00upstream-fix-test-spawn-redirected-hook-helper.diff	b24e80fb31a3c7c5cc993bdbc304e19661ffec7a
+++ /dev/null	
@@ -1,88 +0,0 @@
-Backport upstream fix for an unreliable test.
-
-ca9e27455b19faae0b4381613a18dec47a46b1de:
-|   tests/spawn_redirected_hook_helper: Wait for subprocess from within
-|   the hook, to eliminate a race with test directory cleanup.  Should
-|   eliminate the race described in comments for Windows (I think it's the
-|   same).  Fix what the hook does to be consistent across platforms.
-|
-1476420aff237c0c3f99a2eb295dffa1942b0e4b:
-|   Fix inconsistent line endings in 
-|   [tests/spawn_redirected_hook_helper/testhooks].
-
-Index: monotone-0.43/tests/spawn_redirected_hook_helper/__driver__.lua
-===================================================================
---- monotone-0.43.orig/tests/spawn_redirected_hook_helper/__driver__.lua	2009-01-17 06:15:43.000000000 -0800
-+++ monotone-0.43/tests/spawn_redirected_hook_helper/__driver__.lua	2009-04-06 16:54:49.606798740 -0700
-@@ -1,19 +1,10 @@
--skip_if(ostype == "Windows")
---- FIXME: this test broke on Windows when the change to running tests
---- in parallel was made. There appears to be a race condition in
---- waiting for the spawned test process; running under the debugger
---- with breaks after the spawn but before the wait makes the test work.
----
---- FIXME: on top of that, the Lua mechanisms can't handle the error;
---- win32/tester-plaf.cc run_tests_in_children returns status -1 to
---- test_cleaner; that eventually gets passed to ldo.cc
---- luaD_seterrorobj, which doesn't handle a status of -1, and
---- tester.exe just exits. So xfail won't work here either.
--
- mtn_setup()
- 
- check(get("testhooks"))
- 
- check(raw_mtn("--rcfile=testhooks", "ls", "unknown"), 0, false, false)
-+
- skip_if(exists("skipfile"))
- check(exists("outfile"))
-+check(exists("errfile"))
-+check(exists("tofile"))
-Index: monotone-0.43/tests/spawn_redirected_hook_helper/testhooks
-===================================================================
---- monotone-0.43.orig/tests/spawn_redirected_hook_helper/testhooks	2009-01-17 06:15:43.000000000 -0800
-+++ monotone-0.43/tests/spawn_redirected_hook_helper/testhooks	2009-04-06 16:55:17.795804329 -0700
-@@ -1,24 +1,30 @@
- function ignore_file (name)
-   ok = true
-+  if existsonpath("cp") == 0 then
-+    pid = spawn_redirected ("", "", "errfile",
-+    	  		    "cp", "testhooks", "tofile")
-+    if pid == -1 then ok = false end
-+  elseif existsonpath("xcopy") == 0 then
-+    pid = spawn_redirected ("", "", "errfile",
-+    	  		    "xcopy", "/q", "/y", "testhooks", "tofile")
-+    if pid == -1 then ok = false end
-+  else
-+    ok = false
-+    x = io.open("skipfile", "w")
-+    x:close()
-+  end
- 
-   if ok then
--    if existsonpath("touch") == 0 then
--      pid = spawn_redirected ("", "", "xyzzy", "touch", "foofile")
--      if pid == -1 then ok = false end
--    elseif existsonpath("xcopy") == 0 then
--      pid = spawn_redirected ("", "", "xyzzy", "xcopy")
--      if pid == -1 then ok = false end
--    else
--      x = io.open("skipfile", "w")
--      x:close()
--    end
--  end
--  
-+    res, ret = wait(pid)
-+    if ret == -1 then ok = false end
-+    if ret ~= 0 then ok = false end
-+  end
-+
-   if ok then
-     x = io.open("outfile", "w")
--    x:close()
-+    x:close()
-   end
- 
-   ignore_file = function (name) return true end
--return true
-+  return true
- end
============================================================
--- patches/series	2f9214be9ad3a6486b5776484a163bd4855e9f98
+++ patches/series	a9cedff979e581682473c4fbc9cc727893cfaa9a
@@ -1,2 +1 @@
-00upstream-fix-test-spawn-redirected-hook-helper.diff
 90-stacktrace-on-crash.diff

reply via email to

[Prev in Thread] Current Thread [Next in Thread]