[Pkg-haskell-commits] darcs: ghc: Import serveral changes by Gianfranco

[Joachim Breitner]

Fri Aug 16 12:37:56 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Import serveral changes by Gianfranco

    M ./changelog +8
    M ./control -7 +7
    M ./rules -2 +7

Fri Aug 16 12:37:56 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Import serveral changes by Gianfranco
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2013-08-16 15:42:42.951036100 +0000
+++ new-ghc/changelog	2013-08-16 15:42:42.999036907 +0000
@@ -1,8 +1,16 @@
 ghc (7.6.3-4) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Enable verbose build output (see
     http://lists.debian.org/debian-devel/2013/06/msg00539.html).
 
+  [ Gianfranco Costamagna ]
+
+  * Switch to llvm (Closes: #711948)
+  * removed deprecated DM-Upload-Allowed
+  * removed some version checks, higher versions are already in oldstable.
+  * Added dpkg-buildflags as build-dep, fixing lintian warning.
+
  -- Colin Watson <cjwatson at debian.org>  Wed, 19 Jun 2013 11:19:58 +0100
 
 ghc (7.6.3-3) unstable; urgency=low
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2013-08-16 15:42:42.943038170 +0000
+++ new-ghc/control	2013-08-16 15:42:42.967036047 +0000
@@ -4,7 +4,6 @@
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Joachim Breitner <nomeata at debian.org>,
  Erik de Castro Lopo <erikd at mega-nerd.com>
-DM-Upload-Allowed: yes
 Standards-Version: 3.9.4
 Build-Depends:
   debhelper (>= 9),
@@ -13,15 +12,16 @@
   ghc,
   grep-dctrl,
   dh-autoreconf,
-  gcc (>= 4:4.2),
-  llvm-3.0 [armel armhf],
+  gcc,
+  llvm [armel armhf],
   libffi-dev,
   pkg-config,
   xsltproc,
   docbook-xsl,
   docbook-xml,
-  binutils (>= 2.19.51.20090508) [arm armel],
-  libncurses5-dev
+  binutils [armel armhf],
+  libncurses5-dev,
+  dpkg-dev (>= 1.16.1.1)
 Build-Depends-Indep:
   hscolour,
   fop
@@ -33,12 +33,12 @@
 
 Package: ghc
 Architecture: any
-Depends: gcc (>= 4:4.2), llvm-3.0 [armel armhf], libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: gcc, llvm [armel armhf], libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
 Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}
 Replaces: ghc6 (<< 7)
 Conflicts: ghc6 (<< 7), ${provided-devs}
 Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<= 6.12.1-8)
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-3.0
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2013-08-16 15:42:42.915035342 +0000
+++ new-ghc/rules	2013-08-16 15:42:43.017540713 +0000
@@ -8,6 +8,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Set default flags with dpkg-buildflags
+# This might also close #712228
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 # Set a dummy HOME variable upon build. Some build daemons do not set HOME, but
 # ghc-cabal expects it to be available.
@@ -103,8 +108,8 @@
 	./configure $(confflags) --prefix=/usr \
 		$(EXTRA_CONFIGURE_FLAGS) \
 		--with-ld=ld.bfd \
-		--with-llc=llc-3.0 \
-		--with-opt=opt-3.0
+		--with-llc=llc \
+		--with-opt=opt
 
 	touch $@