diff -Nru cpphs-1.19.2/CHANGELOG cpphs-1.19.3/CHANGELOG
--- cpphs-1.19.2/CHANGELOG	2015-07-31 07:32:09.000000000 +0000
+++ cpphs-1.19.3/CHANGELOG	2015-08-23 09:09:27.000000000 +0000
@@ -4,6 +4,7 @@
   * allow the static linking exception to the LGPL
   * (1.19.1): don't warn about trailing comments in #ifdefs
   * (1.19.2): fix build error
+  * (1.19.3): bugfix for hlint ticket #161 - interaction of --unlit/--linepragma
 
 Version 1.18
 ------------
diff -Nru cpphs-1.19.2/cpphs.cabal cpphs-1.19.3/cpphs.cabal
--- cpphs-1.19.2/cpphs.cabal	2015-07-31 07:32:09.000000000 +0000
+++ cpphs-1.19.3/cpphs.cabal	2015-08-23 09:09:27.000000000 +0000
@@ -1,5 +1,5 @@
 Name: cpphs
-Version: 1.19.2
+Version: 1.19.3
 Copyright: 2004-2015, Malcolm Wallace
 License: LGPL
 License-File: LICENCE-LGPL
diff -Nru cpphs-1.19.2/cpphs.hs cpphs-1.19.3/cpphs.hs
--- cpphs-1.19.2/cpphs.hs	2015-07-31 07:32:09.000000000 +0000
+++ cpphs-1.19.3/cpphs.hs	2015-08-23 09:09:26.000000000 +0000
@@ -20,7 +20,7 @@
 import Data.List   ( isPrefixOf )
 
 version :: String
-version = "1.19.2"
+version = "1.19.3"
 
 main :: IO ()
 main = do
diff -Nru cpphs-1.19.2/debian/changelog cpphs-1.19.3/debian/changelog
--- cpphs-1.19.2/debian/changelog	2015-08-12 12:33:31.000000000 +0000
+++ cpphs-1.19.3/debian/changelog	2015-12-25 05:16:52.000000000 +0000
@@ -1,3 +1,30 @@
+cpphs (1.19.3-1~ubuntu15.10.1~ppa1) wily; urgency=medium
+
+  * No-change backport to wily
+
+ -- Justin Geibel <jtgeibel@gmail.com>  Fri, 25 Dec 2015 00:16:52 -0500
+
+cpphs (1.19.3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Thu, 03 Dec 2015 23:56:55 -0500
+
+cpphs (1.19.2-3) unstable; urgency=medium
+
+  * Switch Vcs-Git/Vcs-Browser headers to new location.
+
+ -- Clint Adams <clint@debian.org>  Thu, 03 Dec 2015 14:54:01 -0500
+
+cpphs (1.19.2-2) experimental; urgency=medium
+
+  * Depend on old-{locale,time}
+  * Bump standards-version to 3.9.6
+  * Depend on haskell-devscripts >= 0.10 to ensure that this package
+    builds against GHC in experimental
+
+ -- Joachim Breitner <nomeata@debian.org>  Thu, 20 Aug 2015 10:26:52 +0200
+
 cpphs (1.19.2-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru cpphs-1.19.2/debian/control cpphs-1.19.3/debian/control
--- cpphs-1.19.2/debian/control	2015-08-12 20:17:10.000000000 +0000
+++ cpphs-1.19.3/debian/control	2015-12-04 05:05:08.000000000 +0000
@@ -4,18 +4,24 @@
 Priority: extra
 Section: haskell
 Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.9),
+ haskell-devscripts (>= 0.10),
  cdbs,
  ghc,
  ghc-prof,
+ libghc-old-locale-dev,
+ libghc-old-locale-prof,
+ libghc-old-time-dev,
+ libghc-old-time-prof,
  libghc-polyparse-dev (>= 1.9),
  libghc-polyparse-prof,
 Build-Depends-Indep: ghc-doc,
+ libghc-old-locale-doc,
+ libghc-old-time-doc,
  libghc-polyparse-doc,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://projects.haskell.org/cpphs/
-Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/cpphs
-Vcs-Darcs: http://darcs.debian.org/pkg-haskell/cpphs
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/
+Vcs-Git: git://git.debian.org/git/pkg-haskell/DHG_packages.git
 
 Package: cpphs
 Architecture: any
diff -Nru cpphs-1.19.2/docs/index.html cpphs-1.19.3/docs/index.html
--- cpphs-1.19.2/docs/index.html	2015-07-31 07:32:09.000000000 +0000
+++ cpphs-1.19.3/docs/index.html	2015-08-23 09:09:27.000000000 +0000
@@ -198,11 +198,12 @@
 <b>Current stable version:</b>
 
 <p>
-cpphs-1.19.2, release date 2015-07-31<br>
+cpphs-1.19.3, release date 2015-08-23<br>
 By HTTP:
 <a href="http://hackage.haskell.org/package/cpphs">Hackage</a>.
 <ul>
-<li> fix build error
+<li> bugfix for hlint ticket #161, for
+     the interaction of --unlit and --linepragma options
 </ul>
 
 <p>
@@ -226,6 +227,14 @@
 <b>Older versions:</b>
 
 <p>
+cpphs-1.19.2, release date 2015-07-31<br>
+By HTTP:
+<a href="http://hackage.haskell.org/package/cpphs">Hackage</a>.
+<ul>
+<li> fix build error
+</ul>
+
+<p>
 cpphs-1.19.1, release date 2015-07-30<br>
 By HTTP:
 <a href="http://hackage.haskell.org/package/cpphs">Hackage</a>.
diff -Nru cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs
--- cpphs-1.19.2/Language/Preprocessor/Cpphs/CppIfdef.hs	2015-07-31 07:32:09.000000000 +0000
+++ cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs	2015-08-23 09:09:26.000000000 +0000
@@ -44,10 +44,11 @@
         -> String               -- ^ The input file content
         -> IO [(Posn,String)]   -- ^ The file after processing (in lines)
 cppIfdef fp syms search options =
-    cpp posn defs search options (Keep []) . (cppline posn:) . linesCpp
+    cpp posn defs search options (Keep []) . initial . linesCpp
   where
     posn = newfile fp
     defs = preDefine options syms
+    initial = if literate options then id else (cppline posn:)
 -- Previous versions had a very simple symbol table  mapping strings
 -- to strings.  Now the #ifdef pass uses a more elaborate table, in
 -- particular to deal with parameterised macros in conditionals.
diff -Nru cpphs-1.19.2/Language/Preprocessor/Unlit.hs cpphs-1.19.3/Language/Preprocessor/Unlit.hs
--- cpphs-1.19.2/Language/Preprocessor/Unlit.hs	2015-07-31 07:32:09.000000000 +0000
+++ cpphs-1.19.3/Language/Preprocessor/Unlit.hs	2015-08-23 09:09:26.000000000 +0000
@@ -21,6 +21,7 @@
                                    -> Include (read line) (unwords rest)
                                 _  -> Pre x
                              ) : classify xs
+--classify (x:xs) | "{-# LINE" `isPrefixOf` x = Program x: classify xs
 classify (x:xs) | all isSpace x = Blank:classify xs
 classify (x:xs)                 = Comment:classify xs