[Git][haskell-team/DHG_packages][master] 4 commits: fix build of hslogger with dht
Frédéric-Emmanuel Picca
gitlab at salsa.debian.org
Sun May 3 21:06:38 BST 2020
Frédéric-Emmanuel Picca pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
1a53e55e by Picca Frédéric-Emmanuel at 2020-04-28T09:01:36+02:00
fix build of hslogger with dht
- - - - -
a08b489b by Picca Frédéric-Emmanuel at 2020-04-28T09:01:36+02:00
hs-bibutils: Upgrading from 6.7.0.0 to 6.10.0.0
- - - - -
92f41288 by Picca Frédéric-Emmanuel at 2020-04-28T12:12:35+02:00
haskell-geniplate-mirror: Added the forgotten patches
- - - - -
fdab0ec5 by Picca Frédéric-Emmanuel at 2020-05-03T21:42:14+02:00
release happy
- - - - -
8 changed files:
- p/happy/debian/changelog
- + p/haskell-geniplate-mirror/debian/patches/newer-deps
- + p/haskell-geniplate-mirror/debian/patches/series
- p/haskell-hs-bibutils/debian/changelog
- p/haskell-hs-bibutils/debian/patches/bibutils-include-path
- p/haskell-hs-bibutils/debian/patches/fix_cabal.patch
- p/haskell-hs-bibutils/debian/patches/series
- p/hslogger/debian/changelog
Changes:
=====================================
p/happy/debian/changelog
=====================================
@@ -1,8 +1,9 @@
happy (1.19.11-2) unstable; urgency=medium
+ [ John Paul Adrian Glaubitz ]
* Don't copy source code files for stage1 builds (Closes: #884750)
- -- John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de> Wed, 29 Jan 2020 11:33:06 +0100
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 03 May 2020 21:38:00 +0200
happy (1.19.11-1) unstable; urgency=medium
=====================================
p/haskell-geniplate-mirror/debian/patches/newer-deps
=====================================
@@ -0,0 +1,10 @@
+--- haskell-geniplate-mirror-0.7.6.orig/geniplate-mirror.cabal
++++ haskell-geniplate-mirror-0.7.6/geniplate-mirror.cabal
+@@ -28,6 +28,6 @@ source-repository head
+ location: https://github.com/danr/geniplate
+
+ library
+- Build-Depends: base >= 4 && < 5.0, template-haskell < 2.14, mtl
++ Build-Depends: base >= 4 && < 5.0, template-haskell < 2.15, mtl
+
+ Exposed-modules: Data.Generics.Geniplate
=====================================
p/haskell-geniplate-mirror/debian/patches/series
=====================================
@@ -0,0 +1 @@
+newer-deps
=====================================
p/haskell-hs-bibutils/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-hs-bibutils (6.10.0.0-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 28 Apr 2020 07:05:47 +0200
+
haskell-hs-bibutils (6.7.0.0-1) unstable; urgency=medium
[ Dmitry Bogatov ]
=====================================
p/haskell-hs-bibutils/debian/patches/bibutils-include-path
=====================================
@@ -3,11 +3,11 @@ Description: fix include paths
for in bibutils/
Author: Joachim Breitner <nomeata at debian.org>
-Index: b/src/Text/Bibutils.hsc
+Index: haskell-hs-bibutils/src/Text/Bibutils.hsc
===================================================================
---- a/src/Text/Bibutils.hsc
-+++ b/src/Text/Bibutils.hsc
-@@ -431,7 +431,7 @@ newtype BiblioOut = BiblioOut { unBiblio
+--- haskell-hs-bibutils.orig/src/Text/Bibutils.hsc 2020-04-28 08:57:58.480087322 +0200
++++ haskell-hs-bibutils/src/Text/Bibutils.hsc 2020-04-28 08:57:58.480087322 +0200
+@@ -431,7 +431,7 @@
newtype FormatOpt = FormatOpt { unFormatOpt :: CInt }
@@ -16,7 +16,7 @@ Index: b/src/Text/Bibutils.hsc
#{enum FormatOpt, FormatOpt
, bibout_finalcomma = BIBL_FORMAT_BIBOUT_FINALCOMMA
-@@ -482,8 +482,8 @@ combineRawOpts = Raw . foldr ((.|.) . un
+@@ -482,8 +482,8 @@
combineFormatOpts :: [FormatOpt] -> FormatOpt
combineFormatOpts = FormatOpt . foldr ((.|.) . unFormatOpt) 0
=====================================
p/haskell-hs-bibutils/debian/patches/fix_cabal.patch
=====================================
@@ -6,50 +6,52 @@ Last-Update: 2011-08-13
The .cabal files instructs the compiler to use the embedded bibutils
library. This patch makes it use the Debian packaged one.
-Index: b/hs-bibutils.cabal
+Index: haskell-hs-bibutils/hs-bibutils.cabal
===================================================================
---- a/hs-bibutils.cabal
-+++ b/hs-bibutils.cabal
-@@ -26,38 +26,6 @@ author: Andrea Rossato
+--- haskell-hs-bibutils.orig/hs-bibutils.cabal 2020-04-28 08:41:03.286098247 +0200
++++ haskell-hs-bibutils/hs-bibutils.cabal 2020-04-28 08:57:26.671522909 +0200
+@@ -26,40 +26,6 @@
maintainer: Václav Haisman <vhaisman at gmail.com>
cabal-version: >= 1.16
build-type: Simple
-extra-source-files:
- bibutils/adsout.c bibutils/adsout_journals.c bibutils/bibcore.c
-- bibutils/bibformats.h bibutils/biblatexin.c bibutils/bibl.c
-- bibutils/bibl.h bibutils/bibtexin.c bibutils/bibtexout.c
-- bibutils/bibtextypes.c bibutils/bibutils.c bibutils/bibutils.h
-- bibutils/bltypes.c bibutils/bu_auth.c bibutils/bu_auth.h
-- bibutils/charsets.c bibutils/charsets.h bibutils/copacin.c
-- bibutils/copactypes.c bibutils/ebiin.c bibutils/endin.c
-- bibutils/endout.c bibutils/endtypes.c bibutils/endxmlin.c
-- bibutils/entities.c bibutils/entities.h bibutils/fields.c
-- bibutils/fields.h bibutils/gb18030.c bibutils/gb18030_enumeration.c
-- bibutils/gb18030.h bibutils/generic.c bibutils/generic.h
-- bibutils/intlist.c bibutils/intlist.h bibutils/isiin.c
-- bibutils/isiout.c bibutils/isitypes.c bibutils/iso639_1.c
-- bibutils/iso639_1.h bibutils/iso639_2.c bibutils/iso639_2.h
-- bibutils/iso639_3.c bibutils/iso639_3.h bibutils/is_ws.c
-- bibutils/is_ws.h bibutils/latex.c bibutils/latex.h
-- bibutils/marc_auth.c bibutils/marc_auth.h bibutils/medin.c
-- bibutils/modsin.c bibutils/modsout.c bibutils/modstypes.c
-- bibutils/modstypes.h bibutils/name.c bibutils/name.h
-- bibutils/nbibin.c bibutils/nbibout.c bibutils/nbibtypes.c
-- bibutils/notes.c bibutils/notes.h bibutils/pages.c bibutils/pages.h
-- bibutils/reftypes.c bibutils/reftypes.h bibutils/risin.c
-- bibutils/risout.c bibutils/ristypes.c bibutils/serialno.c
-- bibutils/serialno.h bibutils/slist.c bibutils/slist.h bibutils/str.c
-- bibutils/str_conv.c bibutils/str_conv.h bibutils/str.h
-- bibutils/strsearch.c bibutils/strsearch.h bibutils/title.c
-- bibutils/title.h bibutils/unicode.c bibutils/unicode.h bibutils/url.c
-- bibutils/url.h bibutils/utf8.c bibutils/utf8.h bibutils/vplist.c
-- bibutils/vplist.h bibutils/wordin.c bibutils/wordout.c bibutils/xml.c
-- bibutils/xml_encoding.c bibutils/xml_encoding.h bibutils/xml.h
-- README.md ChangeLog.md
+- bibutils/bibdefs.h bibutils/bibformats.h bibutils/biblatexin.c
+- bibutils/biblatexout.c bibutils/bibl.c bibutils/bibl.h
+- bibutils/bibtexin.c bibutils/bibtexout.c bibutils/bibtextypes.c
+- bibutils/bibutils.c bibutils/bibutils.h bibutils/bltypes.c
+- bibutils/bu_auth.c bibutils/bu_auth.h bibutils/charsets.c
+- bibutils/charsets.h bibutils/copacin.c bibutils/copactypes.c
+- bibutils/ebiin.c bibutils/endin.c bibutils/endout.c
+- bibutils/endtypes.c bibutils/endxmlin.c bibutils/entities.c
+- bibutils/entities.h bibutils/fields.c bibutils/fields.h
+- bibutils/gb18030.c bibutils/gb18030_enumeration.c bibutils/gb18030.h
+- bibutils/generic.c bibutils/generic.h bibutils/intlist.c
+- bibutils/intlist.h bibutils/isiin.c bibutils/isiout.c
+- bibutils/isitypes.c bibutils/iso639_1.c bibutils/iso639_1.h
+- bibutils/iso639_2.c bibutils/iso639_2.h bibutils/iso639_3.c
+- bibutils/iso639_3.h bibutils/is_ws.c bibutils/is_ws.h
+- bibutils/latex.c bibutils/latex.h bibutils/latex_parse.c
+- bibutils/latex_parse.h bibutils/marc_auth.c bibutils/marc_auth.h
+- bibutils/medin.c bibutils/modsin.c bibutils/modsout.c
+- bibutils/modstypes.c bibutils/modstypes.h bibutils/name.c
+- bibutils/name.h bibutils/nbibin.c bibutils/nbibout.c
+- bibutils/nbibtypes.c bibutils/notes.c bibutils/notes.h
+- bibutils/pages.c bibutils/pages.h bibutils/reftypes.c
+- bibutils/reftypes.h bibutils/risin.c bibutils/risout.c
+- bibutils/ristypes.c bibutils/serialno.c bibutils/serialno.h
+- bibutils/slist.c bibutils/slist.h bibutils/str.c bibutils/str_conv.c
+- bibutils/str_conv.h bibutils/str.h bibutils/strsearch.c
+- bibutils/strsearch.h bibutils/title.c bibutils/title.h
+- bibutils/type.c bibutils/type.h bibutils/unicode.c bibutils/unicode.h
+- bibutils/url.c bibutils/url.h bibutils/utf8.c bibutils/utf8.h
+- bibutils/vplist.c bibutils/vplist.h bibutils/wordin.c
+- bibutils/wordout.c bibutils/xml.c bibutils/xml_encoding.c
+- bibutils/xml_encoding.h bibutils/xml.h README.md ChangeLog.md
library
default-language: Haskell2010
-@@ -67,29 +35,8 @@ library
+@@ -69,30 +35,8 @@
hs-source-dirs: src
default-extensions: ForeignFunctionInterface
include-dirs: bibutils
@@ -57,24 +59,25 @@ Index: b/hs-bibutils.cabal
- c-sources:
- cbits/stub.c
- bibutils/adsout.c bibutils/adsout_journals.c bibutils/bibcore.c
-- bibutils/biblatexin.c bibutils/bibl.c bibutils/bibtexin.c
-- bibutils/bibtexout.c bibutils/bibtextypes.c bibutils/bibutils.c
-- bibutils/bltypes.c bibutils/bu_auth.c bibutils/charsets.c
-- bibutils/copacin.c bibutils/copactypes.c bibutils/ebiin.c
-- bibutils/endin.c bibutils/endout.c bibutils/endtypes.c
-- bibutils/endxmlin.c bibutils/entities.c bibutils/fields.c
-- bibutils/gb18030.c bibutils/generic.c bibutils/intlist.c
-- bibutils/isiin.c bibutils/isiout.c bibutils/isitypes.c
-- bibutils/iso639_1.c bibutils/iso639_2.c bibutils/iso639_3.c
-- bibutils/is_ws.c bibutils/latex.c bibutils/marc_auth.c
-- bibutils/medin.c bibutils/modsin.c bibutils/modsout.c
-- bibutils/modstypes.c bibutils/name.c bibutils/nbibin.c
-- bibutils/nbibout.c bibutils/nbibtypes.c bibutils/notes.c
-- bibutils/pages.c bibutils/reftypes.c bibutils/risin.c
-- bibutils/risout.c bibutils/ristypes.c bibutils/serialno.c
-- bibutils/slist.c bibutils/str.c bibutils/str_conv.c
-- bibutils/strsearch.c bibutils/title.c bibutils/unicode.c
-- bibutils/url.c bibutils/utf8.c bibutils/vplist.c bibutils/wordin.c
+- bibutils/biblatexin.c bibutils/biblatexout.c bibutils/bibl.c
+- bibutils/bibtexin.c bibutils/bibtexout.c bibutils/bibtextypes.c
+- bibutils/bibutils.c bibutils/bltypes.c bibutils/bu_auth.c
+- bibutils/charsets.c bibutils/copacin.c bibutils/copactypes.c
+- bibutils/ebiin.c bibutils/endin.c bibutils/endout.c
+- bibutils/endtypes.c bibutils/endxmlin.c bibutils/entities.c
+- bibutils/fields.c bibutils/gb18030.c bibutils/generic.c
+- bibutils/intlist.c bibutils/isiin.c bibutils/isiout.c
+- bibutils/isitypes.c bibutils/iso639_1.c bibutils/iso639_2.c
+- bibutils/iso639_3.c bibutils/is_ws.c bibutils/latex.c
+- bibutils/latex_parse.c bibutils/marc_auth.c bibutils/medin.c
+- bibutils/modsin.c bibutils/modsout.c bibutils/modstypes.c
+- bibutils/name.c bibutils/nbibin.c bibutils/nbibout.c
+- bibutils/nbibtypes.c bibutils/notes.c bibutils/pages.c
+- bibutils/reftypes.c bibutils/risin.c bibutils/risout.c
+- bibutils/ristypes.c bibutils/serialno.c bibutils/slist.c
+- bibutils/str.c bibutils/str_conv.c bibutils/strsearch.c
+- bibutils/title.c bibutils/type.c bibutils/unicode.c bibutils/url.c
+- bibutils/utf8.c bibutils/vplist.c bibutils/wordin.c
- bibutils/wordout.c bibutils/xml.c bibutils/xml_encoding.c
+ c-sources: cbits/stub.c
+ pkgconfig-depends: bibutils
=====================================
p/haskell-hs-bibutils/debian/patches/series
=====================================
@@ -1,3 +1,2 @@
fix_cabal.patch
bibutils-include-path
-patch-to-build-with-bibutils-6.2.patch
=====================================
p/hslogger/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+hslogger (1.2.12+dfsg-1) unstable; urgency=medium
+
+ * Use the right repack version number.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 27 Apr 2020 21:16:47 +0200
+
hslogger (1.2.12-1) unstable; urgency=medium
* New upstream release
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/1aebdd4601b9048ba875db43d9f3b96bc853149e...fdab0ec590f374e49132b95fc8cdfc5bc9d537a8
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/1aebdd4601b9048ba875db43d9f3b96bc853149e...fdab0ec590f374e49132b95fc8cdfc5bc9d537a8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200503/0f56889e/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list