{ addfile ./cdbs.diff hunk ./cdbs.diff 1 +--- haxml-1.13.3/debian/control~ 2009-01-16 10:10:17.000000000 -0800 ++++ haxml-1.13.3/debian/control 2009-01-16 10:13:24.000000000 -0800 +@@ -2,7 +2,7 @@ + Section: devel + Priority: optional + Maintainer: Arjan Oosting +-Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts (>= 0.6.7), html2text ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text + Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc + Standards-Version: 3.7.3 + Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haxml hunk ./changelog 1 +haxml (4) unstable; urgency=low + + * Change haskell-devscripts dependency to haskell-devscripts-cdbs so we + get some changes required to build under ghc-6.10 (not to actually use + cdbs.) In particular, we need to pass the --global-conf flag to ghc-pkg. + + -- David Fox Fri, 16 Jan 2009 10:15:44 -0800 + hunk ./series 4 +cdbs.diff hunk ./cdbs.diff 3 -@@ -2,7 +2,7 @@ +@@ -2,8 +2,7 @@ hunk ./cdbs.diff 8 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text - Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc +-Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 12 + Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, hugs hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, hugs ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, hugs hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, hugs ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, hugs hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, hugs ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10), ghc6-prof (>= 6.10), ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.10) | haddock, ghc6-prof, ghc6-doc (>= 6.10), haskell-devscripts-cdbs, html2text, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 9 -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, ghc6-doc, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 12 - Vcs-Browser: http://svn.debian.org/wsvn/pkg-haskell/packages/haxml hunk ./cdbs.diff 8 --Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text, ghc6 (>= 6.10) | haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc ++Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text + Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc hunk ./cdbs.diff 3 -@@ -2,8 +2,7 @@ +@@ -2,7 +2,7 @@ hunk ./series 4 -cdbs.diff hunk ./changelog 1 -haxml (4) unstable; urgency=low - - * Change haskell-devscripts dependency to haskell-devscripts-cdbs so we - get some changes required to build under ghc-6.10 (not to actually use - cdbs.) In particular, we need to pass the --global-conf flag to ghc-pkg. - - -- David Fox Fri, 16 Jan 2009 10:15:44 -0800 - hunk ./cdbs.diff 1 ---- haxml-1.13.3/debian/control~ 2009-01-16 10:10:17.000000000 -0800 -+++ haxml-1.13.3/debian/control 2009-01-16 10:13:24.000000000 -0800 -@@ -2,7 +2,7 @@ - Section: devel - Priority: optional - Maintainer: Arjan Oosting --Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts (>= 0.6.7), html2text -+Build-Depends: cpphs, dctrl-tools, debhelper (>= 4.2.0), dpatch, dpkg-dev (>= 1.13.19), ghc6 (>= 6.8.2), ghc6-prof, haskell-devscripts-cdbs, html2text - Build-Depends-Indep: haddock, hugs, libghc6-base-doc, libghc6-haskell98-doc - Standards-Version: 3.7.3 - Vcs-Svn: svn://svn.debian.org/svn/pkg-haskell/packages/haxml rmfile ./cdbs.diff }