diff -u xpdf-3.02/debian/changelog xpdf-3.02/debian/changelog --- xpdf-3.02/debian/changelog +++ xpdf-3.02/debian/changelog @@ -1,3 +1,12 @@ +xpdf (3.02-1.4ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: (LP: #276304) + - Patch 09_xpdfrc_manpage.dpatch for xpdfrc.5 + - Set maintainer to MOTU + * debian/control: modified build-depends on a obsolete package (x-dev) + + -- Andrea Gasparini Wed, 17 Sep 2008 18:09:47 +0200 + xpdf (3.02-1.4) unstable; urgency=low * Non-maintainer upload. @@ -11,6 +20,14 @@ -- Bernhard R. Link Sun, 07 Sep 2008 14:56:17 +0200 +xpdf (3.02-1.3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Patch 09_xpdfrc_manpage.dpatch for xpdfrc.5 + - Set maintainer to MOTU + + -- Andrea Gasparini Mon, 12 Nov 2007 18:51:03 +0100 + xpdf (3.02-1.3) unstable; urgency=high * Non-maintainer upload by testing security team. @@ -25,6 +42,14 @@ -- Nico Golde Fri, 09 Nov 2007 09:22:19 +0100 +xpdf (3.02-1.2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Added back 09_xpdfrc_manpage.dpatch. + - Set Ubuntu maintainer. + + -- Michael Bienia Mon, 01 Oct 2007 22:24:59 +0200 + xpdf (3.02-1.2) unstable; urgency=high * Non-maintainer upload by testing security team. @@ -35,6 +60,14 @@ -- Nico Golde Thu, 27 Sep 2007 12:05:46 +0200 +xpdf (3.02-1.1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Added back 09_xpdfrc_manpage.dpatch. + - Set Ubuntu maintainer. + + -- Michael Bienia Wed, 08 Aug 2007 12:44:14 +0200 + xpdf (3.02-1.1) unstable; urgency=high * Non-maintainer upload with permission of the maintainer @@ -44,6 +77,14 @@ -- Steffen Joeris Tue, 07 Aug 2007 14:00:34 +1000 +xpdf (3.02-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable (LP: #113365), remaining changes: + - Added back 09_xpdfrc_manpage.dpatch (LP #71753) + - Set Ubuntu maintainer + + -- Andy Price Thu, 17 May 2007 22:04:33 +0100 + xpdf (3.02-1) unstable; urgency=low * New upstream release (closes: #413611) @@ -71,6 +112,30 @@ -- Hamish Moffatt Wed, 25 Apr 2007 02:42:16 +1000 +xpdf (3.01-9ubuntu3) feisty; urgency=low + + * Added 09_xpdfrc_manpage.dpatch to refer to the correct global + config file in xpdfrc.5 (LP #71753) + * Set Ubuntu maintainer address + + -- Andy Price Sat, 24 Mar 2007 05:22:01 +0000 + +xpdf (3.01-9ubuntu2) feisty; urgency=low + + * SECURITY UPDATE: Endless loop from crafted Page tree. + * Added 'debian/patches/90_CVE-2007-0104.dpatch' from koffice upstream. + * References + CVE-2007-0104 + + -- Kees Cook Wed, 24 Jan 2007 17:42:34 -0800 + +xpdf (3.01-9ubuntu1) edgy; urgency=low + + * Escape the newline in debian/rules for configure. Fixes FTBFS. + Thanks, Trent Buck . + + -- Daniel T Chen Sat, 23 Sep 2006 02:38:47 -0400 + xpdf (3.01-9) unstable; urgency=low * Incorporate patches from Eugeniy Meshcheryakov and Junichi Uekawa to diff -u xpdf-3.02/debian/control xpdf-3.02/debian/control --- xpdf-3.02/debian/control +++ xpdf-3.02/debian/control @@ -1,9 +1,10 @@ Source: xpdf Section: text Priority: optional -Maintainer: Hamish Moffatt +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Hamish Moffatt Standards-Version: 3.7.2 -Build-Depends: libt1-dev (>= 5.0.2-3), libxext-dev, libxp-dev, libxt-dev, libxpm-dev, libx11-dev, lesstif2-dev | libmotif-dev, x-dev, debhelper (>= 4.2.21), libfreetype6-dev (>= 2.1.2-1), libpaper-dev | libpaperg-dev, pkg-config, dpatch, automake1.9, autoconf +Build-Depends: libt1-dev (>= 5.0.2-3), libxext-dev, libxp-dev, libxt-dev, libxpm-dev, libx11-dev, lesstif2-dev | libmotif-dev, x11proto-core-dev, debhelper (>= 4.2.21), libfreetype6-dev (>= 2.1.2-1), libpaper-dev | libpaperg-dev, pkg-config, dpatch, automake1.9, autoconf Build-Conflicts: libttf-dev, libstroke0-dev, autoconf2.13 Package: xpdf diff -u xpdf-3.02/debian/patches/00list xpdf-3.02/debian/patches/00list --- xpdf-3.02/debian/patches/00list +++ xpdf-3.02/debian/patches/00list @@ -1,5 +1,6 @@ 01_manpage.dpatch 02_permissions.dpatch +09_xpdfrc_manpage.dpatch #10_add_accelerators.dpatch # doesn't work # Security fixes: only in patch2: unchanged: --- xpdf-3.02.orig/debian/patches/09_xpdfrc_manpage.dpatch +++ xpdf-3.02/debian/patches/09_xpdfrc_manpage.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_xpdfrc_manpage.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes the path to the global xpdfrc in the xpdfrc manpage. + +@DPATCH@ +diff -urNad xpdf-3.01~/doc/xpdfrc.5 xpdf-3.01/doc/xpdfrc.5 +--- xpdf-3.01~/doc/xpdfrc.5 2007-03-24 05:15:14.000000000 +0000 ++++ xpdf-3.01/doc/xpdfrc.5 2007-03-24 05:17:36.000000000 +0000 +@@ -7,7 +7,7 @@ + .I .xpdfrc + file in your home directory, it will be read. Otherwise, a + system-wide configuration file will be read from +-.IR /usr/local/etc/xpdfrc , ++.IR /etc/xpdf/xpdfrc , + if it exists. (This is its default location; depending on build + options, it may be placed elsewhere.) On Win32 systems, the + .I xpdfrc +@@ -459,7 +459,7 @@ + .fi + .SH FILES + .TP +-.B /usr/local/etc/xpdfrc ++.B /etc/xpdf/xpdfrc + This is the default location for the system-wide configuration file. + Depending on build options, it may be placed elsewhere. + .TP