diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-31 11:34:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-31 11:34:09 -0400 |
| commit | b5e3a66333d10d703385c807deb26d6789ea28cc (patch) | |
| tree | 7f298f858ce59a9e72e3031a997d5e73e97e1313 | |
| parent | 3207518c9f6a70e6e9d449493ae0fad877987e03 (diff) | |
response
3 files changed, 24 insertions, 4 deletions
@@ -13,6 +13,7 @@ import System.FilePath import Control.Applicative import Control.Monad import System.Directory +import Data.List import qualified Build.DesktopFile as DesktopFile import qualified Build.Configure as Configure @@ -51,10 +52,14 @@ installManpages copyDest verbosity pkg lbi = installOrdinaryFiles verbosity dstManDir =<< srcManpages where dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1" - srcManpages = zip (repeat srcManDir) - <$> filterM doesFileExist manpages - srcManDir = "" - manpages = ["git-annex.1", "git-annex-shell.1"] + srcManpages = do + havemans <- doesDirectoryExist srcManDir + if havemans + then zip (repeat srcManDir) + . filter (".1" `isSuffixOf`) + <$> getDirectoryContents srcManDir + else return [] + srcManDir = "man" installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile copyDest _verbosity pkg lbi = diff --git a/debian/changelog b/debian/changelog index 1d09603d7..8c80e5603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ git-annex (5.20150728) UNRELEASED; urgency=medium * init: Detect when the filesystem is crippled such that it ignores attempts to remove the write bit from a file, and enable direct mode. Seen with eg, NTFS fuse on linux. + * Fix man page installation by cabal install; all the new man pages are + now installed. -- Joey Hess <id@joeyh.name> Mon, 27 Jul 2015 15:57:07 -0400 diff --git a/doc/bugs/copy_to_--fast_should_not_mention_every_file_it_checks/comment_3_e1ecf85a79b7b2b21881be00a48be6c9/comment_1_8808e06ea50c8deb1226e31c40cc6703._comment b/doc/bugs/copy_to_--fast_should_not_mention_every_file_it_checks/comment_3_e1ecf85a79b7b2b21881be00a48be6c9/comment_1_8808e06ea50c8deb1226e31c40cc6703._comment new file mode 100644 index 000000000..f04375c9a --- /dev/null +++ b/doc/bugs/copy_to_--fast_should_not_mention_every_file_it_checks/comment_3_e1ecf85a79b7b2b21881be00a48be6c9/comment_1_8808e06ea50c8deb1226e31c40cc6703._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-07-31T15:31:56Z" + content=""" +That's a bug. It happens to be fixed in git head and there will be an +updated release with the fix soon. + +I appreacite you trying to find a related bug to the problem you're having, +but this bug report is not actually related, and was in fact closed in +2014. Opening a new bug report is better than commenting in the wrong +place.. +"""]] |