diff -Nru xpdf-3.03/debian/changelog xpdf-3.03/debian/changelog
--- xpdf-3.03/debian/changelog	2014-04-06 03:10:43.000000000 +0000
+++ xpdf-3.03/debian/changelog	2015-12-24 18:59:46.000000000 +0000
@@ -1,3 +1,21 @@
+xpdf (3.03-17+rpi1) stretch-staging; urgency=medium
+
+  * Apply patches from ubuntu to fix build with more recent poppler.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Dec 2015 18:59:10 +0000
+
+xpdf (3.03-17build2) vivid; urgency=medium
+
+  * No-change rebuild for new poppler
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Wed, 12 Nov 2014 15:47:07 +0000
+
+xpdf (3.03-17build1) utopic; urgency=medium
+
+  * No change rebuild for poppler
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Mon, 26 May 2014 10:18:22 +0100
+
 xpdf (3.03-17) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru xpdf-3.03/debian/control xpdf-3.03/debian/control
--- xpdf-3.03/debian/control	2014-04-06 03:10:24.000000000 +0000
+++ xpdf-3.03/debian/control	2015-12-24 18:58:35.000000000 +0000
@@ -9,7 +9,7 @@
  libxt-dev,
  libx11-dev,
  libmotif-dev,
- libpoppler-private-dev (>= 0.24),
+ libpoppler-private-dev (>= 0.30),
 Homepage: http://www.foolabs.com/xpdf/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xpdf.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/xpdf.git
diff -Nru xpdf-3.03/debian/patches/poppler-0.30 xpdf-3.03/debian/patches/poppler-0.30
--- xpdf-3.03/debian/patches/poppler-0.30	1970-01-01 00:00:00.000000000 +0000
+++ xpdf-3.03/debian/patches/poppler-0.30	2015-11-25 08:28:24.000000000 +0000
@@ -0,0 +1,46 @@
+Description: Supply correct arguments to PSOutputDev's constructor
+Author: Iain Lane <iain.lane@canonical.com>
+Forwarded: no
+
+Index: b/xpdf/XPDFViewer.cc
+===================================================================
+--- a/xpdf/XPDFViewer.cc
++++ b/xpdf/XPDFViewer.cc
+@@ -3712,8 +3712,14 @@
+   // Normal print mode
+   if (printAll && !printBack)
+   {
++    std::vector<int> pages;
++    pages.reserve((lastPage - firstPage) + 1);
++
++    for (int i = firstPage; i <= lastPage; ++i)
++        pages.push_back(i);
++
+     psOut = new PSOutputDev(psFileName->getCString(), doc,
+-          NULL, firstPage, lastPage,
++          NULL, pages,
+           psModePS, xpdfParams->getPSPaperWidth(),
+           xpdfParams->getPSPaperHeight(), xpdfParams->getPSDuplex());
+     if (psOut->isOk()) {
+@@ -3727,6 +3733,8 @@
+   {
+     int step=1, i;
+     int beginPage, endPage;
++    std::vector<int> page;
++    page.reserve(1);
+ 
+     if (!printAll)
+     {
+@@ -3757,10 +3765,10 @@
+ 
+     if (firstPage<=lastPage)
+     {
+-      for (i=beginPage;; i+=step)
++      for (i=beginPage; page[0] = i; i+=step)
+       {
+         psOut = new PSOutputDev(psFileName->getCString(), doc,
+-              NULL, i, i, psModePS,
++              NULL, page, psModePS,
+               xpdfParams->getPSPaperWidth(),
+               xpdfParams->getPSPaperHeight(), xpdfParams->getPSDuplex());
+         if (psOut->isOk()) {
diff -Nru xpdf-3.03/debian/patches/poppler-0.33 xpdf-3.03/debian/patches/poppler-0.33
--- xpdf-3.03/debian/patches/poppler-0.33	1970-01-01 00:00:00.000000000 +0000
+++ xpdf-3.03/debian/patches/poppler-0.33	2015-11-25 08:28:24.000000000 +0000
@@ -0,0 +1,63 @@
+Description: poppler 0.33 (or something 0.30-0.33) dropped the antialias parameters from GlobalParams
+Author: Iain Lane <iain.lane@canonical.com>
+
+Index: b/xpdf/xpdf.cc
+===================================================================
+--- a/xpdf/xpdf.cc
++++ b/xpdf/xpdf.cc
+@@ -180,12 +180,12 @@
+     }
+   }
+   if (antialiasStr[0]) {
+-    if (!globalParams->setAntialias(antialiasStr)) {
++    if (!globalParams->parseYesNo2(antialiasStr, &xpdfParams->antialias)) {
+       fprintf(stderr, "Bad '-aa' value on command line\n");
+     }
+   }
+   if (vectorAntialiasStr[0]) {
+-    if (!globalParams->setVectorAntialias(vectorAntialiasStr)) {
++    if (!globalParams->parseYesNo2(vectorAntialiasStr, &xpdfParams->vectorAntialias)) {
+       fprintf(stderr, "Bad '-aaVector' value on command line\n");
+     }
+   }
+Index: b/xpdf/XPDFCore.cc
+===================================================================
+--- a/xpdf/XPDFCore.cc
++++ b/xpdf/XPDFCore.cc
+@@ -93,6 +93,10 @@
+ 		   GBool installCmap, int rgbCubeSizeA):
+   PDFCore(splashModeRGB8, 4, reverseVideoA, paperColorA, !fullScreenA)
+ {
++
++  out->setFontAntialias(xpdfParams->antialias);
++  out->setVectorAntialias(xpdfParams->vectorAntialias);
++
+   GString *initialZoom;
+ 
+   shell = shellA;
+Index: b/xpdf/XPDFParams.cc
+===================================================================
+--- a/xpdf/XPDFParams.cc
++++ b/xpdf/XPDFParams.cc
+@@ -53,7 +53,7 @@
+ // XpdfParams
+ //------------------------------------------------------------------------
+ 
+-XpdfParams::XpdfParams(char *cfgFileName) {
++XpdfParams::XpdfParams(char *cfgFileName) : antialias(gTrue), vectorAntialias(gTrue) {
+   GString *fileName;
+   FILE *f;
+   int i;
+Index: b/xpdf/XPDFParams.h
+===================================================================
+--- a/xpdf/XPDFParams.h
++++ b/xpdf/XPDFParams.h
+@@ -88,6 +88,8 @@
+   GBool getContinuousView();
+   int getPSPaperWidth();
+   int getPSPaperHeight();
++  GBool antialias;
++  GBool vectorAntialias;
+ 
+ private:
+   void parseCommand(const char *cmdName, GString **val,
diff -Nru xpdf-3.03/debian/patches/series xpdf-3.03/debian/patches/series
--- xpdf-3.03/debian/patches/series	2014-04-06 03:07:01.000000000 +0000
+++ xpdf-3.03/debian/patches/series	2015-11-25 08:28:24.000000000 +0000
@@ -22,3 +22,5 @@
 poppler-startdoc.patch
 poppler-xpdfparams.patch
 poppler-startpage.patch
+poppler-0.30
+poppler-0.33