[Pkg-haskell-commits] darcs: haskell-debian: New upstream release

KAction at gnu.org KAction at gnu.org
Sat Feb 21 20:30:45 UTC 2015


Sat Feb 21 20:21:38 UTC 2015  KAction at gnu.org
  * New upstream release

    M ./changelog -3 +9
    M ./control -4 +3
    M ./patches/dont-build-tests.patch -34 +22

Sat Feb 21 20:21:38 UTC 2015  KAction at gnu.org
  * New upstream release
diff -rN -u old-haskell-debian/changelog new-haskell-debian/changelog
--- old-haskell-debian/changelog	2015-02-21 20:30:44.833196490 +0000
+++ new-haskell-debian/changelog	2015-02-21 20:30:44.833196490 +0000
@@ -1,3 +1,9 @@
+haskell-debian (3.85.2-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Dmitry Bogatov <KAction at gnu.org>  Thu, 19 Feb 2015 09:23:28 +0300
+
 haskell-debian (3.83.3.1-2) experimental; urgency=medium
 
   * Depend on haskell-devscripts 0.9, found in experimental
@@ -76,7 +82,7 @@
 
 haskell-debian (3.61-2) unstable; urgency=low
 
-  * patches/dont-build-teste.patch: really don't build test stuff 
+  * patches/dont-build-teste.patch: really don't build test stuff
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 25 Mar 2012 22:02:42 +0200
 
@@ -107,7 +113,7 @@
 
 haskell-debian (3.47-3) unstable; urgency=low
 
-  * Re-add dont-build-tests.patch, lost in the previous upload 
+  * Re-add dont-build-tests.patch, lost in the previous upload
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 24 Jun 2010 19:33:30 +0200
 
@@ -122,7 +128,7 @@
     haskell-debian-utils.install.
 
   [ Joachim Breitner ]
-  * Adjust copyright file per FTP master request. 
+  * Adjust copyright file per FTP master request.
   * Bump haskell-regex-tdfa dependency
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 24 Jun 2010 09:47:55 +0200
diff -rN -u old-haskell-debian/control new-haskell-debian/control
--- old-haskell-debian/control	2015-02-21 20:30:44.829196493 +0000
+++ new-haskell-debian/control	2015-02-21 20:30:44.833196490 +0000
@@ -2,7 +2,7 @@
 Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata at debian.org>
+Uploaders: Joachim Breitner <nomeata at debian.org>, Dmitry Bogatov <KAction at gnu.org>
 Build-Depends: debhelper (>= 9)
   , cdbs
   , haskell-devscripts (>= 0.9)
@@ -16,7 +16,7 @@
   , libghc-bzlib-prof
   , libghc-haxml-dev (>= 1:1.20)
   , libghc-haxml-prof
-  , libghc-listlike-dev (>= 4)
+  , libghc-listlike-dev (>= 4.1.1)
   , libghc-listlike-prof
   , libghc-mtl-dev
   , libghc-mtl-prof
@@ -60,7 +60,7 @@
   , libghc-text-doc
 Build-Conflicts:
   libghc-parsec2-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://hackage.haskell.org/package/debian
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-debian
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-debian
@@ -135,4 +135,3 @@
    * apt-get-build-depends:
      Tool which will parse the Build-Depends{-Indep} lines from debian/control
      and apt-get install the required packages
-
diff -rN -u old-haskell-debian/patches/dont-build-tests.patch new-haskell-debian/patches/dont-build-tests.patch
--- old-haskell-debian/patches/dont-build-tests.patch	2015-02-21 20:30:44.829196493 +0000
+++ new-haskell-debian/patches/dont-build-tests.patch	2015-02-21 20:30:44.837196488 +0000
@@ -1,16 +1,22 @@
-Index: debian-3.83.3.1/debian.cabal
-===================================================================
---- debian-3.83.3.1.orig/debian.cabal	2014-08-29 10:01:11.647168975 -0700
-+++ debian-3.83.3.1/debian.cabal	2014-08-29 10:06:49.767183397 -0700
-@@ -35,7 +35,6 @@
-    exceptions,
-    filepath,
-    HaXml >= 1.20,
--   HUnit,
-    ListLike,
-    mtl,
-    old-locale,
-@@ -98,11 +97,7 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -8,12 +8,4 @@ import System.Exit
+ import System.FilePath ((</>))
+ import System.Process
+ 
+-main = copyFile "debian/changelog" "changelog" >>
+-       defaultMainWithHooks simpleUserHooks {
+-         postBuild = \ _ _ _ lbi -> runTestScript lbi
+-       , runTests = \ _ _ _ lbi -> runTestScript lbi
+-       }
+-
+-runTestScript lbi =
+-    system (buildDir lbi </> "debian-tests/debian-tests") >>= \ code ->
+-    if code == ExitSuccess then return () else error "Test Failure"
++main = defaultMain
+--- a/debian.cabal
++++ b/debian.cabal
+@@ -93,11 +93,7 @@ Library
          Debian.UTF8,
          Debian.Util.FakeChanges
   other-modules:
@@ -23,37 +29,19 @@
  
  Executable fakechanges
   Hs-Source-Dirs: utils
-@@ -129,19 +124,6 @@
+@@ -124,15 +120,6 @@ Executable apt-get-build-depends
   ghc-options: -threaded -W -O2
   Extensions:           ExistentialQuantification CPP
  
 -Executable debian-tests
 - Main-is: Test/Main.hs
 - ghc-options: -threaded -W -O2
-- Build-Depends: ansi-wl-pprint, base, bytestring, containers, debian, directory, exceptions, HUnit, ListLike, mtl, parsec, process, regex-compat, regex-tdfa, template-haskell, text, utf8-string
+- Build-Depends: ansi-wl-pprint, base, bytestring, containers, debian, directory, exceptions, HUnit, ListLike >= 4.1.1, mtl, parsec, pretty, prettyclass, process, process-extras >= 0.2.0, regex-compat, regex-tdfa, template-haskell, text, utf8-string
 - if flag(network-uri)
 -   Build-Depends: network >= 2.6, network-uri >= 2.6
 - else
 -   Build-Depends: network >= 2.4 && < 2.6
-- if flag(listlike)
--   build-depends: process-listlike
-- else
--   build-depends: process-extras
 -
  source-repository head
-   type:     darcs
+   type:     git
    location: https://github.com/ddssff/debian-haskell
-Index: debian-3.83.3.1/Setup.hs
-===================================================================
---- debian-3.83.3.1.orig/Setup.hs	2014-08-29 10:01:11.647168975 -0700
-+++ debian-3.83.3.1/Setup.hs	2014-08-29 10:25:00.283229913 -0700
-@@ -10,8 +10,7 @@
- 
- main = copyFile "debian/changelog" "changelog" >>
-        defaultMainWithHooks simpleUserHooks {
--         postBuild = \ _ _ _ lbi -> runTestScript lbi
--       , runTests = \ _ _ _ lbi -> runTestScript lbi
-+         runTests = \ _ _ _ lbi -> runTestScript lbi
-        }
- 
- runTestScript lbi =




More information about the Pkg-haskell-commits mailing list