[Pkg-haskell-commits] darcs: ghc: New upstream release, drop all patches introduced in 7.4.0.20111219-3, applied upstream.

Joachim Breitner mail at joachim-breitner.de
Fri Feb 3 16:45:13 UTC 2012 

Mon Jan  9 12:22:11 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release, drop all patches introduced in 7.4.0.20111219-3, applied upstream. 
  Ignore-this: 9202ccf728a9fa39053ea8856eac6b3a

    M ./changelog -2 +4
    M ./control -1 +1
    R ./patches/ArchMips
    R ./patches/S390-Arch
    R ./patches/kfreebsd-OS
    M ./patches/series -3

Mon Jan  9 12:22:11 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release, drop all patches introduced in 7.4.0.20111219-3, applied upstream. 
  Ignore-this: 9202ccf728a9fa39053ea8856eac6b3a
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:45:12.666756908 +0000
+++ new-ghc//changelog	2012-02-03 16:45:13.003249108 +0000
@@ -1,8 +1,10 @@
-ghc (7.4.0.20111219-5) UNRELEASED; urgency=low
+ghc (7.4.0.20120108-1) UNRELEASED; urgency=low
 
   * s/armef/armhf/ in debian/control 
+  * New upstream release, drop all patches introduced in 7.4.0.20111219-3,
+    applied upstream. 
 
- -- Joachim Breitner <nomeata at debian.org>  Mon, 02 Jan 2012 22:21:17 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 09 Jan 2012 13:19:37 +0100
 
 ghc (7.4.0.20111219-4) experimental; urgency=low
 
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2012-02-03 16:45:12.582754689 +0000
+++ new-ghc//control	2012-02-03 16:45:12.674749728 +0000
@@ -120,7 +120,7 @@
  Haddock can generate documentation in multiple formats; currently HTML
  is implemented, and there is partial support for generating DocBook.
  .
- This package contains Haddock version 2.9.4.
+ This package contains Haddock version 2.10.0.
 
 Package: ghc6
 Architecture: all
