packages feed

cabal-debian 1.24 → 1.25

raw patch · 4 files changed

+12/−3 lines, 4 files

Files

Distribution/Package/Debian.hs view
@@ -579,7 +579,7 @@            Field ("Description", " " ++ maybe debianDescription (const executableDescription) (library pkgDesc))]       develLibrarySpecs = if isJust (library pkgDesc) then [librarySpec "any" Development debianDevPackageName] else []       profileLibrarySpecs = if debLibProf flags && isJust  (library pkgDesc) then [librarySpec "any" Profiling debianProfPackageName] else []-      docLibrarySpecs = if isJust (library pkgDesc) then [docSpecsParagraph] else []+      docLibrarySpecs = if isJust (library pkgDesc) && rpmHaddock flags then [docSpecsParagraph] else []       docSpecsParagraph =           Paragraph           [Field ("Package", " " ++ (show . D.prettyBinPkgName $ debianDocPackageName versionSplits (pkgName (package pkgDesc)) (Just (D.EEQ (parseDebianVersion (showVersion (pkgVersion (package pkgDesc)))))))),
Distribution/Package/Debian/Dependencies.hs view
@@ -81,7 +81,7 @@                  (\ v -> Rel (D.Rel dname (Just (D.SLT (dv v))) Nothing))                  (\ v -> Rel (D.Rel dname (Just (D.GRE (dv v))) Nothing))                  (\ v -> Rel (D.Rel dname (Just (D.LTE (dv v))) Nothing))-                 (\ x y -> error "I don't think this ever gets called") -- And [Rel (D.Rel dname (Just (D.GRE (dv x))) Nothing), Rel (D.Rel dname (Just (D.LTE (dv y))) Nothing)])+                 (\ x y -> And [Rel (D.Rel dname (Just (D.GRE (dv x))) Nothing), Rel (D.Rel dname (Just (D.SLT (dv y))) Nothing)])                  (\ x y -> Or [x, y])                  (\ x y -> And [x, y])                  id
cabal-debian.cabal view
@@ -1,5 +1,5 @@ Name:           cabal-debian-Version:        1.24+Version:        1.25 License:        BSD3 License-File:   debian/copyright Author:         David Fox <dsf@seereason.com>
debian/changelog view
@@ -1,3 +1,12 @@+haskell-cabal-debian (1.25) unstable; urgency=low++  * If the --disable-haddock flag is given omit the doc package from the+    control file.+  * The tarball that was uploaded to Hackage as version 1.24 had a (buggy)+    change which was not pushed to darcs.  This resolves that confusion.++ -- David Fox <dsf@seereason.com>  Sat, 16 Jun 2012 14:42:12 -0700+ haskell-cabal-debian (1.24) unstable; urgency=low    * No wonder it doesn't build on hackage - none of the source