Dear all,
I have prepared an NMU for pandoc and haskell-citeproc-hs.
based on the current version in git
and the patches send by Louis.
NMU for pandoc
=============
The NMU closes several bugs:
* 720887: not installable
this bug is actually not fully closed, since haskell-citeproc-hs
also need to be updated to break only against pandoc << 1.11.1-2.
instead of << 1.11.1-3. See below for this NMU
* 719372: pandoc: FTBFS: dh_install: pandoc missing files
(debian/tmp-inst-*/usr/share/pandoc-1.11.1/data), aborting
fixed by Louis Bettens by build-depending on new haskell scripts
and adapting the install files
* 700329 pandoc hangs using --bibliography
this is a consequence of the haskell build changes, thus fixed via
the fix for 719372:
NMU for haskell-citeproc-hs
===========================
This only changes the Breaks line to break against pandoc << 1.11.1-2.
---------------------
These two NMUs together allow that pandoc is again installable
and functional.
I attach the patches for the NMUs, for pandoc only the patch from
current git master head to the nmu (not the patch from the last
released version).
---------------------
Upload plans:
Since Jonas Smedegaard appears on the LowThreshold NMU list, I am planning
to upload this NMU around Friday 30. September directly to the archive.
For haskell-citeproc-hs I am waiting for the response of the maintainers.
--------------------
Availability:
Both NMUs are available from
http://people.debian.org/~preining/TeX/nmu/
or via apt
deb http://people.debian.org/~preining/TeX/ nmu/
deb-src http://people.debian.org/~preining/TeX/ nmu/
The NMU patches are also lcoated in this directory.
------------------
Thanks a lot and all the best
Norbert
------------------------------------------------------------------------
PREINING, Norbert http://www.preining.info
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
diff -urN haskell-citeproc-hs-0.3.8/debian/changelog haskell-citeproc-hs-0.3.8-nmu/debian/changelog
--- haskell-citeproc-hs-0.3.8/debian/changelog 2013-08-22 06:54:45.000000000 +0900
+++ haskell-citeproc-hs-0.3.8-nmu/debian/changelog 2013-08-27 12:11:52.247558247 +0900
@@ -1,3 +1,10 @@
+haskell-citeproc-hs (0.3.8-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * relax pandoc break relation to << 1.11.1-2. to allow for NMU
+
+ -- Norbert Preining <prein...@debian.org> Tue, 27 Aug 2013 12:11:23 +0900
+
haskell-citeproc-hs (0.3.8-5) unstable; urgency=low
* Let libghc-citeproc-hs-data break with pandoc (<= 1.11.1-2) to avoid users
diff -urN haskell-citeproc-hs-0.3.8/debian/control haskell-citeproc-hs-0.3.8-nmu/debian/control
--- haskell-citeproc-hs-0.3.8/debian/control 2013-08-22 06:54:33.000000000 +0900
+++ haskell-citeproc-hs-0.3.8-nmu/debian/control 2013-08-27 12:11:20.750432218 +0900
@@ -123,7 +123,7 @@
${misc:Depends}
Suggests: ${haskell:Suggests}
Recommends: ${haskell:Recommends}
-Breaks: pandoc (<< 1.11.1-3)
+Breaks: pandoc (<< 1.11.1-2.)
Description: Haskell support for Citation Style Language - data files
citeproc-hs is a Haskell implementation of the Citation Style Language
(CSL).
diff --git a/debian/changelog b/debian/changelog
index 4e44168..d99de34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-pandoc (1.11.1-3) UNRELEASED; urgency=low
+pandoc (1.11.1-2.1) unstable; urgency=low
+ [ Norbert Preining ]
+ * NMU (Closes: #720887)
+
+ [ Jonas Smedegaard ]
* Update README.source to emphasize control.in file as *not* a
show-stopper for contributions.
* Fix extend short descriptions to make each unique.
@@ -11,7 +15,11 @@ pandoc (1.11.1-3) UNRELEASED; urgency=low
* List upstream issue tracker as preferred contact.
* Stop tracking md5sum of upstream tarball.
- -- Jonas Smedegaard <d...@jones.dk> Sun, 28 Jul 2013 12:07:09 +0200
+ [ Louis Bettens ] (Closes: #719372, #700329)
+ * /usr/share/pandoc-1.11.1 -> /usr/share/pandoc
+ * Bump version of Build-Depends: on haskell-devscripts
+
+ -- Norbert Preining <prein...@debian.org> Tue, 27 Aug 2013 11:53:33 +0900
pandoc (1.11.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a18aa28..6ebfac0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: text
Priority: optional
Maintainer: Debian Haskell Group <pkg-haskell-maintain...@lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <d...@jones.dk>
- , Kiwamu Okabe <kiw...@debian.or.jp>,
+ , Kiwamu Okabe <kiw...@debian.or.jp>
, Clint Adams <cl...@debian.org>
+ , Louis Bettens <lo...@bettens.info>
Build-Depends: cdbs,
devscripts,
debhelper,
@@ -63,7 +64,7 @@ Build-Depends: cdbs,
libghc-blaze-html-prof,
libghc-blaze-markup-prof,
libghc-syb-prof,
- haskell-devscripts (>=0.5.12)
+ haskell-devscripts (>=0.8.19)
Build-Depends-Indep: ghc-doc
, libghc-parsec3-doc
, libghc-mtl-doc
diff --git a/debian/control.in b/debian/control.in
index abffee6..1a340f0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,8 +3,9 @@ Section: text
Priority: optional
Maintainer: Debian Haskell Group <pkg-haskell-maintain...@lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <d...@jones.dk>
- , Kiwamu Okabe <kiw...@debian.or.jp>,
+ , Kiwamu Okabe <kiw...@debian.or.jp>
, Clint Adams <cl...@debian.org>
+ , Louis Bettens <lo...@bettens.info>
Build-Depends: @cdbs@
Build-Depends-Indep: ghc-doc
, libghc-parsec3-doc
diff --git a/debian/pandoc.install b/debian/pandoc.install
new file mode 100644
index 0000000..4bd7edb
--- /dev/null
+++ b/debian/pandoc.install
@@ -0,0 +1,2 @@
+debian/tmp-inst-*/usr/bin/* /usr/bin/
+debian/tmp-inst-*/usr/share/pandoc/data /usr/share/pandoc/
diff --git a/debian/pandoc.install.in b/debian/pandoc.install.in
deleted file mode 100644
index 17fdc57..0000000
--- a/debian/pandoc.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp-inst-*/usr/bin/* /usr/bin/
-debian/tmp-inst-*/usr/share/pandoc-__ABI__/data /usr/share/pandoc-__ABI__/
