[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: ghc will ever reach testing?



Hi Joachim, unfortunately my request to nm-desk seems to be stuck somewhere, no answers at all.

Anyway I prepared a new version that would be nice to be uploaded, will fix bug #706706 and probably #712228

for 706706 will need an upload and a rebuild, because ghc build-deps from itself.

Attached the debian patch.


(sorry, but I never used darks)

Gianfranco




From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 31 Jul 2013 09:51:49 +0200
Subject: [PATCH] Fixed bug #711948 and maybe #712228

---
 changelog | 10 ++++++++++
 control   | 14 +++++++-------
 rules     |  9 +++++++--
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/changelog b/changelog
index ef4c84b..ea93665 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+ghc (7.6.3-4) unstable; urgency=low
+
+  * Team upload
+  * 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.
+
+ -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it>  Mon, 29 Jul 2013 10:32:24 +0200
+
 ghc (7.6.3-3) unstable; urgency=low

   * Add patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch,
diff --git a/control b/control
index 8bd6be5..19649df 100644
--- a/control
+++ b/control
@@ -4,7 +4,6 @@ Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Joachim Breitner <nomeata@debian.org>,
  Erik de Castro Lopo <erikd@mega-nerd.com>
-DM-Upload-Allowed: yes
 Standards-Version: 3.9.4
 Build-Depends:
   debhelper (>= 9),
@@ -13,15 +12,16 @@ Build-Depends:
   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 @@ Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/ghc

 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 --git a/rules b/rules
index 6d480ea..1cb63ec 100755
--- a/rules
+++ b/rules
@@ -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.
@@ -101,8 +106,8 @@ endif
        ./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 $@



>________________________________
> Da: Joachim Breitner <nomeata@debian.org>
>A: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> 
>Cc: "debian-haskell@lists.debian.org" <debian-haskell@lists.debian.org> 
>Inviato: Martedì 16 Luglio 2013 11:23
>Oggetto: Re: ghc will ever reach testing?
> 
>
>Hi,
>
>Am Dienstag, den 16.07.2013, 10:20 +0100 schrieb Gianfranco Costamagna:
>> > It might be worth checking if disabling parallelism and passing "+RTS
>> > -V0" to GHC would help. Are you interested in helping out here? Maybe we
>> > can give you access to the porter box for that.
>> 
>> I never played with the porter box, I'm a new DM, but I can try to help for sure!
>
>great. Please follow the procedure at
>http://dsa.debian.org/doc/guest-account/
>to get access to zelenka.debian.org . Then first try to reproduce the
>problem, and  let me know when you have done that.
>
>Greetings,
>Joachim
>
>-- 
>Joachim "nomeata" Breitner
>Debian Developer
>  nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
>  JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata
>
>
>
> 
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Wed, 31 Jul 2013 09:51:49 +0200
Subject: [PATCH] Fixed bug #711948 and maybe #712228

---
 changelog | 10 ++++++++++
 control   | 14 +++++++-------
 rules     |  9 +++++++--
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/changelog b/changelog
index ef4c84b..ea93665 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+ghc (7.6.3-4) unstable; urgency=low
+
+  * Team upload
+  * 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.
+
+ -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it>  Mon, 29 Jul 2013 10:32:24 +0200
+
 ghc (7.6.3-3) unstable; urgency=low
 
   * Add patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch,
diff --git a/control b/control
index 8bd6be5..19649df 100644
--- a/control
+++ b/control
@@ -4,7 +4,6 @@ Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Joachim Breitner <nomeata@debian.org>,
  Erik de Castro Lopo <erikd@mega-nerd.com>
-DM-Upload-Allowed: yes
 Standards-Version: 3.9.4
 Build-Depends:
   debhelper (>= 9),
@@ -13,15 +12,16 @@ Build-Depends:
   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 @@ Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/ghc
 
 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 --git a/rules b/rules
index 6d480ea..1cb63ec 100755
--- a/rules
+++ b/rules
@@ -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.
@@ -101,8 +106,8 @@ endif
 	./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 $@
 
-- 

Reply to: