[Pkg-haskell-commits] [package-plan] 24/24: Merge branch 'master' into LTS-2.0
Joachim Breitner
nomeata at moszumanska.debian.org
Thu May 7 08:59:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch LTS-2.0
in repository package-plan.
commit c242eb2a7972d781a65dda7307d52811d72870a2
Merge: 174789a 34462c8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Thu May 7 10:56:02 2015 +0200
Merge branch 'master' into LTS-2.0
Conflicts:
packages.txt
additional-cabals/BlogLiterately-0.7.1.7.cabal | 96 ++++++++
additional-cabals/fast-logger-2.3.1.cabal | 45 ++++
additional-cabals/haddock-2.14.3.1.cabal | 252 +++++++++++++++++++++
additional-cabals/yesod-init-test-0.cabal | 130 +++++++++++
packages.txt | 64 +++---
patches/BlogLiterately/0.7.1.7/extend-upper-bounds | 30 +++
patches/BlogLiterately/0.7.1.7/series | 1 +
patches/darcs/2.8.5/relax-terminfo-dependency | 22 ++
patches/darcs/2.8.5/series | 1 +
.../gloss-rendering/1.9.3.1/extend-base-dependency | 13 ++
patches/gloss-rendering/1.9.3.1/series | 1 +
patches/gloss/1.9.3.1/extend-base-dependency | 64 ++++++
patches/gloss/1.9.3.1/series | 1 +
.../0.8.9.6/compat-with-exceptions-0.8.patch | 17 ++
patches/iteratee/0.8.9.6/series | 1 +
test-packages.pl | 27 ++-
16 files changed, 727 insertions(+), 38 deletions(-)
diff --cc packages.txt
index f402b93,5b6cba7..c2b98f4
--- a/packages.txt
+++ b/packages.txt
@@@ -46,13 -46,14 +46,14 @@@ bindings-libzip 0.1
bindings-nettle 0.1.1
bindings-sane 0.0.1
bitarray 0.0.1.1
-blaze-builder 0.3.3.2
+blaze-builder 0.4.0.1
blaze-builder-conduit 1.1.0 avoid
-blaze-builder-enumerator 0.2.0.6
-blaze-html 0.7.0.2
-blaze-markup 0.6.1.0
-blaze-svg 0.3.4
+blaze-builder-enumerator 0.2.1.0
+blaze-html 0.8.0.2
+blaze-markup 0.7.0.2
+blaze-svg 0.3.4.1
blaze-textual 0.2.0.9 notest
+ BlogLiterately 0.7.1.8
bloomfilter 2.0.0.0
bluetile 0.6 binary obsolete
bmp 1.2.5.2
@@@ -101,9 -102,10 +102,9 @@@ cipher-blowfish 0.0.
cipher-camellia 0.0.2
cipher-des 0.0.6
cipher-rc4 0.1.4
- citeproc-hs 0.3.9 -fbibutils -f-hexpat -funicode_collation
+ citeproc-hs 0.3.10 -fbibutils -f-hexpat -funicode_collation
-classy-prelude 0.10.2
-classy-prelude-conduit 0.10.2
-classy-prelude-yesod 0.10.2
+classy-prelude 0.11.0
+classy-prelude-conduit 0.11.0
clientsession 0.9.1.1
clock 0.4.1.3
clocked 0.4.1.3
@@@ -149,7 -150,7 +150,7 @@@ css-text 0.1.2.
csv 0.1.2
csv-conduit 0.6.6
curl 1.3.8
- darcs 2.8.5 obsolete # needs older random
-darcs 2.8.5 -flibrary -fforce-char8-encoding -fcurl -fterminfo -fmmap
++darcs 2.8.5 -flibrary -fforce-char8-encoding -fcurl -fterminfo -fmmap obsolete # needs older random
darcs-monitor 0.4.2 ignore # binary broken, HaXml dependency too old
data-accessor 0.2.2.6
data-accessor-mtl 0.2.0.4
@@@ -219,10 -220,10 +220,10 @@@ equivalence 0.2.
erf 2.0.0.0
errorcall-eq-instance 0.2.0
errors 1.4.7
- esqueleto 2.1.2.2
+ esqueleto 2.1.3
event-list 0.1.1.1
-exceptions 0.6.1
-exception-transformers 0.3.0.3
+exceptions 0.8.0.2
+exception-transformers 0.3.0.4
executable-path 0.0.3
explicit-exception 0.1.7.3
extensible-exceptions 0.1.1.4
@@@ -283,14 -285,14 +285,14 @@@ gtk-traymanager 0.1.
haddock 2.14.3.1
haddock-api 2.15.0.2
haddock-library 1.1.1 notest
- hakyll 4.6.7.1
+ hakyll 4.6.8.1
hamlet 1.2.0 obsolete
-happstack 7.0.2
-happstack-authenticate 0.10.16
-happstack-heist 7.2.4
+happstack 7.0.2 obsolete # needs old happstack-server
+happstack-authenticate 0.10.16 obsolete # needs old blaze-html
+happstack-heist 7.2.4 obsolete # needs old blaze-builder
happstack-hsp 7.3.2 obsolete # requires newer src-exts
-happstack-server 7.3.9
-happy 1.19.4 binary
+happstack-server 7.4.2
+happy 1.19.5 binary
harp 0.4
hashable 1.2.3.2
hashed-storage 0.5.11
@@@ -332,21 -334,21 +334,21 @@@ hit 0.6.
HJavaScript 0.4.7
HJScript 0.7.0
hjsmin 0.1.4.7
-hledger 0.24
+hledger 0.24.1
- hledger-interest 1.4.3 binary
+ hledger-interest 1.4.4 binary
-hledger-lib 0.24
-hledger-web 0.23.3 binary ignore
-hlint 1.9.16
-hmatrix 0.16.0.3
+hledger-lib 0.24.1
+hledger-web 0.24.1 binary
+hlint 1.9.19
+hmatrix 0.16.1.5
hoauth 0.3.5 obsolete
hoauth2 0.4.6
hoogle 4.2.39 notest
hOpenPGP 2.0
hopenpgp-tools 0.14.1 binary
hostname 1.0
-hothasktags 0.3.2 binary
+hothasktags 0.3.3
hourglass 0.2.9
- hS3 0.5.7
+ hS3 0.5.9
hs-bibutils 5.5
hscolour 1.22
hscurses 1.4.2.0
@@@ -485,12 -485,12 +487,12 @@@ mtl 2.1.3.
mtl-compat 0.2.1.3 -ftwo-point-one
mtlparse 0.1.4.0
mueval 0.9.1.1
+ multipart 0.1.2
murmur-hash 0.1.0.7
MusicBrainz 0.2.3
-mwc-random 0.13.2.2 notest
+mutable-containers 0.3.0
- mwc-random 0.13.3.2 notest
- nats 1
- ncurses 0.2.7
+ nats 0.1.2
+ ncurses 0.2.11
nettle 0.1.0
netwire 5.0.0
network 2.6.0.2
@@@ -521,17 -521,17 +524,17 @@@ openpgp-asciiarmor 0.
operational 0.2.3.2
options 1.2.1.1 notest
optparse-applicative 0.11.0.2
-OSM 0.6.4
+OSM 0.6.4 obsolete # needs data-lens
- pandoc 1.13.2 -fhttp-conduit
- pandoc-citeproc 0.6 -fbibutils -f-hexpat -funicode_collation
+ pandoc 1.13.2.1 -fhttp-conduit
+ pandoc-citeproc 0.6.0.1 -fbibutils -f-hexpat -funicode_collation
pandoc-types 1.12.4.2
pango 0.13.1.0
parallel 3.2.0.6
parseargs 0.1.5.2
parsec 3.1.9
parsers 0.12.1.1
- pastis 0.1.2
+ pastis 0.1.2 obsolete # no support for network-2.6, seems to be dead upstream
-path-pieces 0.1.4
+path-pieces 0.2.0
patience 0.1.1
pcap 0.4.5.2
pcre-light 0.4.0.3
@@@ -699,8 -699,8 +702,8 @@@ test-framework-hunit 0.3.0.
test-framework-quickcheck2 0.3.0.3
test-framework-th 0.2.4
test-framework-th-prime 0.0.7
- texmath 0.8.0.2
+text 1.2.0.4 notest
+ texmath 0.8.1
-text 1.1.1.3 notest
text-icu 0.7.0.1
tf-random 0.5
th-expand-syns 0.3.0.6
@@@ -759,10 -760,10 +763,10 @@@ wai-app-static 3.0.
wai-conduit 3.0.0.2
wai-extra 3.0.7
wai-handler-fastcgi 3.0.0
-wai-handler-launch 3.0.0
+wai-handler-launch 3.0.0.3
wai-logger 2.2.4 notest
-wai-websockets 3.0.0.1
+wai-websockets 3.0.0.5
- warp 3.0.10.1
+ warp 3.0.12
warp-tls 3.0.3
webkit 0.13.1.0
web-plugins 0.2.7
@@@ -804,15 -805,16 +808,17 @@@ yesod 1.4.1.
yesod-auth 1.4.4
yesod-auth-account 1.4.0
yesod-auth-hashdb 1.4.2.1
-yesod-auth-oauth 1.4.0
+yesod-auth-oauth 1.4.0.1
- yesod-bin 1.4.6 binary=yesod
- yesod-core 1.4.9
+ yesod-bin 1.4.7.1 binary=yesod
++yesod-auth-oauth 1.4.0
+ yesod-core 1.4.9.1
yesod-default 1.2.0
yesod-form 1.4.4.1
- yesod-markdown 0.9.2 obsolete # no yesod-1.4 version yet
+ yesod-init-test 0 meta # This is generated from "yesod init"
-yesod-markdown 0.9.3.1
++yesod-markdown 0.9.3.1 obsolete # needs older blaze-html
yesod-newsfeed 1.4.0.1
yesod-persistent 1.4.0.2 notest
-yesod-routes 1.2.0.7
+yesod-routes 1.2.0.7 obsolete # deprecated
yesod-static 1.4.0.4
yesod-test 1.4.3.1
yi 0.11.2 -fvty
diff --cc test-packages.pl
index 1ce8d23,805d489..a5f0a7b
--- a/test-packages.pl
+++ b/test-packages.pl
@@@ -73,28 -74,8 +75,28 @@@ while (<PACKAGES>)
}
close PACKAGES;
+my %lts;
+#print "Reading lts.config...\n";
+#open LTS, "<", "lts.config" or die $!;
+#while (<LTS>) {
+# chomp;
+# next if /^#/;
+# next if /^--/;
+# next if /^\s*$/;
+# unless (m/^(.*?) (.*?)(?: ([^#]*))?(?:#.*)?$/) {
+# print "Ignoring unparseable line $.: $_\n";
+# }
+# my ($pkg,$version,$attribs) = ($1,$2,$3);
+# next if $version eq "installed";
+# $lts{$pkg} = $version;
+# if ($attribs) {
+# warn "Unknown attributs for $pkg: $attribs\n"
+# }
+#}
+#close LTS;
+
print "Reading available versions...\n";
- open AVAILABLE, "-|", "apt-cache -t experimental dumpavail | grep-dctrl -F GHC-Package . -s GHC-Package -n" or die $!;
+ open AVAILABLE, "-|", "apt-cache dumpavail | grep-dctrl -F GHC-Package . -s GHC-Package -n" or die $!;
while (<AVAILABLE>) {
chomp;
unless (m/^(.*)-([0-9\.]*)-([a-f0-9]*?)$/) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list