diff -u drift-2.2.3/debian/changelog drift-2.2.3/debian/changelog
--- drift-2.2.3/debian/changelog
+++ drift-2.2.3/debian/changelog
@@ -1,3 +1,13 @@
+drift (2.2.3-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * fold upstream changes in 2.2.3-2.2's .diff.gz into ghc-7.4-fixes.dpatch
+  * fix build errors with ghc 7.6 (Closes: #713313, #753765)
+  * Ensure that /usr/share/info/dir.gz isn't included in the package to
+    prevent an automatic reject. (Closes: #799647)
+
+ -- Uwe Kleine-König <uwe@kleine-koenig.org>  Mon, 21 Sep 2015 09:28:13 +0200
+
 drift (2.2.3-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u drift-2.2.3/debian/rules drift-2.2.3/debian/rules
--- drift-2.2.3/debian/rules
+++ drift-2.2.3/debian/rules
@@ -31,4 +31,8 @@
 #	install -m 644 -o root -g root "$(DEB_BUILDDIR)/docs/drift.pdf"  debian/drift/usr/share/doc/drift
 	rm debian/drift/usr/share/doc/drift/README
+	# To make lintian a bit happier and ftpmaster happy enough.
+	# Note this file doesn't exist if install-info isn't available, so
+	# ignore failures
+	-rm debian/drift/usr/share/info/dir
 
 .PHONY:	update-debian-control
diff -u drift-2.2.3/debian/patches/ghc-7.4-fixes.dpatch drift-2.2.3/debian/patches/ghc-7.4-fixes.dpatch
--- drift-2.2.3/debian/patches/ghc-7.4-fixes.dpatch
+++ drift-2.2.3/debian/patches/ghc-7.4-fixes.dpatch
@@ -281,0 +282,42 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drift-2.2.3~/src/DataP.lhs drift-2.2.3/src/DataP.lhs
+--- drift-2.2.3~/src/DataP.lhs	2008-02-10 14:38:31.000000000 +0000
++++ drift-2.2.3/src/DataP.lhs	2012-09-18 21:23:49.074270747 +0100
+@@ -10,9 +10,9 @@ needs to be fixed.
+ >where
+ 
+ >import ParseLib2
+->import Char
+->import List
+->import Monad
++>import Data.Char
++>import Data.List
++>import Control.Monad
+ 
+ 
+ >data Statement = DataStmt | NewTypeStmt deriving (Eq,Show)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drift-2.2.3~/src/DrIFT.hs drift-2.2.3/src/DrIFT.hs
+--- drift-2.2.3~/src/DrIFT.hs
++++ drift-2.2.3/src/DrIFT.hs
+@@ -17,7 +17,7 @@ import RuleUtils (commentLine,texts)
+ import RuleUtils(Rule,Tag)
+ import Version
+ import qualified Rules(rules)
+-import qualified System
++import System.Environment (getArgs)
+ 
+ data Op = OpList | OpDerive | OpVersion
+ 
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drift-2.2.3~/src/ParseLib2.hs drift-2.2.3/src/ParseLib2.hs
+--- drift-2.2.3~/src/ParseLib2.hs
++++ drift-2.2.3/src/ParseLib2.hs
+@@ -31,8 +31,8 @@ module ParseLib2
+     many1_offside,many_offside,off,
+     opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
+ 
+-import Char
+-import Monad
++import Data.Char
++import Control.Monad
+ 
+ infixr 5 +++
+ 
diff -u drift-2.2.3/debian/patches/00list drift-2.2.3/debian/patches/00list
--- drift-2.2.3/debian/patches/00list
+++ drift-2.2.3/debian/patches/00list
@@ -1,0 +2 @@
+ghc-7.6-fixes.dpatch
reverted:
--- drift-2.2.3/src/DrIFT.hs
+++ drift-2.2.3.orig/src/DrIFT.hs
@@ -17,7 +17,7 @@
 import RuleUtils(Rule,Tag)
 import Version
 import qualified Rules(rules)
+import qualified System
-import System.Environment (getArgs)
 
 data Op = OpList | OpDerive | OpVersion
 
reverted:
--- drift-2.2.3/src/DataP.lhs
+++ drift-2.2.3.orig/src/DataP.lhs
@@ -10,9 +10,9 @@
 >where
 
 >import ParseLib2
+>import Char
+>import List
+>import Monad
->import Data.Char
->import Data.List
->import Control.Monad
 
 
 >data Statement = DataStmt | NewTypeStmt deriving (Eq,Show)
reverted:
--- drift-2.2.3/src/ParseLib2.hs
+++ drift-2.2.3.orig/src/ParseLib2.hs
@@ -31,8 +31,8 @@
     many1_offside,many_offside,off,
     opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
 
+import Char
+import Monad
-import Data.Char
-import Control.Monad
 
 infixr 5 +++
 
only in patch2:
unchanged:
--- drift-2.2.3.orig/debian/patches/ghc-7.6-fixes.dpatch
+++ drift-2.2.3/debian/patches/ghc-7.6-fixes.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+--- a/src/GenUtil.hs
++++ b/src/GenUtil.hs
+@@ -96,16 +96,18 @@
+ import Data.List(intersperse, sortBy, groupBy)
+ import Control.Monad hiding (replicateM, replicateM_)
+ import System.IO (hPutStr, stderr)
+-import System.IO.Error(isDoesNotExistError)
++import System.IO.Error(isDoesNotExistError, catchIOError)
+ import System.Random(StdGen, newStdGen, Random(randomR))
+ import System.Exit (exitWith, ExitCode(ExitSuccess), exitFailure)
+-import System.Environment
++import System.Environment hiding (lookupEnv)
+ import System.Time
+ import Data.Time
+ 
+ {-# SPECIALIZE snub :: [String] -> [String] #-}
+ {-# SPECIALIZE snub :: [Int] -> [Int] #-}
+ 
++catch = catchIOError
++
+ -- | sorted nub of list, much more efficient than nub, but doesnt preserve ordering.
+ snub :: Ord a => [a] -> [a]
+ snub = map head . group . sort
+@@ -286,8 +288,8 @@
+ lefts :: [Either a b] -> [a]
+ lefts xs = [x | Left x <- xs]
+ 
+-ioM :: Monad m => IO a -> IO (m a)
+-ioM action = catch (fmap return action) (\e -> return (fail (show e)))
++--ioM :: Monad m => IO a -> IO (m a)
++ioM action = catch (fmap return action) (\e -> return (fail "hoppla"))
+ 
+ ioMp :: MonadPlus m => IO a -> IO (m a)
+ ioMp action = catch (fmap return action) (\_ -> return mzero)
+--- a/src/ChaseImports.hs
++++ b/src/ChaseImports.hs
+@@ -28,9 +28,10 @@
+ import qualified Unlit
+ import Control.Monad
+ import System.Environment(getEnv)
++import System.IO.Error(catchIOError)
+ import GenUtil
+ 
+-try x = catch (x >>= return . Right) (return . Left)
++try x = catchIOError (x >>= return . Right) (return . Left)
+ 
+ --- Split up input ---------------------------------------------------------
+ splitString :: String -> String -> (String,String)
+