[Pkg-haskell-commits] darcs: haskell-hgl: Refresh packaging to build with recent GHC

Ernesto Hernández-Novich (USB) emhn at usb.ve
Sat Aug 24 02:55:59 UTC 2013


Sat Aug 24 02:50:16 UTC 2013  Ernesto Hern[_<U+00E1>_]ndez-Novich (USB) <emhn at usb.ve>
  * Refresh packaging to build with recent GHC
  
  * Migrate from old-style try/catch to Control.Exception try/catch
  * Migrate from Control.Concurrent.Chan to Control.Concurrent.STM
  * Change cabal file to build with GHC 7.4 and 7.6
  * Bring package up to date.
  

    M ./changelog -2 +13
    M ./compat -1 +1
    M ./control -6 +11
    M ./copyright -11 +46
    A ./libghc-hgl-dev.lintian-overrides
    A ./libghc-hgl-doc.lintian-overrides
    A ./libghc-hgl-prof.lintian-overrides
    A ./patches/
    M ./rules -1 +1

Sat Aug 24 02:50:16 UTC 2013  Ernesto Hernández-Novich (USB) <emhn at usb.ve>
  * Refresh packaging to build with recent GHC
  
  * Migrate from old-style try/catch to Control.Exception try/catch
  * Migrate from Control.Concurrent.Chan to Control.Concurrent.STM
  * Change cabal file to build with GHC 7.4 and 7.6
  * Bring package up to date.
  
diff -rN -u old-haskell-hgl/changelog new-haskell-hgl/changelog
--- old-haskell-hgl/changelog	2013-08-24 02:55:59.283035927 +0000
+++ new-haskell-hgl/changelog	2013-08-24 02:55:59.315036814 +0000
@@ -1,4 +1,4 @@
-haskell-hgl (3.2.0.2-2) UNRELEASED; urgency=low
+haskell-hgl (3.2.0.2-2) unstable; urgency=low
 
   [ Marco Túlio Gontijo e Silva ]
   * debian/control: Use more sintetic link in Homepage:.
@@ -7,7 +7,18 @@
   [ Marco Silva ]
   * Use ghc instead of ghc6
 
- -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Fri, 19 Feb 2010 14:04:56 -0200
+  [ Ernesto Hernández-Novich (USB) ]
+  * Added patches to migrate to the new Control.Exception try/catch,
+    use STM instead of regular Channels, and adjust cabal file to
+    allow building with GHC 7.4. Patches have been forwarded upstream.
+  * debian/control: bump Standards-Version.
+  * debian/control: add Build-Depends on quilt to handle patches.
+  * debian/control: add Build-Depends on ghc-stm-{dev|prof}.
+  * debian/control: add Build-Depends-Indep on ghc-stm-doc.
+  * Add lintian overrides because the distribution doesn't provide
+    a changelog file.
+
+ -- Ernesto Hernández-Novich (USB) <emhn at usb.ve>  Fri, 23 Aug 2013 21:25:23 -0430
 
 haskell-hgl (3.2.0.2-1) unstable; urgency=low
 
diff -rN -u old-haskell-hgl/compat new-haskell-hgl/compat
--- old-haskell-hgl/compat	2013-08-24 02:55:59.279035969 +0000
+++ new-haskell-hgl/compat	2013-08-24 02:55:59.315036814 +0000
@@ -1 +1 @@
-7
+9
diff -rN -u old-haskell-hgl/control new-haskell-hgl/control
--- old-haskell-hgl/control	2013-08-24 02:55:59.275035985 +0000
+++ new-haskell-hgl/control	2013-08-24 02:55:59.315036814 +0000
@@ -2,17 +2,22 @@
 Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata at debian.org>
-Standards-Version: 3.8.4
+Uploaders: Joachim Breitner <nomeata at debian.org>,
+ Ernesto Hernández-Novich (USB) <emhn at usb.ve>
+Standards-Version: 3.9.4
 Build-Depends:
  cdbs,
