response
This commit is contained in:
parent
8b713ebf14
commit
14d15dcf0e
3 changed files with 24 additions and 4 deletions
13
Setup.hs
13
Setup.hs
|
@ -13,6 +13,7 @@ import System.FilePath
|
||||||
import Control.Applicative
|
import Control.Applicative
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import System.Directory
|
import System.Directory
|
||||||
|
import Data.List
|
||||||
|
|
||||||
import qualified Build.DesktopFile as DesktopFile
|
import qualified Build.DesktopFile as DesktopFile
|
||||||
import qualified Build.Configure as Configure
|
import qualified Build.Configure as Configure
|
||||||
|
@ -51,10 +52,14 @@ installManpages copyDest verbosity pkg lbi =
|
||||||
installOrdinaryFiles verbosity dstManDir =<< srcManpages
|
installOrdinaryFiles verbosity dstManDir =<< srcManpages
|
||||||
where
|
where
|
||||||
dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
|
dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
|
||||||
srcManpages = zip (repeat srcManDir)
|
srcManpages = do
|
||||||
<$> filterM doesFileExist manpages
|
havemans <- doesDirectoryExist srcManDir
|
||||||
srcManDir = ""
|
if havemans
|
||||||
manpages = ["git-annex.1", "git-annex-shell.1"]
|
then zip (repeat srcManDir)
|
||||||
|
. filter (".1" `isSuffixOf`)
|
||||||
|
<$> getDirectoryContents srcManDir
|
||||||
|
else return []
|
||||||
|
srcManDir = "man"
|
||||||
|
|
||||||
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
|
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
|
||||||
installDesktopFile copyDest _verbosity pkg lbi =
|
installDesktopFile copyDest _verbosity pkg lbi =
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -9,6 +9,8 @@ git-annex (5.20150728) UNRELEASED; urgency=medium
|
||||||
* init: Detect when the filesystem is crippled such that it ignores
|
* init: Detect when the filesystem is crippled such that it ignores
|
||||||
attempts to remove the write bit from a file, and enable direct mode.
|
attempts to remove the write bit from a file, and enable direct mode.
|
||||||
Seen with eg, NTFS fuse on linux.
|
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
|
-- Joey Hess <id@joeyh.name> Mon, 27 Jul 2015 15:57:07 -0400
|
||||||
|
|
||||||
|
|
|
@ -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..
|
||||||
|
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue