diff options
author | Till Kamppeter <till.kamppeter@gmail.com> | 2009-08-24 18:16:01 +0200 |
---|---|---|
committer | Till Kamppeter <till.kamppeter@gmail.com> | 2009-08-24 18:16:01 +0200 |
commit | 12a87cd224a1be97cd7ccbc0c2cd51259604225b (patch) | |
tree | bcc0a4547b1e2e04816a3b7ce256b015af802a48 | |
parent | 424157dc20b9f6c9b34763d7e2d3537bf60837a8 (diff) |
* debian/control: Added new packages for the new shared libraries and also
cups-ppdc for the PPD manipulation utilities of the former CUPS DDk. Added
transitional package for CUPS DDK. Added Conflicts:/Replaces: as cupsddk
is replaced by cups-ppdc and the files of cupsddk-drivers go into the
main cups package.
* debian/rules: Updated individual file installation and adaptation steps
for the new CUPS version.
* debian/libcups2-dev.install: Added new header file versioning.h.
* debian/libcupscgi1-dev.install, debian/libcupscgi1.install,
debian/libcupsdriver1-dev.install, debian/libcupsdriver1.install,
debian/libcupsmime1-dev.install, debian/libcupsmime1.install,
debian/libcupsppdc1-dev.install, debian/libcupsppdc1.install: Added install
file lists for newly added libraries.
* debian/cups-ppdc.install: File list for new cups-ppdc package. This package
holds the PPD file manipulation tools which were in CUPS DDK formerly.
* debian/cups-common.install, debian/cups.install: Updated for new CUPS
version.
* debian/cups.install, debian/cups-client.install, debian/cups-ppdc.install:
Commented out lines for missing translated man pages.
* debian/cups.postinst: Do not create the /usr/share/ppd/1-local-admin
and /usr/share/ppd/2-third-party links. They are not needed with current
CUPS and they also break the test procedure during package build.
* debian/libcups2.postinst, debian/libcupsimage2.postinst: Removed no-op
maintainer scripts.
-rw-r--r-- | debian/changelog | 32 | ||||
-rw-r--r-- | debian/control | 193 | ||||
-rw-r--r-- | debian/cups-common.install | 3 | ||||
-rw-r--r-- | debian/cups-ppdc.install | 7 | ||||
-rw-r--r-- | debian/cups.install | 2 | ||||
-rw-r--r-- | debian/libcups2-dev.install | 3 | ||||
-rw-r--r-- | debian/libcups2.postinst | 45 | ||||
-rw-r--r-- | debian/libcupscgi1-dev.install | 4 | ||||
-rw-r--r-- | debian/libcupscgi1.install | 1 | ||||
-rw-r--r-- | debian/libcupsdriver1-dev.install | 3 | ||||
-rw-r--r-- | debian/libcupsdriver1.install | 1 | ||||
-rw-r--r-- | debian/libcupsimage2.postinst | 46 | ||||
-rw-r--r-- | debian/libcupsmime1-dev.install | 3 | ||||
-rw-r--r-- | debian/libcupsmime1.install | 1 | ||||
-rw-r--r-- | debian/libcupsppdc1-dev.install | 3 | ||||
-rw-r--r-- | debian/libcupsppdc1.install | 1 |
16 files changed, 240 insertions, 108 deletions
diff --git a/debian/changelog b/debian/changelog index 9bd5a179c..68e2416e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -207,9 +207,33 @@ cups (1.4.0~svn8773-1) UNRELEASED; urgency=low printer backend uses libusb and not any more the usblp kernel module. * debian/control: Added libavahi-common-dev and libavahi-client-dev to the build dependencies, for the avahi patch for the DNS-SD support. + * debian/control: Added new packages for the new shared libraries and also + cups-ppdc for the PPD manipulation utilities of the former CUPS DDk. Added + transitional package for CUPS DDK. Added Conflicts:/Replaces: as cupsddk + is replaced by cups-ppdc and the files of cupsddk-drivers go into the + main cups package. * debian/rules: Added "--enable-libusb" to the ./configure command line. * debian/rules: Added "--enable-avahi" to the ./configure command line. * debian/rules: Call autoconf, as we have an SVN snapshot currently. + * debian/rules: Updated individual file installation and adaptation steps + for the new CUPS version. + * debian/libcups2-dev.install: Added new header file versioning.h. + * debian/libcupscgi1-dev.install, debian/libcupscgi1.install, + debian/libcupsdriver1-dev.install, debian/libcupsdriver1.install, + debian/libcupsmime1-dev.install, debian/libcupsmime1.install, + debian/libcupsppdc1-dev.install, debian/libcupsppdc1.install: Added install + file lists for newly added libraries. + * debian/cups-ppdc.install: File list for new cups-ppdc package. This package + holds the PPD file manipulation tools which were in CUPS DDK formerly. + * debian/cups-common.install, debian/cups.install: Updated for new CUPS + version. + * debian/cups.install, debian/cups-client.install, debian/cups-ppdc.install: + Commented out lines for missing translated man pages. + * debian/cups.postinst: Do not create the /usr/share/ppd/1-local-admin + and /usr/share/ppd/2-third-party links. They are not needed with current + CUPS and they also break the test procedure during package build. + * debian/libcups2.postinst, debian/libcupsimage2.postinst: Removed no-op + maintainer scripts. * debian/local/filters/pdf-filters/addtocups, debian/local/filters/pdf-filters/config-scripts/cups-pdf-filters.m4, debian/local/filters/pdf-filters/filter/texttopdf.c: Let ./configure @@ -220,14 +244,6 @@ cups (1.4.0~svn8773-1) UNRELEASED; urgency=low "unittests", "install-data", "install-headers", "install-libs", "install-exec", "libs", "apihelp", and "framedhelp" targets to the Makefiles of the PDF filters. - * debian/cups.postinst: Do not create the /usr/share/ppd/1-local-admin - and /usr/share/ppd/2-third-party links. They are not needed with current - CUPS and they also break the test procedure during package build. - * debian/cups.install, debian/cups-client.install: Commented out lines - for missing translated man pages. - * debian/cups.install: Updated for new CUPS version. - * debian/rules: Updated individual file installation and adaptation steps - for the new CUPS version. -- Till Kamppeter <till.kamppeter@gmail.com> Sun, 23 Aug 2009 13:30:33 +0200 diff --git a/debian/control b/debian/control index a43c7b794..bdf5ec57f 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Suggests: cups-common Conflicts: libcupsys2 (<< 1.3.7-6) Replaces: libcupsys2 (<< 1.3.7-6) Provides: libcupsys2 -Description: Common UNIX Printing System(tm) - libs +Description: Common UNIX Printing System(tm) - Core library The Common UNIX Printing System (or CUPS(tm)) is a printing system and general replacement for lpd and the like. It supports the Internet Printing Protocol (IPP), and has its own filtering driver model for @@ -45,7 +45,7 @@ Priority: optional Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Common UNIX Printing System(tm) - image libs +Description: Common UNIX Printing System(tm) - Raster image library The Common UNIX Printing System (or CUPS(tm)) is a printing system and general replacement for lpd and the like. It supports the Internet Printing Protocol (IPP), and has its own filtering driver model for @@ -58,6 +58,78 @@ Description: Common UNIX Printing System(tm) - image libs Easy Software Products (www.easysw.com), and refer to the original source packages from which these packages are made. +Package: libcupscgi1 +Priority: optional +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Common UNIX Printing System(tm) - CGI library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides a shared library for CGI programs in the + CUPS web interface + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + +Package: libcupsdriver1 +Priority: optional +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Common UNIX Printing System(tm) - Driver library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides a shared library with useful functions for printer + drivers. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + +Package: libcupsmime1 +Priority: optional +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Common UNIX Printing System(tm) - MIME library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides a shared library for file type detection and + file conversion filter chain building. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + +Package: libcupsppdc1 +Priority: optional +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Common UNIX Printing System(tm) - PPD manipulation library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides the base shared library for generating and + manipulating PPD files. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + Package: cups Priority: optional Section: net @@ -67,13 +139,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, ghostscript, lsb-base (>= 3), cups-common, cups-client, ssl-cert (>= 1.0.11), adduser, bc, ttf-freefont Recommends: foomatic-filters (>= 4.0), - cups-driver-gutenprint, ghostscript-cups + cups-driver-gutenprint, ghostscript-cups, cups-ppdc Suggests: cups-bsd, foomatic-db-engine, foomatic-db, hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf, smbclient (>= 3.0.9) -Replaces: cupsys-bsd (<< 1.3.7-5), cupsys (<< 1.3.7-6) -Conflicts: cupsys-bsd (<< 1.3.7-5), cupsys (<< 1.3.7-6) -Provides: cupsys +Replaces: cupsddk-drivers (<< 1.4.0), cupsys-bsd (<< 1.3.7-5), cupsys (<< 1.3.7-6) +Conflicts: cupsddk-drivers (<< 1.4.0), cupsys-bsd (<< 1.3.7-5), cupsys (<< 1.3.7-6) +Provides: cupsddk-drivers, cupsys Breaks: foomatic-filters (<< 4.0) Description: Common UNIX Printing System(tm) - server The Common UNIX Printing System (or CUPS(tm)) is a printing system and @@ -117,7 +189,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libcups2 (= ${binary:Version}), Conflicts: libcupsys2-dev (<< 1.3.7-6) Replaces: libcupsys2-dev (<< 1.3.7-6) Provides: libcupsys2-dev -Description: Common UNIX Printing System(tm) - development files +Description: Common UNIX Printing System(tm) - Development files CUPS library The Common UNIX Printing System (or CUPS(tm)) is a printing system and general replacement for lpd and the like. It supports the Internet Printing Protocol (IPP), and has its own filtering driver model for @@ -139,7 +211,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libcupsimage2 (= ${binary:Version}), libcups2-dev (= ${binary:Version}), libpng-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev -Description: Common UNIX Printing System(tm) - image development files +Description: Common UNIX Printing System(tm) - Development files CUPS image library The Common UNIX Printing System (or CUPS(tm)) is a printing system and general replacement for lpd and the like. It supports the Internet Printing Protocol (IPP), and has its own filtering driver model for @@ -152,6 +224,82 @@ Description: Common UNIX Printing System(tm) - image development files Easy Software Products (www.easysw.com), and refer to the original source packages from which these packages are made. +Package: libcupscgi1-dev +Priority: optional +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libcupscgi1 (= ${binary:Version}), + libcups2-dev (= ${binary:Version}) +Description: Common UNIX Printing System(tm) - Development files for CGI library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides the files necessary for developing CGI programs + for the CUPS web interface using libcupscgi. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + +Package: libcupsdriver1-dev +Priority: optional +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libcupsdriver1 (= ${binary:Version}), + libcups2-dev (= ${binary:Version}), libcupsimage2-dev (= ${binary:Version}) +Description: Common UNIX Printing System(tm) - Development files driver library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides the files necessary for developing printer drivers + using libcupsdriver. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + +Package: libcupsmime1-dev +Priority: optional +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libcupsmime1 (= ${binary:Version}), + libcups2-dev (= ${binary:Version}) +Description: Common UNIX Printing System(tm) - Development files MIME library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides the files necessary for developing programs + using libcupsmime. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + +Package: libcupsppdc1-dev +Priority: optional +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libcupsppdc1 (= ${binary:Version}), + libcups2-dev (= ${binary:Version}) +Description: Common UNIX Printing System(tm) - Development files PPD library + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides the files necessary for developing programs + using libcupsppdc. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + Package: cups-bsd Priority: extra Section: net @@ -197,6 +345,26 @@ Description: Common UNIX Printing System(tm) - common files Easy Software Products (www.easysw.com), and refer to the original source packages from which these packages are made. +Package: cups-ppdc +Priority: optional +Section: net +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, cups-common +Conflicts: cupsddk (<< 1.4.0) +Replaces: cupsddk (<< 1.4.0) +Provides: cupsddk +Description: Common UNIX Printing System(tm) - PPD manipulation utilities + The Common UNIX Printing System (or CUPS(tm)) is a printing system and + general replacement for lpd and the like. It supports the Internet + Printing Protocol (IPP), and has its own filtering driver model for + handling various document types. + . + This package provides utilities to generate and manipulate PPD files. + . + The terms "Common UNIX Printing System" and "CUPS" are trademarks of + Easy Software Products (www.easysw.com), and refer to the original + source packages from which these packages are made. + Package: cups-dbg Priority: extra Section: debug @@ -271,3 +439,12 @@ Architecture: all Depends: ${misc:Depends}, libcups2-dev Description: Common UNIX Printing System (transitional package) This is a dummy package to ease transition to new package name. + +Package: cupsddk +Priority: extra +Section: oldlibs +Architecture: all +Depends: ${misc:Depends}, cups-ppdc +Description: Common UNIX Printing System (transitional package) + This is a dummy package to ease transition to new package name. + diff --git a/debian/cups-common.install b/debian/cups-common.install index 089f0fb92..2d54731fb 100644 --- a/debian/cups-common.install +++ b/debian/cups-common.install @@ -1,3 +1,6 @@ usr/share/cups/charsets usr/share/cups/charmaps +usr/share/cups/drv usr/share/cups/locale +usr/share/cups/profiles +usr/share/cups/ppdc/*.defs diff --git a/debian/cups-ppdc.install b/debian/cups-ppdc.install new file mode 100644 index 000000000..fd376b76e --- /dev/null +++ b/debian/cups-ppdc.install @@ -0,0 +1,7 @@ +usr/bin/ppd* +usr/share/cups/ppdc/*.h +usr/share/cups/examples/ +usr/share/man/man?/ppd*.?.gz +#usr/share/man/*/man?/ppd*.?.gz +usr/share/man/man7/drv.7.gz +#usr/share/man/*/man7/drv.7.gz diff --git a/debian/cups.install b/debian/cups.install index 2c6bc2d42..33dc9cf64 100644 --- a/debian/cups.install +++ b/debian/cups.install @@ -10,12 +10,14 @@ usr/lib/cups/monitor usr/lib/cups/daemon/ usr/lib/cups/filter/ usr/lib/cups/notifier +usr/lib/cups/driver/ usr/sbin/cupsd usr/sbin/cupsfilter usr/share/cups/banners usr/share/cups/data usr/share/cups/doc-root usr/share/cups/fonts +usr/share/cups/mime usr/share/cups/model usr/share/cups/templates usr/share/man/man7/backend.7.gz diff --git a/debian/libcups2-dev.install b/debian/libcups2-dev.install index 7d727556c..a33ddce74 100644 --- a/debian/libcups2-dev.install +++ b/debian/libcups2-dev.install @@ -1,6 +1,7 @@ usr/bin/cups-config usr/lib/libcups.so usr/lib/libcups.a +usr/include/cups/adminutil.h usr/include/cups/array.h usr/include/cups/backend.h usr/include/cups/cups.h @@ -12,7 +13,7 @@ usr/include/cups/language.h usr/include/cups/ppd.h usr/include/cups/sidechannel.h usr/include/cups/transcode.h -usr/include/cups/adminutil.h +usr/include/cups/versioning.h ../../cups/i18n.h usr/include/cups usr/share/man/man1/cups-config.1.gz usr/share/man/*/man1/cups-config.1.gz diff --git a/debian/libcups2.postinst b/debian/libcups2.postinst deleted file mode 100644 index a2ab10b34..000000000 --- a/debian/libcups2.postinst +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -# postinst script for cups -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see /usr/doc/packaging-manual/ -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/libcupscgi1-dev.install b/debian/libcupscgi1-dev.install new file mode 100644 index 000000000..1562a9c2d --- /dev/null +++ b/debian/libcupscgi1-dev.install @@ -0,0 +1,4 @@ +usr/lib/libcupscgi.so +usr/lib/libcupscgi.a +usr/include/cups/cgi.h +usr/include/cups/help-index.h diff --git a/debian/libcupscgi1.install b/debian/libcupscgi1.install new file mode 100644 index 000000000..c01072587 --- /dev/null +++ b/debian/libcupscgi1.install @@ -0,0 +1 @@ +usr/lib/libcupscgi.so.* diff --git a/debian/libcupsdriver1-dev.install b/debian/libcupsdriver1-dev.install new file mode 100644 index 000000000..1ae5bbd01 --- /dev/null +++ b/debian/libcupsdriver1-dev.install @@ -0,0 +1,3 @@ +usr/lib/libcupsdriver.so +usr/lib/libcupsdriver.a +usr/include/cups/driver.h diff --git a/debian/libcupsdriver1.install b/debian/libcupsdriver1.install new file mode 100644 index 000000000..0b2792b96 --- /dev/null +++ b/debian/libcupsdriver1.install @@ -0,0 +1 @@ +usr/lib/libcupsdriver.so.* diff --git a/debian/libcupsimage2.postinst b/debian/libcupsimage2.postinst deleted file mode 100644 index 331aec346..000000000 --- a/debian/libcupsimage2.postinst +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -# postinst script for cups -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see /usr/doc/packaging-manual/ -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - ldconfig - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/libcupsmime1-dev.install b/debian/libcupsmime1-dev.install new file mode 100644 index 000000000..b94c318f7 --- /dev/null +++ b/debian/libcupsmime1-dev.install @@ -0,0 +1,3 @@ +usr/lib/libcupsmime.so +usr/lib/libcupsmime.a +usr/include/cups/mime.h diff --git a/debian/libcupsmime1.install b/debian/libcupsmime1.install new file mode 100644 index 000000000..a55b45a8f --- /dev/null +++ b/debian/libcupsmime1.install @@ -0,0 +1 @@ +usr/lib/libcupsmime.so.* diff --git a/debian/libcupsppdc1-dev.install b/debian/libcupsppdc1-dev.install new file mode 100644 index 000000000..01228690a --- /dev/null +++ b/debian/libcupsppdc1-dev.install @@ -0,0 +1,3 @@ +usr/lib/libcupsppdc.so +usr/lib/libcupsppdc.a +usr/include/cups/ppdc.h diff --git a/debian/libcupsppdc1.install b/debian/libcupsppdc1.install new file mode 100644 index 000000000..f48c51373 --- /dev/null +++ b/debian/libcupsppdc1.install @@ -0,0 +1 @@ +usr/lib/libcupsppdc.so.* |