diff -rN -u old-ghc//patches/ArchMips new-ghc//patches/ArchMips
--- old-ghc//patches/ArchMips	2012-02-03 16:45:12.582754689 +0000
+++ new-ghc//patches/ArchMips	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-From: Joachim Breitner <nomeata at debian.org>
-Description: Architecture names from aclocal.mk missing in Platform.hs
-Bug: http://hackage.haskell.org/trac/ghc/ticket/5734
-
-Index: ghc-7.4.0.20111219/compiler/utils/Platform.hs
-===================================================================
---- ghc-7.4.0.20111219.orig/compiler/utils/Platform.hs	2011-12-30 18:02:06.000000000 +0100
-+++ ghc-7.4.0.20111219/compiler/utils/Platform.hs	2011-12-30 18:02:30.000000000 +0100
-@@ -44,6 +44,9 @@
-           , armISAExt :: [ArmISAExt] }
-         | ArchS390
-         | ArchS390x
-+        | ArchMipseb
-+        | ArchMipsel
-+        | ArchAlpha
-         deriving (Read, Show, Eq)
- 
- 
-@@ -89,6 +92,9 @@
-                 ArchARM _ _ -> True
-                 ArchS390    -> True
-                 ArchS390x   -> False
-+                ArchMipsel  -> True
-+                ArchMipseb  -> True
-+                ArchAlpha   -> True
- 
- 
- -- | This predicates tells us whether the OS supports ELF-like shared libraries.
diff -rN -u old-ghc//patches/kfreebsd-OS new-ghc//patches/kfreebsd-OS
--- old-ghc//patches/kfreebsd-OS	2012-02-03 16:45:12.578748951 +0000
+++ new-ghc//patches/kfreebsd-OS	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-From: Joachim Breitner <nomeata at debian.org>
-Description: KFreeBSD is also an ELF binary
-Bug: http://hackage.haskell.org/trac/ghc/ticket/5733
-
-Index: ghc-7.4.0.20111219/aclocal.m4
-===================================================================
---- ghc-7.4.0.20111219.orig/aclocal.m4	2011-12-22 21:34:13.000000000 +0100
-+++ ghc-7.4.0.20111219/aclocal.m4	2011-12-30 18:09:13.000000000 +0100
-@@ -221,13 +221,16 @@
-         freebsd)
-             test -z "[$]2" || eval "[$]2=OSFreeBSD"
-             ;;
-+        kfreebsdgnu)
-+            test -z "[$]2" || eval "[$]2=OSKFreeBSD"
-+            ;;
-         openbsd)
-             test -z "[$]2" || eval "[$]2=OSOpenBSD"
-             ;;
-         netbsd)
-             test -z "[$]2" || eval "[$]2=OSNetBSD"
-             ;;
--        dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
-+        dragonfly|osf1|osf3|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
-             test -z "[$]2" || eval "[$]2=OSUnknown"
-             ;;
-         *)
-Index: ghc-7.4.0.20111219/compiler/utils/Platform.hs
-===================================================================
---- ghc-7.4.0.20111219.orig/compiler/utils/Platform.hs	2011-12-19 19:11:04.000000000 +0100
-+++ ghc-7.4.0.20111219/compiler/utils/Platform.hs	2011-12-30 18:09:34.000000000 +0100
-@@ -56,6 +56,7 @@
-         | OSFreeBSD
-         | OSOpenBSD
-         | OSNetBSD
-+        | OSKFreeBSD
-         deriving (Read, Show, Eq)
- 
- -- | ARM Instruction Set Architecture and Extensions
-@@ -95,5 +96,6 @@
- osElfTarget OSSolaris2 = True
- osElfTarget OSDarwin   = False
- osElfTarget OSMinGW32  = False
-+osElfTarget OSKFreeBSD = True
- osElfTarget OSUnknown  = panic "Don't know if OSUnknown is elf"
- 
diff -rN -u old-ghc//patches/S390-Arch new-ghc//patches/S390-Arch
--- old-ghc//patches/S390-Arch	2012-02-03 16:45:12.578748951 +0000
+++ new-ghc//patches/S390-Arch	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-Description: Note bitness of S390/S390x
-Author: Joachim Breitner <nomeata at debian.org>
-Bug: http://hackage.haskell.org/trac/ghc/ticket/5735
-
-Index: ghc-7.4.0.20111219/aclocal.m4
-===================================================================
---- ghc-7.4.0.20111219.orig/aclocal.m4	2011-12-30 17:56:25.000000000 +0100
-+++ ghc-7.4.0.20111219/aclocal.m4	2011-12-30 18:01:59.000000000 +0100
-@@ -183,7 +183,13 @@
-         mipsel)
-             test -z "[$]2" || eval "[$]2=ArchMipsel"
-             ;;
--        hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)
-+        s390)
-+            test -z "[$]2" || eval "[$]2=ArchS390"
-+            ;;
-+        s390x)
-+            test -z "[$]2" || eval "[$]2=ArchS390x"
-+            ;;
-+        hppa|hppa1_1|ia64|m68k|rs6000|sparc64|vax)
-             test -z "[$]2" || eval "[$]2=ArchUnknown"
-             ;;
-         *)
-Index: ghc-7.4.0.20111219/compiler/utils/Platform.hs
-===================================================================
---- ghc-7.4.0.20111219.orig/compiler/utils/Platform.hs	2011-12-30 17:56:25.000000000 +0100
-+++ ghc-7.4.0.20111219/compiler/utils/Platform.hs	2011-12-30 18:02:06.000000000 +0100
-@@ -42,6 +42,8 @@
-         | ArchARM
-           { armISA    :: ArmISA
-           , armISAExt :: [ArmISAExt] }
-+        | ArchS390
-+        | ArchS390x
-         deriving (Read, Show, Eq)
- 
- 
-@@ -85,6 +87,8 @@
-                 ArchPPC_64  -> False
-                 ArchSPARC   -> True
-                 ArchARM _ _ -> True
-+                ArchS390    -> True
-+                ArchS390x   -> False
- 
- 
- -- | This predicates tells us whether the OS supports ELF-like shared libraries.
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:45:12.534802790 +0000
+++ new-ghc//patches/series	2012-02-03 16:45:12.690751385 +0000
@@ -1,9 +1,6 @@
-kfreebsd-OS
 system-libffi
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index
 haddock-no-library
 no_ghci_on_powerpc
-S390-Arch
-ArchMips
 use-llvm-3.0

More information about the Pkg-haskell-commits mailing list