[Pkg-haskell-commits] darcs: haskell-debian: releasing version 3.61-1

[Joachim Breitner]

Wed Mar  7 16:40:26 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * releasing version 3.61-1
  Ignore-this: 4c924b208770b715341bb8c2e939380b

    M ./changelog -2 +2
    M ./control -4 +2
    M ./haskell-debian-utils.install -1
    M ./patches/dont-build-tests.patch -12 +12

Wed Mar  7 16:40:26 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * releasing version 3.61-1
  Ignore-this: 4c924b208770b715341bb8c2e939380b
diff -rN -u old-haskell-debian//changelog new-haskell-debian//changelog
--- old-haskell-debian//changelog	2012-03-07 16:40:39.239279187 +0000
+++ new-haskell-debian//changelog	2012-03-07 16:40:39.267302339 +0000
@@ -1,8 +1,8 @@
-haskell-debian (3.61-1) UNRELEASED; urgency=low
+haskell-debian (3.61-1) unstable; urgency=low
 
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Wed, 07 Mar 2012 16:21:12 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 07 Mar 2012 16:21:23 +0100
 
 haskell-debian (3.55-2) unstable; urgency=low
 
diff -rN -u old-haskell-debian//control new-haskell-debian//control
--- old-haskell-debian//control	2012-03-07 16:40:39.235251826 +0000
+++ new-haskell-debian//control	2012-03-07 16:40:39.267302339 +0000
@@ -19,9 +19,8 @@
   , libghc-bzlib-dev (>= 0.5.0.0-4)
   , libghc-bzlib-prof
   , libghc-haxml-dev (>= 1:1.20)
-  , libghc-haxml-dev (<< 1:1.21)
   , libghc-haxml-prof
-  , libghc-unixutils-dev
+  , libghc-unixutils-dev (>= 1.41)
   , libghc-unixutils-prof
   , libghc-zlib-dev
   , libghc-zlib-prof
@@ -35,8 +34,7 @@
   , libghc-regex-compat-doc
   , libghc-regex-tdfa-doc
   , libghc-bzlib-doc
-  , libghc-haxml-doc (>= 1:1.20)
-  , libghc-haxml-doc (<< 1:1.21)
+  , libghc-haxml-doc 
   , libghc-unixutils-doc
   , libghc-zlib-doc
   , libghc-network-doc
diff -rN -u old-haskell-debian//haskell-debian-utils.install new-haskell-debian//haskell-debian-utils.install
--- old-haskell-debian//haskell-debian-utils.install	2012-03-07 16:40:39.185964647 +0000
+++ new-haskell-debian//haskell-debian-utils.install	2012-03-07 16:40:39.271271127 +0000
@@ -1,4 +1,3 @@
 dist-ghc/build/apt-get-build-depends/apt-get-build-depends		usr/bin/
-dist-ghc/build/cabal-debian/cabal-debian						usr/bin/
 dist-ghc/build/debian-report/debian-report						usr/bin/
 dist-ghc/build/fakechanges/fakechanges							usr/bin/
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	2012-03-07 16:40:39.167178000 +0000
+++ new-haskell-debian//patches/dont-build-tests.patch	2012-03-07 16:40:39.275270978 +0000
@@ -1,26 +1,26 @@
-Index: debian-3.55/debian.cabal
+Index: haskell-debian-3.61/debian.cabal
 ===================================================================
---- debian-3.55.orig/debian.cabal	2011-06-03 21:02:01.000000000 -0300
-+++ debian-3.55/debian.cabal	2011-06-03 21:03:43.000000000 -0300
+--- haskell-debian-3.61.orig/debian.cabal	2012-03-07 17:32:11.000000000 +0100
++++ haskell-debian-3.61/debian.cabal	2012-03-07 17:33:58.000000000 +0100
 @@ -22,7 +22,7 @@
  Library
   Build-Depends:  base >= 4 && < 5, bytestring, containers, directory,
                   filepath, mtl, network, old-locale, parsec >= 2 && <4, pretty, process,
--                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml == 1.20.*, Unixutils >= 1.32, zlib, HUnit,
-+                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml == 1.20.*, Unixutils >= 1.32, zlib,
+-                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml >= 1.20, Unixutils >= 1.41, zlib, HUnit,
++                 regex-tdfa, regex-compat, time, unix, bzlib, HaXml >= 1.20, Unixutils >= 1.41, zlib,
                   utf8-string
-  ghc-options: -W -Wall
+  ghc-options: -W -Wall -O2
   if flag(cabal19)
-@@ -65,11 +65,7 @@
-         Distribution.Package.Debian.Bundled,
-         Distribution.Package.Debian.Setup,
-         Distribution.Package.Debian.Main,
--        Distribution.Package.Debian,
+@@ -61,11 +61,7 @@
+         Debian.URI,
+         Debian.Util.FakeChanges
+  other-modules:
+-        Debian.Version.Internal,
 -        Test.Changes,
 -        Test.Dependencies,
 -        Test.SourcesList,
 -        Test.Versions
-+        Distribution.Package.Debian
++        Debian.Version.Internal
  
  Executable fakechanges
   Main-is: utils/FakeChanges.hs