[Pkg-cups-devel] r808 - in cupsys/trunk/debian: . local/filters/imagetopdf local/filters/pdftoopvp/poppler-0.5.4 local/filters/pdftoopvp/poppler-0.5.4/glib/reference/html local/filters/pdftopdf local/filters/pdftoraster patches
Till Kamppeter
till-guest at alioth.debian.org
Wed Aug 6 15:10:51 UTC 2008
Author: till-guest
Date: Wed Aug 6 15:10:51 2008
New Revision: 808
Log:
Removed unneeded binary files which break packaging. Fixed pdftopdf Poppler API problem.
Added:
cupsys/trunk/debian/patches/pdftopdf-libpoppler3-api.dpatch (contents, props changed)
Removed:
cupsys/trunk/debian/local/filters/imagetopdf/INSTALL.jp
cupsys/trunk/debian/local/filters/imagetopdf/README.jp
cupsys/trunk/debian/local/filters/pdftoopvp/poppler-0.5.4/README.opvp.jp
cupsys/trunk/debian/local/filters/pdftoopvp/poppler-0.5.4/glib/reference/html/home.png
cupsys/trunk/debian/local/filters/pdftoopvp/poppler-0.5.4/glib/reference/html/left.png
cupsys/trunk/debian/local/filters/pdftoopvp/poppler-0.5.4/glib/reference/html/right.png
cupsys/trunk/debian/local/filters/pdftoopvp/poppler-0.5.4/glib/reference/html/up.png
cupsys/trunk/debian/local/filters/pdftopdf/INSTALL.jp
cupsys/trunk/debian/local/filters/pdftopdf/README-pdf2pdf.jp
cupsys/trunk/debian/local/filters/pdftopdf/README.jp
cupsys/trunk/debian/local/filters/pdftoraster/INSTALL.jp
cupsys/trunk/debian/local/filters/pdftoraster/README.jp
Modified:
cupsys/trunk/debian/ (props changed)
cupsys/trunk/debian/changelog
cupsys/trunk/debian/patches/00list
cupsys/trunk/debian/rules
Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog (original)
+++ cupsys/trunk/debian/changelog Wed Aug 6 15:10:51 2008
@@ -4,13 +4,18 @@
* debian/local/filters/imagetopdf/, debian/local/filters/pdftopdf/,
debian/local/filters/pdftoopvp/, debian/local/filters/pdftoraster/,
debian/local/pstopdf.convs, debian/rules, debian/control, debian/copyright,
- debian/cups.install:
+ debian/cups.install, debian/patches/pdftopdf-libpoppler3-api.dpatch:
Introduced the first bunch of infrastructure for using PDF as standard
print job format. Added CUPS filters imagetopdf, pstopdf, pdftopdf,
pdftoopvp, pdftoraster, added build dependency on libpoppler-dev, as the
new filters are Poppler-based. texttopdf and pdftoijs will be added soon.
All this is temporary, as the filters are planned to be added to the
upstream package of CUPS (CUPS STR #1595).
+ Note: From the original source of all the filters files with the extensions
+ *.jp and *.png were removed. They are not needed by the filters and they
+ are not accepted in the debian/ directory as they are binary files. In
+ addition, pdftopdf needs a patch because of a small change in the Poppler
+ API (debian/patches/pdftopdf-libpoppler3-api.dpatch).
[ Martin Pitt ]
* Add missing CVE and more verbose descriptions to security fixes to 1.3.6-1
Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list (original)
+++ cupsys/trunk/debian/patches/00list Wed Aug 6 15:10:51 2008
@@ -9,6 +9,7 @@
# patches sent upstream
pidfile.dpatch
ppd-poll-with-client-conf.dpatch
+pdftopdf-libpoppler3-api.dpatch
# no answer yet, po4a might not be appropriate
manpage-translations.dpatch
Added: cupsys/trunk/debian/patches/pdftopdf-libpoppler3-api.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/pdftopdf-libpoppler3-api.dpatch Wed Aug 6 15:10:51 2008
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pdftopdf-libpoppler3-api.dpatch by <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cups-1.3.8~/debian/local/filters/pdftopdf/src/P2PFont.cc cups-1.3.8/debian/local/filters/pdftopdf/src/P2PFont.cc
+--- cups-1.3.8~/debian/local/filters/pdftopdf/src/P2PFont.cc 2008-08-06 13:08:33.000000000 +0200
++++ cups-1.3.8/debian/local/filters/pdftopdf/src/P2PFont.cc 2008-08-06 16:54:11.000000000 +0200
+@@ -386,10 +386,10 @@
+ CharCode cid;
+ for (cid = 0;cid <= maxRefCID ;cid++) {
+ int len;
+- Unicode ucode;
++ Unicode *ucode = NULL;
+
+- len = octu->mapToUnicode(cid,&ucode,1);
+- humap[cid*N_UCS_CANDIDATES] = ucode;
++ len = octu->mapToUnicode(cid,&ucode);
++ humap[cid*N_UCS_CANDIDATES] = *ucode;
+ for (i = 1;i < N_UCS_CANDIDATES;i++) {
+ humap[cid*N_UCS_CANDIDATES+i] = 0;
+ }
+@@ -1109,7 +1109,7 @@
+ char *p;
+ int len;
+ int n;
+- Unicode u[8];
++ Unicode *u = NULL;
+ CharCode code;
+ int uLen;
+ double dx,dy,originX,originY;
+@@ -1120,7 +1120,7 @@
+ p = s->getCString();
+ len = s->getLength();
+ while (len > 0) {
+- n = font->getNextChar(p,len,&code,u,(sizeof(u)/sizeof(Unicode)),&uLen,
++ n = font->getNextChar(p,len,&code,&u,&uLen,
+ &dx,&dy,&originX,&originY);
+ code &= (CIDTOGID_SIZE-1); /* mask */
+ fontFile->refChar(code);
Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules (original)
+++ cupsys/trunk/debian/rules Wed Aug 6 15:10:51 2008
@@ -42,6 +42,9 @@
# Prepare building of extra filters for PDF printing workflow
export CFLAGS="$CFLAGS -I`pwd`"
export LDFLAGS="$LDFLAGS -L`pwd`/cups/"
+ # We have removed README.jp from all source trees, as it caused
+ # packaging problems. So do not try to install these files.
+ (cd debian/local/filters; perl -p -i -e 's/README.jp//g' */Makefile*)
(cd debian/local/filters/pdftoopvp/poppler-0.5.4;./configure --prefix=/usr --sysconfdir=/etc --disable-cairo-output --disable-poppler-glib --disable-poppler-qt --disable-poppler-qt4 --disable-gtk-test --disable-utils)
(cd debian/local/filters/imagetopdf;autoreconf --install;./configure --prefix=/usr --sysconfdir=/etc)
(cd debian/local/filters/pdftopdf;autoreconf --install;./configure --prefix=/usr --sysconfdir=/etc)
@@ -107,9 +110,9 @@
# so consider the PPDs as programming examples
install -m 0644 pdftoopvp/ppd/* $(DEB_DESTDIR)/../cups/usr/share/doc/cups/pdftoopvp/examples
install -m 0644 pdftoopvp/poppler-0.5.4/README.opvp $(DEB_DESTDIR)/../cups/usr/share/doc/cups/pdftoopvp/
- install -m 0644 pdftoopvp/poppler-0.5.4/README.opvp.jp $(DEB_DESTDIR)/../cups/usr/share/doc/cups/pdftoopvp/
# Move file detection and conversion rules to /usr/share/cups/mime/ so
# that the package manager does not consider them conffiles
+ install -d $(DEB_DESTDIR)/../cups/usr/share/cups/mime
( cd $(DEB_DESTDIR)/../cups/etc/cups; mv imagetopdf.* pdftopdf.* pdftoraster.* pdf.* $(DEB_DESTDIR)/../cups/usr/share/cups/mime/ )
# Simple Ghostscript-based PostScript-to-PDF filter
install -m 0755 filters/pstopdf $(DEB_DESTDIR)/../cups/usr/lib/cups/filter
More information about the Pkg-cups-devel
mailing list