[Pkg-cups-devel] r693 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/local debian/patches
Martin Pitt
mpitt at alioth.debian.org
Tue Feb 26 13:48:30 UTC 2008
Author: mpitt
Date: Tue Feb 26 13:48:30 2008
New Revision: 693
Log:
merge to trunk
Added:
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.lintian
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.lintian
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/local/browsing_status
cupsys/branches/cups-1.2-ubuntu/debian/local/enable_browsing
cupsys/branches/cups-1.2-ubuntu/debian/local/enable_sharing
cupsys/branches/cups-1.2-ubuntu/debian/local/sharing_status
cupsys/branches/cups-1.2-ubuntu/debian/patches/cupsd.conf-AllowLocal.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/fix_regression_reactivate_net_ifaces_changes_detection.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/web-interface-breaks-default-auth-setting.dpatch
Modified:
cupsys/branches/cups-1.2-ubuntu/ (props changed)
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.doc-base
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
cupsys/branches/cups-1.2-ubuntu/debian/docs
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/rules
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Tue Feb 26 13:48:30 2008
@@ -1,3 +1,41 @@
+cupsys (1.3.6-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge with Debian unstable to bring in the new upstream bugfix-only
+ release and some packaging fixes. See 1.3.5-1ubuntu1 for list of remaining
+ changes.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 26 Feb 2008 14:36:47 +0100
+
+cupsys (1.3.6-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Remove the following patches which are upstream now:
+ - fix_regression_reactivate_net_ifaces_changes_detection.dpatch
+ - web-interface-breaks-default-auth-setting.dpatch
+ * search_mime_files_in_usr_share.dpatch: Greatly simplified the patch by
+ using mimeMerge(), so that it is more robust against upstream changes.
+ Forwarded to STR#2719.
+ * Dropped cupsd.conf-AllowLocal.dpatch; it does not do anything good any
+ more for the current web and GUI administration tools (they handle this
+ fine by themselves), so it's obsolete now.
+ * Drop enable{sharing,browsing} and {sharing,browsing}_status scripts. They
+ have never been used in Debian, not used any more in Ubuntu, and the
+ current frontends (web, system-config-printer, etc.) do this in a much
+ better way.
+ * debian/docs: Remove redundant LICENSE.txt.
+ * debian/rules: Add a generic rule to install lintian overrides in
+ debian/packagename.lintian.
+ * Add lintian overrides for unjustified/wontfix complaints about libcupsys2
+ and cupsys.
+ * debian/cupsys.doc-base: Remove erroneous whitespace in the section
+ separator.
+ * debian/rules: Remove *.o and *.so files from PHP scripting examples
+ directory (it's /usr/share after all).
+ * debian/cupsys.init.d: Add Short-Description.
+ * debian/rules: Do not ship an empty /usr/share/cups/model/ directory.
+
+ -- Martin Pitt <mpitt at debian.org> Tue, 26 Feb 2008 14:23:50 +0100
+
cupsys (1.3.5-2ubuntu1) hardy; urgency=low
* debian/local/apparmor-profile: Added Kerberos authentication support
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.doc-base
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.doc-base (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.doc-base Tue Feb 26 13:48:30 2008
@@ -4,7 +4,7 @@
Abstract: This documentation covers the use and administration of a CUPS
printing system, and the programming interface for the libcups API.
Section: Apps/System
-
+
Format: HTML
Index: /usr/share/doc/cupsys/online-docs/index.html
Files: /usr/share/doc/cupsys/online-docs/*.html
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d Tue Feb 26 13:48:30 2008
@@ -9,6 +9,7 @@
# X-Stop-After: samba
# Default-Start: 2 3 4 5
# Default-Stop: 1
+# Short-Description: CUPS Printing spooler and server
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
Added: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.lintian
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.lintian Tue Feb 26 13:48:30 2008
@@ -0,0 +1,4 @@
+cupsys: executable-is-not-world-readable usr/lib/cups/backend-available/ipp 0700 != 0755
+cupsys: executable-is-not-world-readable usr/lib/cups/backend-available/lpd 0700 != 0755
+cupsys: package-contains-empty-directory usr/share/ppd/custom/
+cupsys: package-contains-empty-directory usr/lib/cups/backend/
Modified: cupsys/branches/cups-1.2-ubuntu/debian/docs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/docs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/docs Tue Feb 26 13:48:30 2008
@@ -1,3 +1,2 @@
CREDITS.txt
-LICENSE.txt
README.txt
Added: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.lintian
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.lintian Tue Feb 26 13:48:30 2008
@@ -0,0 +1 @@
+libcupsys2: package-name-doesnt-match-sonames libcups2
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Tue Feb 26 13:48:30 2008
@@ -7,14 +7,11 @@
cupsaccept.dpatch
confdirperms.dpatch
pidfile.dpatch
-cupsd.conf-AllowLocal.dpatch
device_uri.dpatch
classes_crash.dpatch
reactivate_recommended_driver.dpatch
include_krb5_h_in_job_h.dpatch
search_mime_files_in_usr_share.dpatch
-fix_regression_reactivate_net_ifaces_changes_detection.dpatch
+pdftops-cups-1.4.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-default-error-policy-retry-job.dpatch
-pdftops-cups-1.4.dpatch
-web-interface-breaks-default-auth-setting.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch Tue Feb 26 13:48:30 2008
@@ -1,188 +1,42 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 98_search_mime_files_in_usr_share.dpatch by <till.kamppeter at gmail.com>
+## search_mime_files_in_usr_share.dpatch by <martin.pitt at ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Forwarded upstream: http://www.cups.org/str.php?L2373
+## DP: http://www.cups.org/str.php?L2719
@DPATCH@
-diff -urNad cupsys-1.2.8~/scheduler/conf.c cupsys-1.2.8/scheduler/conf.c
---- cupsys-1.2.8~/scheduler/conf.c 2007-03-14 12:22:15.000000000 +0000
-+++ cupsys-1.2.8/scheduler/conf.c 2007-03-14 12:22:16.000000000 +0000
-@@ -216,6 +216,7 @@
+diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c
+--- trunk~/scheduler/conf.c 2008-02-16 00:26:51.000000000 +0100
++++ trunk/scheduler/conf.c 2008-02-26 13:01:21.000000000 +0100
+@@ -341,6 +341,7 @@
cups_file_t *fp; /* Configuration file */
int status; /* Return status */
char temp[1024], /* Temporary buffer */
-+ temp2[1024], /* Another temporary buffer */
++ temp2[1024], /* Temporary buffer */
*slash; /* Directory separator */
cups_lang_t *language; /* Language */
struct passwd *user; /* Default user */
-@@ -973,19 +974,20 @@
+@@ -1092,11 +1093,22 @@
+
+ /*
+ * Read the MIME type and conversion database...
++ * Files are read from DataDir/mime by default, and can be overridden in
++ * ServerRoot.
*/
snprintf(temp, sizeof(temp), "%s/filter", ServerBin);
-+ snprintf(temp2, sizeof(temp2), "%s/mime:%s", DataDir, ServerRoot);
- MimeDatabase = mimeLoad(ServerRoot, temp);
++ snprintf(temp2, sizeof(temp2), "%s/mime", DataDir);
+ MimeDatabase = mimeLoad(temp2, temp);
-
- if (!MimeDatabase)
- {
- cupsdLogMessage(CUPSD_LOG_EMERG,
-- "Unable to load MIME database from \'%s\'!", ServerRoot);
++ if (!MimeDatabase)
++ {
++ cupsdLogMessage(CUPSD_LOG_EMERG,
+ "Unable to load MIME database from \'%s\'!", temp2);
- exit(errno);
- }
-
- cupsdLogMessage(CUPSD_LOG_INFO,
- "Loaded MIME database from \'%s\': %d types, %d filters...",
-- ServerRoot, mimeNumTypes(MimeDatabase),
-+ temp2, mimeNumTypes(MimeDatabase),
- mimeNumFilters(MimeDatabase));
-
- /*
-diff -urNad cupsys-1.2.8~/scheduler/mime.c cupsys-1.2.8/scheduler/mime.c
---- cupsys-1.2.8~/scheduler/mime.c 2006-05-30 20:40:34.000000000 +0100
-+++ cupsys-1.2.8/scheduler/mime.c 2007-03-14 12:23:11.000000000 +0000
-@@ -217,9 +217,12 @@
-
- mime_t * /* O - Updated MIME database */
- mimeMerge(mime_t *mime, /* I - MIME database to add to */
-- const char *pathname, /* I - Directory to load */
-- const char *filterpath) /* I - Directory to load */
-+ const char *pathname, /* I - Directory/ies to load */
-+ const char *filterpath) /* I - Filter directory */
- {
-+ char *paths, /* Pointers for parsing mime */
-+ *dirname, /* directories */
-+ *colon;
- cups_dir_t *dir; /* Directory */
- cups_dentry_t *dent; /* Directory entry */
- char filename[1024]; /* Full filename of types/converts file */
-@@ -234,62 +237,88 @@
- if (!pathname)
- return (NULL);
-
-- if ((dir = cupsDirOpen(pathname)) == NULL)
-- return (NULL);
-+ paths = strdup(pathname); /* copy path as we are writing into it */
-+ dirname = paths;
-+ colon = paths;
-+ while (colon != NULL) { /* Go through each of the colon-separated
-+ directories */
-+ colon = strchr(dirname, ':');
-+ if (colon != NULL) *colon = '\0';
-
-- /*
-- * If "mime" is NULL, make a new, blank database...
-- */
-+ if ((dir = cupsDirOpen(dirname)) != NULL) {
-
-- if (!mime)
-- mime = mimeNew();
-- if (!mime)
-- return (NULL);
-+ /*
-+ * If "mime" is NULL, make a new, blank database...
-+ */
-
-- /*
-- * Read all the .types files...
-- */
-+ if (!mime)
-+ mime = mimeNew();
-+ if (!mime)
-+ return (NULL);
-
-- while ((dent = cupsDirRead(dir)) != NULL)
-- {
-- if (strlen(dent->filename) > 6 &&
-- !strcmp(dent->filename + strlen(dent->filename) - 6, ".types"))
-- {
-- /*
-- * Load a mime.types file...
-- */
-+ /*
-+ * Read all the .types files...
-+ */
-
-- snprintf(filename, sizeof(filename), "%s/%s", pathname, dent->filename);
-- load_types(mime, filename);
-+ while ((dent = cupsDirRead(dir)) != NULL)
-+ {
-+ if (strlen(dent->filename) > 6 &&
-+ !strcmp(dent->filename + strlen(dent->filename) - 6, ".types"))
-+ {
-+ /*
-+ * Load a mime.types file...
-+ */
-+
-+ snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
-+ load_types(mime, filename);
-+ }
-+ }
++ exit(errno);
++ }
+
-+ cupsDirClose(dir);
- }
-+ if (colon != NULL) dirname = colon + 1;
- }
-+ free(paths); /* We need to copy the original path again for reading
-+ the convs */
-
-- cupsDirRewind(dir);
--
-- /*
-- * Read all the .convs files...
-- */
-+ /*
-+ * Read all the .convs files...
-+ */
-
- filtercache = cupsArrayNew((cups_array_func_t)compare_fcache, NULL);
-
-- while ((dent = cupsDirRead(dir)) != NULL)
-- {
-- if (strlen(dent->filename) > 6 &&
-- !strcmp(dent->filename + strlen(dent->filename) - 6, ".convs"))
-- {
-- /*
-- * Load a mime.convs file...
-- */
-+ paths = strdup(pathname); /* copy path as we are writing into it */
-+ dirname = paths;
-+ colon = paths;
-+ while (colon != NULL) { /* Go through each of the colon-separated
-+ directories */
-+ colon = strchr(dirname, ':');
-+ if (colon != NULL) *colon = '\0';
-
-- snprintf(filename, sizeof(filename), "%s/%s", pathname, dent->filename);
-- load_convs(mime, filename, filterpath, filtercache);
-+ if ((dir = cupsDirOpen(dirname)) != NULL) {
-+
-+ while ((dent = cupsDirRead(dir)) != NULL)
-+ {
-+ if (strlen(dent->filename) > 6 &&
-+ !strcmp(dent->filename + strlen(dent->filename) - 6, ".convs"))
-+ {
-+ /*
-+ * Load a mime.convs file...
-+ */
-+
-+ snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
-+ load_convs(mime, filename, filterpath, filtercache);
-+ }
-+ }
-+
-+ cupsDirClose(dir);
- }
-+ if (colon != NULL) dirname = colon + 1;
- }
-+ free(paths);
-
- delete_fcache(filtercache);
-
-- cupsDirClose(dir);
--
- return (mime);
- }
++ MimeDatabase = mimeMerge(MimeDatabase, ServerRoot, temp);
+ if (!MimeDatabase)
+ {
Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules Tue Feb 26 13:48:30 2008
@@ -38,12 +38,16 @@
common-install-prehook-impl::
(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
+
$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
dh_movefiles -p$(cdbs_curpkg)
+ # install lintian overrides
+ L=debian/$(cdbs_curpkg).lintian; \
+ [ -e $$L ] && install -D -m 644 $$L debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) || true
+
binary-post-install/cupsys::
(cd $(DEB_DESTDIR)/../cupsys/usr/share/doc/cupsys && ln -sf ../../cups/doc-root online-docs)
- install -m 755 debian/local/browsing_status debian/local/enable_browsing debian/local/sharing_status debian/local/enable_sharing $(DEB_DESTDIR)/../cupsys/usr/share/cups
# Install PPDs into /usr/share/ppd/cups-included/<Manufacturer>, see
# http://wiki.debian.org/PpdFileStructureSpecification
@@ -52,6 +56,7 @@
mkdir -p "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m"; \
mv $$i "$(DEB_DESTDIR)/../cupsys/usr/share/ppd/cups-included/$$m/"; \
done
+ rmdir $(DEB_DESTDIR)/../cupsys/usr/share/cups/model
dh_usrlocal
@@ -59,6 +64,9 @@
# the system-config-printer applet
install -D -m 644 packaging/cups-dbus.conf $(DEB_DESTDIR)/../cupsys/etc/dbus-1/system.d/cups.conf
+ rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.o
+ rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.so
+
# install AppArmor profile
install -D -m 644 debian/local/apparmor-profile $(DEB_DESTDIR)/../cupsys/etc/apparmor.d/usr.sbin.cupsd
More information about the Pkg-cups-devel
mailing list