tags 409685 + patch thanks
Attached is a patch against arch2darcs 1.0.8 correcting the build failures. While I have used dpatch here, you can grab the direct patch to the upstream source from debian/patches. If you choose this route, please note the changes to debian/control as well - specifically the addition of libghc6-hslogger-dev and incrementing the missingh dependency version.
--- arch2darcs-1.0.8.orig/debian/control +++ arch2darcs-1.0.8/debian/control @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: John Goerzen <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.4.2), libghc6-missingh-dev (>= 0.10.6), libghc6-network-dev, libghc6-unix-dev +Build-Depends: debhelper (>= 4.0.0), ghc6 (>= 6.4.2), libghc6-missingh-dev (>= 0.18.0), libghc6-network-dev, libghc6-unix-dev, dpatch, libghc6-hslogger-dev Standards-Version: 3.6.1 Package: arch2darcs --- arch2darcs-1.0.8.orig/debian/rules +++ arch2darcs-1.0.8/debian/rules @@ -21,7 +21,7 @@ endif configure: configure-stamp -configure-stamp: +configure-stamp: patch dh_testdir # Add here commands to configure the package. @@ -39,7 +39,9 @@ touch build-stamp -clean: +clean: clean1 unpatch + +clean1: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -59,6 +61,15 @@ #$(MAKE) install DESTDIR=$(CURDIR)/debian/arch2darcs cp dist/build/arch2darcs/arch2darcs debian/arch2darcs/usr/bin/ +patch: patch-stamp +patch-stamp: + dpatch apply-all + dpatch cat-all > patch-stamp + touch patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched # Build architecture-independent files here. binary-indep: build install @@ -96,4 +107,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch clean1 --- arch2darcs-1.0.8.orig/debian/changelog +++ arch2darcs-1.0.8/debian/changelog @@ -1,3 +1,14 @@ +arch2darcs (1.0.8-1) unstable; urgency=low + + * Add dpatch framework + * 01missingh-renames.dpatch + = Update imports for the new names of MissingH modules, after the Great + Renaming (Closes: 409685) + = Update cabal file to use hslogger, and MissingH >= 0.18.0 + * Update debian/control to require hslogger and MissingH >= 0.18.0 + + -- Bryan Donlan <[EMAIL PROTECTED]> Wed, 21 Feb 2007 20:23:14 -0500 + arch2darcs (1.0.8) unstable; urgency=low * Rebuilt with GHC 6.6. --- arch2darcs-1.0.8.orig/debian/patches/00list +++ arch2darcs-1.0.8/debian/patches/00list @@ -0,0 +1 @@ +01missingh-renames --- arch2darcs-1.0.8.orig/debian/patches/01missingh-renames.dpatch +++ arch2darcs-1.0.8/debian/patches/01missingh-renames.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01missingh-renames.dpatch by Bryan Donlan <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: MissingH has renamed some of its modules, use the new names + [EMAIL PROTECTED]@ +diff -urNad arch2darcs-1.0.8~/arch2darcs.cabal arch2darcs-1.0.8/arch2darcs.cabal +--- arch2darcs-1.0.8~/arch2darcs.cabal 2006-10-20 11:36:26.000000000 -0400 ++++ arch2darcs-1.0.8/arch2darcs.cabal 2007-02-21 20:23:06.000000000 -0500 +@@ -4,7 +4,7 @@ + Maintainer: John Goerzen <[EMAIL PROTECTED]> + Stability: Alpha + Copyright: Copyright (c) 2005 John Goerzen +-Build-Depends: base, network, unix, parsec, MissingH>=0.10.6, regex-compat ++Build-Depends: base, network, unix, parsec, MissingH>=0.18.0, regex-compat, hslogger + + Executable: arch2darcs + Main-Is: arch2darcs.hs +diff -urNad arch2darcs-1.0.8~/arch2darcs.hs arch2darcs-1.0.8/arch2darcs.hs +--- arch2darcs-1.0.8~/arch2darcs.hs 2007-02-21 20:01:02.000000000 -0500 ++++ arch2darcs-1.0.8/arch2darcs.hs 2007-02-21 20:22:44.000000000 -0500 +@@ -19,16 +19,16 @@ + module Main where + import System.Environment + import System.Directory +-import MissingH.Logging.Logger +-import MissingH.IO +-import MissingH.Cmd +-import MissingH.List ++import System.Log.Logger ++import System.IO.Utils ++import System.Cmd.Utils ++import Data.List.Utils + import Text.ParserCombinators.Parsec + import System.IO + import Text.Regex +-import MissingH.Str ++import Data.String + import System.Posix.Files +-import MissingH.GetOpt ++import System.Console.GetOpt.Utils + import System.Console.GetOpt + import Control.Monad + import Data.List +@@ -156,5 +156,5 @@ + (date, _) = findline "Standard-date" loglines + (creator, _) = findline "Creator" loglines + (summary, log) = findline "Summary" loglines +- darcsdate = subRe (mkRegex "[^0-9]") date "" ++ darcsdate = subRegex (mkRegex "[^0-9]") date "" + in (darcsdate, creator, summary, unlines log)