- debhelper (>= 7),
- haskell-devscripts (>= 0.7),
+ debhelper (>= 9),
+ haskell-devscripts (>= 0.8.12),
+ quilt,
  ghc,
  ghc-prof,
- ghc-doc,
+ libghc-stm-dev,
+ libghc-stm-prof,
  libghc-x11-dev,
- libghc-x11-prof,
+ libghc-x11-prof
+Build-Depends-Indep: ghc-doc,
+ libghc-stm-doc,
  libghc-x11-doc
 Homepage: http://hackage.haskell.org/package/HGL
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-hgl
diff -rN -u old-haskell-hgl/copyright new-haskell-hgl/copyright
--- old-haskell-hgl/copyright	2013-08-24 02:55:59.251036021 +0000
+++ new-haskell-hgl/copyright	2013-08-24 02:55:59.315036814 +0000
@@ -1,15 +1,50 @@
-
-This package was debianised by Ian Lynagh <igloo at debian.org> on Fri,
-13 Oct 2006. Further packaging work by Kari Pahula <kaol at debian.org>.
-
-It was downloaded from
-http://hackage.haskell.org/packages/archive/HGL/
-
-Upstream Author: Alastair Reid
-
-Copyright (c) 1996-2003 Alastair Reid
+Format-Specification:
+Name: hgl
+Maintainer: Christoph Lueth <christoph.lueth at dfki.de>
+Source: http://hackage.haskell.org/packages/archive/HGL/
+
+Files: *
+Copyright: 1996-2003, Alastair Reid
+License: BSD
+ The Haskell Graphics Library is Copyright (c) Alastair Reid,
+ 1996-2003, All rights reserved, and is distributed as free software
+ under the following license.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ - Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ .
+ - Neither name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND THE CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS OR THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2006, Ian Lynagh <igloo at debian.org>
+ Kari Pahula <kaol at debian.org>
+ 2013, Ernesto Hernández-Novich (USB) <emhn at usb.ve>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by 
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'
 All rights reserved.
-
-BSD licenced. The complete text of the BSD license can be found in
-/usr/share/common-licenses/BSD on Debian systems.
-
diff -rN -u old-haskell-hgl/libghc-hgl-dev.lintian-overrides new-haskell-hgl/libghc-hgl-dev.lintian-overrides
--- old-haskell-hgl/libghc-hgl-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hgl/libghc-hgl-dev.lintian-overrides	2013-08-24 02:55:59.315036814 +0000
@@ -0,0 +1,2 @@
+# HGL doesn't ship a changelog
+libghc-hgl-dev binary: no-upstream-changelog
diff -rN -u old-haskell-hgl/libghc-hgl-doc.lintian-overrides new-haskell-hgl/libghc-hgl-doc.lintian-overrides
--- old-haskell-hgl/libghc-hgl-doc.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hgl/libghc-hgl-doc.lintian-overrides	2013-08-24 02:55:59.319036577 +0000
@@ -0,0 +1,2 @@
+# HGL doesn't ship a changelog
+libghc-hgl-doc binary: no-upstream-changelog
diff -rN -u old-haskell-hgl/libghc-hgl-prof.lintian-overrides new-haskell-hgl/libghc-hgl-prof.lintian-overrides
--- old-haskell-hgl/libghc-hgl-prof.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hgl/libghc-hgl-prof.lintian-overrides	2013-08-24 02:55:59.319036577 +0000
@@ -0,0 +1,2 @@
+# HGL doesn't ship a changelog
+libghc-hgl-prof binary: no-upstream-changelog
diff -rN -u old-haskell-hgl/rules new-haskell-hgl/rules
--- old-haskell-hgl/rules	2013-08-24 02:55:59.209916626 +0000
+++ new-haskell-hgl/rules	2013-08-24 02:55:59.319036577 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_SETUP_GHC6_CONFIGURE_ARGS := --constraint='base<4'
+DEB_BUILD_DEPENDENCIES = build-arch
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk




More information about the Pkg-haskell-commits mailing list