[Pkg-cups-devel] r814 - in cupsys/trunk/debian: . local/filters/pdf-filters local/filters/pdf-filters/filter patches
Till Kamppeter
till-guest at alioth.debian.org
Sun Aug 10 10:56:04 UTC 2008
Author: till-guest
Date: Sun Aug 10 10:56:04 2008
New Revision: 814
Log:
Make package build with the new integration of the PDF filters
Removed:
cupsys/trunk/debian/patches/pdftopdf-libpoppler3-api.dpatch
Modified:
cupsys/trunk/debian/changelog
cupsys/trunk/debian/cups.install
cupsys/trunk/debian/local/filters/pdf-filters/addtocups
cupsys/trunk/debian/local/filters/pdf-filters/filter/imagetopdf.c
cupsys/trunk/debian/local/filters/pdf-filters/filter/pdftoraster.cxx
cupsys/trunk/debian/local/filters/pdf-filters/removefromcups
cupsys/trunk/debian/patches/00list
cupsys/trunk/debian/rules
Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog (original)
+++ cupsys/trunk/debian/changelog Sun Aug 10 10:56:04 2008
@@ -1,21 +1,15 @@
cups (1.3.8-2) UNRELEASED; urgency=low
[ Till Kamppeter ]
- * debian/local/filters/imagetopdf/, debian/local/filters/pdftopdf/,
- debian/local/filters/pdftoraster/,
- debian/local/pstopdf.convs, debian/rules, debian/control, debian/copyright,
- debian/cups.install, debian/patches/pdftopdf-libpoppler3-api.dpatch:
+
+ * debian/local/filters/pdf-filters/, debian/local/pstopdf.convs,
+ debian/rules, debian/control, debian/copyright, debian/cups.install:
Introduced the first bunch of infrastructure for using PDF as standard
print job format. Added CUPS filters imagetopdf, pstopdf, pdftopdf,
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 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).
+ upstream package of CUPS (CUPS STR #2897, #1595).
* debian/patches/search_mime_files_in_usr_share.dpatch: Replaced by the
changes which were done for this purpose in CUPS 1.4. In addition to
the introduction of /usr/share/cups/mime for installing file detection and
@@ -30,7 +24,7 @@
* Add missing CVE and more verbose descriptions to security fixes to 1.3.6-1
changelog.
- -- Martin Pitt <mpitt at debian.org> Wed, 6 Aug 2008 12:48:59 +0200
+ -- Martin Pitt <mpitt at debian.org> Sat, 9 Aug 2008 23:48:59 +0200
cups (1.3.8-1) unstable; urgency=low
Modified: cupsys/trunk/debian/cups.install
==============================================================================
--- cupsys/trunk/debian/cups.install (original)
+++ cupsys/trunk/debian/cups.install Sun Aug 10 10:56:04 2008
@@ -3,7 +3,8 @@
etc/cups/cupsd.conf.default
etc/cups/snmp.conf
etc/cups/ppd
-etc/cups/mime.*
+etc/cups/*.convs
+etc/cups/*.types
usr/lib/cups/backend/* usr/lib/cups/backend-available
usr/lib/cups/cgi-bin
usr/lib/cups/monitor
Modified: cupsys/trunk/debian/local/filters/pdf-filters/addtocups
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/addtocups (original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/addtocups Sun Aug 10 10:56:04 2008
@@ -1,5 +1,8 @@
#!/bin/bash
+# Silently exit if the changes are already applied
+[ -f $1/filter/imagetopdf.c ] && exit 0
+
# Copy files
cp filter/imagetopdf.c $1/filter/
cp filter/pdftoraster.cxx $1/filter/
@@ -12,6 +15,7 @@
# Copy directories
cp -r pdftopdf $1
+
cd $1
# Edit configure script
Modified: cupsys/trunk/debian/local/filters/pdf-filters/filter/imagetopdf.c
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/filter/imagetopdf.c (original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/filter/imagetopdf.c Sun Aug 10 10:56:04 2008
@@ -37,7 +37,7 @@
#include "config.h"
#include "common.h"
-#include <cups/image.h>
+#include "image.h"
#include <math.h>
#if CUPS_VERSION_MAJOR < 1 \
Modified: cupsys/trunk/debian/local/filters/pdf-filters/filter/pdftoraster.cxx
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/filter/pdftoraster.cxx (original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/filter/pdftoraster.cxx Sun Aug 10 10:56:04 2008
@@ -39,7 +39,7 @@
#include <stdarg.h>
#include "Error.h"
#include "GlobalParams.h"
-#include <cups/raster.h>
+#include "raster.h"
#include <splash/SplashTypes.h>
#include <splash/SplashBitmap.h>
Modified: cupsys/trunk/debian/local/filters/pdf-filters/removefromcups
==============================================================================
--- cupsys/trunk/debian/local/filters/pdf-filters/removefromcups (original)
+++ cupsys/trunk/debian/local/filters/pdf-filters/removefromcups Sun Aug 10 10:56:04 2008
@@ -1,5 +1,8 @@
#!/bin/bash
+# Silently exit if the changes are already removed
+[ ! -f $1/filter/imagetopdf.c ] && exit 0
+
# Remove files
rm -f $1/filter/imagetopdf.c
rm -f $1/filter/pdftoraster.cxx
Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list (original)
+++ cupsys/trunk/debian/patches/00list Sun Aug 10 10:56:04 2008
@@ -9,7 +9,6 @@
# 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
Modified: cupsys/trunk/debian/rules
==============================================================================
--- cupsys/trunk/debian/rules (original)
+++ cupsys/trunk/debian/rules Sun Aug 10 10:56:04 2008
@@ -38,32 +38,22 @@
endif
LDFLAGS := -Wl,--as-needed
+post-patches::
+ # Add source code of extra filters for PDF printing workflow
+ ( cd debian/local/filters/pdf-filters/; sh ./addtocups ../../../.. )
+ touch pdftopdf/Dependencies
+
common-post-build-arch::
# Fix permissions of filters/backends installed from debian/local/
chmod 755 debian/local/filters/*
chmod 755 debian/local/backends/*
- # Build extra filters for PDF printing workflow
- # 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*)
- # Link CUPS headers so that filter build process finds them
- [ -r $(CURDIR)/cups/raster.h ] || \
- ln -s $(CURDIR)/filter/raster.h $(CURDIR)/cups/
- [ -r $(CURDIR)/cups/image.h ] || \
- ln -s $(CURDIR)/filter/image.h $(CURDIR)/cups/
- (cd debian/local/filters/imagetopdf; export CFLAGS="$$CFLAGS -I$(CURDIR)"; export CXXFLAGS="$$CFLAGS -I$(CURDIR)"; export LDFLAGS="$$LDFLAGS -L$(CURDIR)/cups/ -L$(CURDIR)/filter/"; touch NEWS AUTHORS ChangeLog; autoreconf --install; ./configure --prefix=/usr --sysconfdir=/etc; $(MAKE) imagetopdf_CFLAGS="")
- (cd debian/local/filters/pdftopdf; export CFLAGS="$$CFLAGS -I$(CURDIR)"; export CXXFLAGS="$$CFLAGS -I$(CURDIR)"; export LDFLAGS="$$LDFLAGS -L$(CURDIR)/cups/ -L$(CURDIR)/filter/"; touch NEWS AUTHORS ChangeLog; autoreconf --install; ./configure --prefix=/usr --sysconfdir=/etc; $(MAKE))
- (cd debian/local/filters/pdftoraster; export CFLAGS="$$CFLAGS -I$(CURDIR)"; export CXXFLAGS="$$CFLAGS -I$(CURDIR)"; export LDFLAGS="$$LDFLAGS -L$(CURDIR)/cups/ -L$(CURDIR)/filter/"; touch NEWS AUTHORS ChangeLog; autoreconf --install; ./configure --prefix=/usr --sysconfdir=/etc; $(MAKE))
-clean::
+cleanbuilddir::
rm -f man/client.conf.man packaging/cups.list
rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
- # Clean source trees of extra filters for PDF printing workflow
- -(cd debian/local/filters/imagetopdf;$(MAKE) distclean)
- -(cd debian/local/filters/pdftopdf;$(MAKE) distclean)
- -(cd debian/local/filters/pdftoraster;$(MAKE) distclean)
- # Remove all auxiliary files created by this rules file
- rm -f cups/raster.h cups/image.h
+ -make distclean
+ # Remove source code of extra filters for PDF printing workflow
+ ( cd debian/local/filters/pdf-filters/; sh ./removefromcups ../../../.. )
common-install-prehook-impl::
(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
@@ -91,13 +81,8 @@
install -D -m 644 debian/local/apparmor-profile debian/$(cdbs_curpkg)/etc/apparmor.d/usr.sbin.cupsd; \
fi
- # Install extra filters for PDF printing workflow
- (cd debian/local/filters/imagetopdf;make install DESTDIR=$(DEB_DESTDIR)/../cups)
- (cd debian/local/filters/pdftopdf;make install DESTDIR=$(DEB_DESTDIR)/../cups)
- (cd debian/local/filters/pdftoraster;make install DESTDIR=$(DEB_DESTDIR)/../cups)
- mv $(DEB_DESTDIR)/../cups/usr/share/doc/imagetopdf $(DEB_DESTDIR)/../cups/usr/share/doc/cups
- mv $(DEB_DESTDIR)/../cups/usr/share/doc/pdftopdf $(DEB_DESTDIR)/../cups/usr/share/doc/cups
- mv $(DEB_DESTDIR)/../cups/usr/share/doc/pdftoraster $(DEB_DESTDIR)/../cups/usr/share/doc/cups
+ # Install documentation of the PDF CUPS filters
+ install -m 644 debian/local/filters/pdf-filters/README $(DEB_DESTDIR)/../cups/usr/share/doc/cups/README.pdf-filters
# 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
More information about the Pkg-cups-devel
mailing list