diff --git a/Distribution/PackageDescription.hs b/Distribution/PackageDescription.hs index c2b335c6bbb5b93dbb317921c80cc4ad9307db2d..7da3a1b662b42058fa151891024a9217da7fae51 100644 --- a/Distribution/PackageDescription.hs +++ b/Distribution/PackageDescription.hs @@ -686,7 +686,8 @@ testPkgDesc = unlines [ "Build-Depends: haskell-src, HUnit>=1.0.0-rain", "Other-Modules: Distribution.Package, Distribution.Version,", " Distribution.Simple.GHCPackageConfig", - "Extra-Source-Files: file1, file2", + "Other-files: file1, file2", + "Extra-Tmp-Files: file1, file2", "C-Sources: not/even/rain.c, such/small/hands", "HS-Source-Dirs: src, src2", "Exposed-Modules: Distribution.Void, Foo.Bar", @@ -724,7 +725,6 @@ testPkgDescAnswer = synopsis = "a nice package!", description = "a really nice package!", category = "tools", - extraSrcFiles=["file1", "file2"], buildDepends = [Dependency "haskell-src" AnyVersion, Dependency "HUnit" (UnionVersionRanges (ThisVersion (Version [1,0,0] ["rain"])) @@ -732,6 +732,8 @@ testPkgDescAnswer = testedWith=[(GHC, AnyVersion)], maintainer = "", stability = "Free Text String", + extraTmpFiles=["file1", "file2"], + extraSrcFiles=["file1", "file2"], library = Just $ Library { exposedModules = ["Distribution.Void", "Foo.Bar"], diff --git a/Distribution/ParseUtils.hs b/Distribution/ParseUtils.hs index 53225ff0f3f32eb29d491f8672244c456a3ab78d..45ba2dc8ffeed43888ef459c97eaa04dc13b8e27 100644 --- a/Distribution/ParseUtils.hs +++ b/Distribution/ParseUtils.hs @@ -197,6 +197,8 @@ mkStanza ((n,xs):ys) = let fld'' = map toLower fld' fld | fld'' == "hs-source-dir" = trace "The field \"hs-source-dir\" is deprecated, please use hs-source-dirs." "hs-source-dirs" + | fld'' == "other-files" + = trace "The field \"other-files\" is deprecated, please use extra-source-files." "extra-source-files" | otherwise = fld'' ss <- mkStanza ys checkDuplField fld ss