Hi guys, how do you feel about this patch to the archlinux repository? Would anyone mind if I'd make that change?
Take care, Peter
>From ed68f927ad30a3d78e7794fba619e10ce19ec5fe Mon Sep 17 00:00:00 2001 From: Peter Simons <[email protected]> Date: Sat, 30 Oct 2010 02:57:47 +0200 Subject: [PATCH] drop obsolete comment about 'provides' field Our PKGBUILD files feature a comment saying that we provide all package dependencies and that the user's front-end to pacman must understand 'provides'. In fact, this is not true: we no longer specify dependencies on packages that are provided by GHC. Instead of that comment, I feel we should provide a Maintainer: field, which -- according to namcap -- is currently missing. --- Distribution/ArchLinux/CabalTranslation.hs | 11 +---------- Distribution/ArchLinux/PkgBuild.hs | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Distribution/ArchLinux/CabalTranslation.hs b/Distribution/ArchLinux/CabalTranslation.hs index 62d2f50..db1ab99 100644 --- a/Distribution/ArchLinux/CabalTranslation.hs +++ b/Distribution/ArchLinux/CabalTranslation.hs @@ -25,7 +25,6 @@ import Distribution.ArchLinux.PkgBuild import Distribution.ArchLinux.SystemProvides -- Standard types import Distribution.Text -import Text.PrettyPrint import Data.Char import Data.List import qualified Data.Map as M @@ -100,7 +99,7 @@ cabal2pkg' cabal archName release systemContext -- = trace (show cabal) $ = ( emptyPkg { - pkgHeader = comment + pkgHeader = [] , hkgName = display name , pkgBody = stub { arch_pkgname = archName @@ -190,14 +189,6 @@ cabal2pkg' cabal archName release systemContext (<->) :: String -> String -> String x <-> y = x ++ "-" ++ y -comment :: String -comment = render $ vcat - [ text "# Note: we list all package dependencies." - , text "# Your package tool should understand 'provides' syntax." - , text "# See <http://archhaskell.wordpress.com/> for further information." - , text "#" - ] - -- -- | A PKGBUILD skeleton for Haskell libraries (hasLibrary = True) -- diff --git a/Distribution/ArchLinux/PkgBuild.hs b/Distribution/ArchLinux/PkgBuild.hs index ea0c9dc..21d464b 100644 --- a/Distribution/ArchLinux/PkgBuild.hs +++ b/Distribution/ArchLinux/PkgBuild.hs @@ -323,7 +323,7 @@ readPackage st = do cs <- getInput case cs of - _ | "# Contributor" `isPrefixOf` cs -> do + _ | "# Maintainer" `isPrefixOf` cs -> do h <- line cs readPackage st { pkgHeader = h } @@ -515,7 +515,7 @@ instance Text AnnotatedPkgBuild where -- Display a full PKGBUILD with contributor name -- pkg2doc :: String -> AnnotatedPkgBuild -> Doc -pkg2doc email pkg = text "# Contributor:" <+> text email $$ disp pkg +pkg2doc email pkg = text "# Maintainer:" <+> text email $$ disp pkg -- -- | A data type to represent a full ArchLinux package -- 1.7.3.2
_______________________________________________ arch-haskell mailing list [email protected] http://www.haskell.org/mailman/listinfo/arch-haskell
