Hello community,
here is the log from the commit of package darcs for openSUSE:Factory checked
in at 2017-01-28 11:07:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/darcs (Old)
and /work/SRC/openSUSE:Factory/.darcs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "darcs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/darcs/darcs.changes 2016-11-03
11:13:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.darcs.new/darcs.changes 2017-02-03
17:35:19.900823140 +0100
@@ -1,0 +2,5 @@
+Wed Jan 18 09:00:16 UTC 2017 - psim...@suse.com
+
+- Update to version 2.12.5 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
darcs-2.12.4.tar.gz
New:
----
darcs-2.12.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ darcs.spec ++++++
--- /var/tmp/diff_new_pack.BRzHNn/_old 2017-02-03 17:35:20.396752947 +0100
+++ /var/tmp/diff_new_pack.BRzHNn/_new 2017-02-03 17:35:20.396752947 +0100
@@ -1,7 +1,7 @@
#
# spec file for package darcs
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name darcs
%bcond_with tests
Name: %{pkg_name}
-Version: 2.12.4
+Version: 2.12.5
Release: 0
Summary: A distributed, interactive, smart revision control system
License: GPL-2.0+
@@ -133,7 +133,7 @@
%install
%ghc_lib_install
-%ghc_fix_dynamic_rpath %{pkg_name}
+%ghc_fix_rpath %{pkg_name}-%{version}
%check
%cabal_test
++++++ darcs-2.12.4.tar.gz -> darcs-2.12.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/darcs-2.12.4/CHANGELOG new/darcs-2.12.5/CHANGELOG
--- old/darcs-2.12.4/CHANGELOG 2016-09-14 16:39:58.000000000 +0200
+++ new/darcs-2.12.5/CHANGELOG 2017-01-11 21:07:29.000000000 +0100
@@ -1,3 +1,9 @@
+Darcs 2.12.5, 11 January 2017
+
+ * Bump some dependency upper bounds (Ganesh Sittampalam)
+ * Fix issue2516 - failure cloning from URLs on Windows (Ben Franksen)
+
+
Darcs 2.12.4, 14 September 2016
* *really* fix compile error under Windows (Guillaume Hoffmann)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/darcs-2.12.4/darcs.cabal new/darcs-2.12.5/darcs.cabal
--- old/darcs-2.12.4/darcs.cabal 2016-09-14 16:39:58.000000000 +0200
+++ new/darcs-2.12.5/darcs.cabal 2017-01-11 21:07:29.000000000 +0100
@@ -1,5 +1,5 @@
Name: darcs
-version: 2.12.4
+version: 2.12.5
License: GPL
License-file: COPYING
Author: David Roundy <drou...@darcs.net>, <darcs-de...@darcs.net>
@@ -407,7 +407,7 @@
cryptohash >= 0.4 && < 0.12,
base16-bytestring >= 0.1 && < 0.2,
utf8-string >= 0.3.6 && < 1.1,
- vector >= 0.10.0.1 && < 0.12,
+ vector >= 0.10.0.1 && < 0.13,
tar >= 0.4 && < 0.6,
data-ordlist == 0.4.*,
attoparsec >= 0.11 && < 0.14,
@@ -417,11 +417,11 @@
unix-compat >= 0.1.2 && < 0.5,
bytestring >= 0.10.0.2 && < 0.11,
old-time >= 1.1 && < 1.2,
- time >= 1.5 && < 1.7,
+ time >= 1.5 && < 1.8,
-- release notes of GHC 7.10.2 recommends to use text >= 1.2.1.3:
-- https://mail.haskell.org/pipermail/haskell/2015-July/024641.html
text >= 1.2.1.3 && < 1.3,
- directory >= 1.2.0.1 && < 1.3.0.0,
+ directory >= 1.2.0.1 && < 1.4.0.0,
process >= 1.1.0.2 && < 1.5.0.0,
array >= 0.4.0.1 && < 0.6,
random >= 1.0.1.1 && < 1.2,
@@ -572,10 +572,10 @@
shelly >= 1.6.2 && < 1.7,
split >= 0.2.2 && < 0.3,
text >= 1.2.1.3 && < 1.3,
- directory >= 1.2.0.1 && < 1.3.0.0,
+ directory >= 1.2.0.1 && < 1.4.0.0,
FindBin >= 0.0 && < 0.1,
QuickCheck >= 2.6 && < 2.10,
- HUnit >= 1.2.5.2 && < 1.4,
+ HUnit >= 1.2.5.2 && < 1.6,
test-framework >= 0.4.0 && < 0.9,
test-framework-hunit >= 0.2.2 && < 0.4,
test-framework-quickcheck2 >= 0.3 && < 0.4,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/darcs-2.12.4/release/distributed-context
new/darcs-2.12.5/release/distributed-context
--- old/darcs-2.12.4/release/distributed-context 2016-09-14
16:39:58.000000000 +0200
+++ new/darcs-2.12.5/release/distributed-context 2017-01-11
21:07:29.000000000 +0100
@@ -1 +1 @@
-Just "\nContext:\n\n[TAG 2.12.4\nGuillaume Hoffmann
<guilla...@gmail.com>**20160914143914\n Ignore-this:
fee5b93a45e3a175e63e6fdb837ec4dc\n] \n"
\ No newline at end of file
+Just "\nContext:\n\n[TAG 2.12.5\nGanesh Sittampalam
<gan...@earth.li>**20170111174540\n Ignore-this:
5e9ed0bfd6de3ef43d6933f2bda92147\n] \n"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/darcs-2.12.4/src/Darcs/Repository/Clone.hs
new/darcs-2.12.5/src/Darcs/Repository/Clone.hs
--- old/darcs-2.12.4/src/Darcs/Repository/Clone.hs 2016-09-14
16:39:58.000000000 +0200
+++ new/darcs-2.12.5/src/Darcs/Repository/Clone.hs 2017-01-11
21:07:29.000000000 +0100
@@ -13,6 +13,7 @@
import Control.Exception ( catch, SomeException )
import Control.Monad ( when, void )
import qualified Data.ByteString.Char8 as BS
+import Data.List( intercalate )
import Data.Maybe( catMaybes, isJust )
import System.FilePath( (</>) )
import System.Directory
@@ -184,6 +185,9 @@
NoPatchIndex -> return () -- default
YesPatchIndex -> createOrUpdatePatchIndexDisk repo
+joinUrl :: [String] -> String
+joinUrl = intercalate "/"
+
cloneRepository ::
String -- origin repository path
-> String -- new repository name (for relative path)
@@ -218,7 +222,7 @@
Just e -> fail $ "Incompatibility with repository " ++ fromDir ++
":\n" ++ e
Nothing -> return ()
debugMessage "Copying prefs"
- copyFileOrUrl (remoteDarcs rdarcs) (fromDir </> darcsdir </> "prefs" </>
"prefs")
+ copyFileOrUrl (remoteDarcs rdarcs) (joinUrl [fromDir, darcsdir, "prefs",
"prefs"])
(darcsdir </> "prefs/prefs") (MaxAge 600) `catchall` return ()
-- prepare sources and cache
(Repo toDir toFormat toPristine toCache) <- identifyRepository uc "."
@@ -305,9 +309,9 @@
-> WithWorkingDir
-> IO ()
copyBasicRepoPacked r@(Repo fromDir _ _ _) toRepo verb rdarcs withWorkingDir =
- do let hashURL = fromDir </> darcsdir </> packsDir </> "pristine"
+ do let hashURL = joinUrl [fromDir, darcsdir, packsDir, "pristine"]
mPackHash <- (Just <$> gzFetchFilePS hashURL Uncachable) `catchall`
(return Nothing)
- let hiURL = fromDir </> darcsdir </> "hashed_inventory"
+ let hiURL = joinUrl [fromDir, darcsdir, "hashed_inventory"]
i <- gzFetchFilePS hiURL Uncachable
let currentHash = BS.pack $ inv2pris i
let copyNormally = copyBasicRepoNotPacked r toRepo verb rdarcs
withWorkingDir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/darcs-2.12.4/src/Darcs/Repository/Job.hs
new/darcs-2.12.5/src/Darcs/Repository/Job.hs
--- old/darcs-2.12.4/src/Darcs/Repository/Job.hs 2016-09-14
16:39:58.000000000 +0200
+++ new/darcs-2.12.5/src/Darcs/Repository/Job.hs 2017-01-11
21:07:29.000000000 +0100
@@ -125,7 +125,7 @@
-- This was added to support darcsden, which inspects the internals of V1
prim patches.
--
-- In future this should be replaced with a more abstract inspection API
as part of 'PrimPatch'.
- | PrimV1Job (forall rt p wR wU . (RepoPatch p, ApplyState p ~ Tree, PrimOf
p ~ Prim)
+ | PrimV1Job (forall rt p wR wU . (IsRepoType rt, RepoPatch p, ApplyState p
~ Tree, PrimOf p ~ Prim)
=> Repository rt p wR wU wR -> IO a)
-- A job that works on normal darcs repositories, but will want access to
the rebase patch if it exists.
| RebaseAwareJob RebaseJobFlags (forall rt p wR wU . (IsRepoType rt,
RepoPatch p, ApplyState p ~ Tree, ApplyState (PrimOf p) ~ Tree) => Repository
rt p wR wU wR -> IO a)
