[DHG_packages] 01/01: Upload cabal-debian

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository DHG_packages.

commit 77af0fcb41da1079359a0bf908fa2d60b391ee1b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jan 23 11:05:42 2017 +0100

    Upload cabal-debian
---
 p/cabal-debian/debian/changelog               |  7 +++++++
 p/cabal-debian/debian/patches/fix-ghc-builtin | 13 -------------
 p/cabal-debian/debian/patches/newer-cabal     | 24 ------------------------
 p/cabal-debian/debian/patches/series          |  2 --
 4 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/p/cabal-debian/debian/changelog b/p/cabal-debian/debian/changelog
index 786bd53..6d82f4d 100644
--- a/p/cabal-debian/debian/changelog
+++ b/p/cabal-debian/debian/changelog
@@ -1,3 +1,10 @@
+cabal-debian (4.35.6-1) unstable; urgency=medium
+
+  * New upstream release (fix for #850920)
+    - drop patches, addressed upstream
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 19 Jan 2017 14:33:01 +0100
+
 cabal-debian (4.33-5) unstable; urgency=medium
 
   * Refresh existing debian patch.
diff --git a/p/cabal-debian/debian/patches/fix-ghc-builtin b/p/cabal-debian/debian/patches/fix-ghc-builtin
deleted file mode 100644
index 34888f0..0000000
--- a/p/cabal-debian/debian/patches/fix-ghc-builtin
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: cabal-debian-4.33/src/Debian/Debianize/Bundled.hs
-===================================================================
---- cabal-debian-4.33.orig/src/Debian/Debianize/Bundled.hs	2016-10-07 04:13:42.000000000 +0900
-+++ cabal-debian-4.33/src/Debian/Debianize/Bundled.hs	2017-01-09 21:43:40.231080418 +0900
-@@ -105,7 +105,7 @@
-                 lns = lines $ unsafePerformIO (chroot root (readProcess "dpkg" ["-L", unBinPkgName hcname] ""))
-                 parseLib :: String -> Maybe PackageIdentifier
-                 parseLib s =
--                    case s =~ ("(.*)-([0-9.]*)-(.*).conf$") :: (String, String, String, [String]) of
-+                    case s =~ ("(.*)-([0-9.]*)(-.*)?.conf$") :: (String, String, String, [String]) of
-                       (_, _, _, [cabalName, ver, _sum]) ->
-                           case parseVersion' ver of
-                             Just v -> Just (PackageIdentifier (PackageName cabalName) v)
diff --git a/p/cabal-debian/debian/patches/newer-cabal b/p/cabal-debian/debian/patches/newer-cabal
deleted file mode 100644
index 74a771d..0000000
--- a/p/cabal-debian/debian/patches/newer-cabal
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: cabal-debian-4.33/src/Debian/Orphans.hs
-===================================================================
---- cabal-debian-4.33.orig/src/Debian/Orphans.hs	2016-10-07 04:13:42.000000000 +0900
-+++ cabal-debian-4.33/src/Debian/Orphans.hs	2017-01-09 21:37:34.000000000 +0900
-@@ -36,9 +36,6 @@
- #if MIN_VERSION_Cabal(1,22,0)
- deriving instance Typeable AbiTag
- deriving instance Data AbiTag
--#if 1
--deriving instance Eq AbiTag
--#endif
- deriving instance Ord AbiTag
- #endif
- 
-@@ -46,9 +43,6 @@
- deriving instance Data CompilerId
- 
- deriving instance Ord Language
--#if 1
--deriving instance Eq Compiler
--#endif
- deriving instance Ord Compiler
- deriving instance Ord NameAddr
- deriving instance Ord License
diff --git a/p/cabal-debian/debian/patches/series b/p/cabal-debian/debian/patches/series
deleted file mode 100644
index 1fb699f..0000000
--- a/p/cabal-debian/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-newer-cabal
-fix-ghc-builtin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git