Thu Jun 11 08:42:12 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Refresh HaXml patch
M ./changelog +6
M ./control -2 +2
M ./patches/haxml-2.22-compat -8 +12
Thu Jun 11 08:42:12 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Refresh HaXml patch
diff -rN -u old-darcs-monitor/changelog new-darcs-monitor/changelog
--- old-darcs-monitor/changelog 2015-06-11 08:44:32.441694921 +0000
+++ new-darcs-monitor/changelog 2015-06-11 08:44:32.449694912 +0000
@@ -1,3 +1,9 @@
+darcs-monitor (0.4.2-6) UNRELEASED; urgency=medium
+
+ * Refreshed HaXml compat patch
+
+ -- Joachim Breitner <nomeata at debian.org> Mon, 27 Apr 2015 11:47:25 +0200
+
darcs-monitor (0.4.2-5) experimental; urgency=low
* Adjust watch file to new hackage layout
diff -rN -u old-darcs-monitor/control new-darcs-monitor/control
--- old-darcs-monitor/control 2015-06-11 08:44:32.441694921 +0000
+++ new-darcs-monitor/control 2015-06-11 08:44:32.441694921 +0000
@@ -9,8 +9,8 @@
, haskell-devscripts (>= 0.9)
, ghc
, libghc-mtl-dev
- , libghc-haxml-dev (>= 1:1.22)
- , libghc-haxml-dev (<< 1:1.24)
+ , libghc-haxml-dev (>= 1:1.25)
+ , libghc-haxml-dev (<< 1:1.26)
Standards-Version: 3.9.4
Homepage: http://wiki.darcs.net/RelatedSoftware/DarcsMonitor
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/darcs-monitor
diff -rN -u old-darcs-monitor/patches/haxml-2.22-compat new-darcs-monitor/patches/haxml-2.22-compat
--- old-darcs-monitor/patches/haxml-2.22-compat 2015-06-11 08:44:32.441694921 +0000
+++ new-darcs-monitor/patches/haxml-2.22-compat 2015-06-11 08:44:32.445694917 +0000
@@ -2,20 +2,24 @@
Author: Joachim Breitner <nomeata at debian.org>
Bug-Debian: http://bugs.debian.org/629784
---- darcs-monitor-0.4.2.orig/darcs-monitor.cabal
-+++ darcs-monitor-0.4.2/darcs-monitor.cabal
-@@ -28,7 +28,7 @@ flag splitBase
+Index: darcs-monitor-0.4.2/darcs-monitor.cabal
+===================================================================
+--- darcs-monitor-0.4.2.orig/darcs-monitor.cabal 2015-06-11 10:37:49.439871961 +0200
++++ darcs-monitor-0.4.2/darcs-monitor.cabal 2015-06-11 10:38:04.772409588 +0200
+@@ -28,7 +28,7 @@
description: Choose the new smaller, split-up base package.
Executable darcs-monitor
- Build-Depends: mtl, HaXml == 1.20.*
-+ Build-Depends: mtl, HaXml >= 1.22 && <= 1.24
++ Build-Depends: mtl, HaXml >= 1.25 && <= 1.26
if flag(splitBase)
Build-Depends: base >=3 && < 5, containers, directory, process
else
---- darcs-monitor-0.4.2.orig/darcs-monitor.hs
-+++ darcs-monitor-0.4.2/darcs-monitor.hs
-@@ -194,15 +196,15 @@ processRepo dryRun (tag,cmd) repo' = do
+Index: darcs-monitor-0.4.2/darcs-monitor.hs
+===================================================================
+--- darcs-monitor-0.4.2.orig/darcs-monitor.hs 2015-06-11 10:37:49.439871961 +0200
++++ darcs-monitor-0.4.2/darcs-monitor.hs 2015-06-11 10:37:49.435871820 +0200
+@@ -194,15 +194,15 @@
liftIO $ createDirectoryIfMissing True (repo++dir)
seenPatches <- readSeenPatches repo
xml <- invokeDarcs ["changes", "--reverse", "--repo="++repo,"--xml-output","-a"]
@@ -38,7 +42,7 @@
(authorName, authorEmail) = parseAuthor author
dt = PatchData { patchRepo = repo
, patchAuthor = authorName
-@@ -251,7 +253,7 @@ getAttr name attrs = case lookup name at
+@@ -251,7 +251,7 @@
massage ss
massage [] = id