[Pkg-haskell-commits] Merge

[Dmitry Bogatov]

Seems I am even worse at darcs than I thought. What merge commit is for?

> Message: 3
> Date: Sat, 27 Jun 2015 18:04:31 +0000
> From: Joachim Breitner<mail at joachim-breitner.de>
> To: pkg-haskell-commits at lists.alioth.debian.org
> Subject: [Pkg-haskell-commits] darcs: haskell-chasingbottoms: Merge
> Message-ID: <E1Z8uSt-0000kD-Ji at moszumanska.debian.org>
> Content-Type: text/plain; charset=UTF-8
> 
> Sat Jun 27 17:41:27 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
>   * Merge
> 
>     M ./changelog +8
>     M ./control -2 +1
> 
> Sat Jun 27 17:41:27 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
>   * Merge
> diff -rN -u old-haskell-chasingbottoms/changelog new-haskell-chasingbottoms/changelog
> --- old-haskell-chasingbottoms/changelog	2015-06-27 18:04:31.523288451 +0000
> +++ new-haskell-chasingbottoms/changelog	2015-06-27 18:04:31.527288456 +0000
> @@ -1,3 +1,11 @@
> +haskell-chasingbottoms (1.3.0.13-1) unstable; urgency=medium
> +
> +  * New upstream release
> +  * Use X-Descriptions and blurbs to avoid duplication
> +  * Bump standards version to 3.9.6 (No changes needed)
> +
> + -- Dmitry Bogatov <KAction at gnu.org>  Sat, 27 Jun 2015 19:42:28 +0300
> +
>  haskell-chasingbottoms (1.3.0.11-2) unstable; urgency=medium
>  
>    * Upload to unstable
> diff -rN -u old-haskell-chasingbottoms/control new-haskell-chasingbottoms/control
> --- old-haskell-chasingbottoms/control	2015-06-27 18:04:31.523288451 +0000
> +++ new-haskell-chasingbottoms/control	2015-06-27 18:04:31.527288456 +0000
> @@ -9,8 +9,7 @@
>    , ghc
>    , ghc-prof
>    , libghc-quickcheck2-dev (>= 2.1)
> -  , libghc-quickcheck2-dev (<< 2.8)
> -  , libghc-quickcheck2-prof
> +  , libghc-quickcheck2-dev (<< 2.9)
>    , libghc-mtl-dev (>= 1.1)
>    , libghc-mtl-dev (<< 2.3)
>    , libghc-random-dev (>= 1.0)

-- 
Accept: text/plain, text/x-diff
Accept-Language: eo,en,ru
X-Keep-In-CC: yes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20150628/0748c6b9/attachment.sig>