[Pkg-ganeti-devel] [SCM] Ganeti htools packaging branch, master, updated. debian/0.3.1-1-5-g264ab93

[Iustin Pop]

The following commit has been merged in the master branch:
commit d558ff305df5b881bf87d8e07d9963be7f7e4bbe
Author: Iustin Pop <iustin at debian.org>
Date:   Sat Jun 25 23:45:00 2011 +0200

    Update build-deps for current sid packages
    
    Also add patch disabling -Werror.

diff --git a/debian/control b/debian/control
index 6bdda90..0ef3af1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: admin
 Priority: extra
 Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
 Uploaders: Iustin Pop <iustin at debian.org>, Guido Trotter <ultrotter at debian.org>
-Build-Depends: debhelper (>= 7), ghc6 (>= 6.12), libghc6-curl-dev,
- libghc6-json-dev, libghc6-network-dev, libcurl4-gnutls-dev,
- libghc6-parallel-dev (<< 3)
+Build-Depends: debhelper (>= 7), ghc (>= 6.12), libghc-curl-dev,
+ libghc-json-dev, libghc-network-dev, libcurl4-gnutls-dev,
+ libghc-parallel-dev
 Standards-Version: 3.9.1
 Homepage: http://code.google.com/p/ganeti/
 Vcs-Browser: http://git.debian.org/?p=pkg-ganeti/htools.git
diff --git a/debian/patches/disable-werror.patch b/debian/patches/disable-werror.patch
new file mode 100644
index 0000000..175a78d
--- /dev/null
+++ b/debian/patches/disable-werror.patch
@@ -0,0 +1,17 @@
+Description: disable -Werror
+ GHC 7 and parallel 3.x cause warnings (which are fixed in upstream but not yet
+ released); hence we disable -Werror since the warnings are harmless
+Author: Iustin Pop <iustin at debian.org>
+Forwarded: not-needed
+Last-Update: 2011-06-25
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@
+ 
+ DOCS = README.html NEWS.html
+ 
+-HFLAGS = -O2 -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs
++HFLAGS = -O2 -Wall -fwarn-monomorphism-restriction -fwarn-tabs
+ HEXTRA =
+ 
+ HPCEXCL = --exclude Main --exclude Ganeti.HTools.QC
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a29cb00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-werror.patch

-- 
Ganeti htools packaging