diff options
| author | Didier Raboud <odyx@debian.org> | 2019-05-17 12:49:55 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-05-17 12:49:55 +0200 |
| commit | 14b98b1c3fbfaa96d331e06190bf600c66fef09a (patch) | |
| tree | dbca954cfab3d890c8bc75db36a527bcd2360d28 /conf | |
| parent | 00fcdacdf9d656f5308bc5ea69291e12eb7a4a79 (diff) | |
git-debrebase convert-from-dgit-view: drop upstream changes from breakwater
Drop upstream changes, and delete debian/patches, as part of converting
to git-debrebase format. Upstream changes will appear as commits.
[git-debrebase convert-from-dgit-view drop-patches]
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile | 9 | ||||
| -rw-r--r-- | conf/cups-files.conf.in | 2 | ||||
| -rw-r--r-- | conf/cupsd.conf.in | 4 | ||||
| -rw-r--r-- | conf/mime.convs.in | 3 | ||||
| -rw-r--r-- | conf/mime.types | 3 |
5 files changed, 3 insertions, 18 deletions
diff --git a/conf/Makefile b/conf/Makefile index db0060d75..e249e6069 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -69,12 +69,8 @@ install-data: $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ else \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ - grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \ - mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \ fi ; \ - $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \ - grep -v "\$$Id[:\$$]" $(DATADIR)/$$file.default > $(DATADIR)/$$file.default.n ; \ - mv $(DATADIR)/$$file.default.n $(DATADIR)/$$file.default ; \ + $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/mime for file in $(REPLACE); do \ @@ -122,10 +118,9 @@ install-libs: # uninstall: - for file in $(KEEP) $(REPLACE); do \ + for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \ $(RM) $(SERVERROOT)/$$file; \ done - $(RM) $(DATADIR)/cupsd.conf.default -$(RMDIR) $(SERVERROOT) for file in $(REPLACE); do \ $(RM) $(DATADIR)/mime/$$file; \ diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in index a3d088da5..4a78ba615 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in @@ -7,7 +7,7 @@ #FatalErrors @CUPS_FATAL_ERRORS@ # Do we call fsync() after writing configuration or status files? -#SyncOnClose Yes +#SyncOnClose No # Default user and group for filters/backends/helper programs; this cannot be # any user or group that resolves to ID 0 for security reasons... diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 78189e535..ab37ca68c 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -8,10 +8,6 @@ LogLevel @CUPS_LOG_LEVEL@ @CUPS_PAGE_LOG_FORMAT@ -# Deactivate CUPS' internal logrotating, as we provide a better one, especially -# LogLevel debug2 gets usable now -MaxLogSize 0 - # Only listen for connections from the local machine. Listen localhost:@DEFAULT_IPP_PORT@ @CUPS_LISTEN_DOMAINSOCKET@ diff --git a/conf/mime.convs.in b/conf/mime.convs.in index e042e0129..57b459d73 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -44,9 +44,6 @@ application/postscript application/vnd.cups-postscript 66 pstops application/vnd.cups-raster image/pwg-raster 100 rastertopwg application/vnd.cups-raster image/urf 100 rastertopwg -# Needed for printing from iOS (AirPrint) clients -image/urf application/pdf 100 - - ######################################################################## # # Raw filter... diff --git a/conf/mime.types b/conf/mime.types index ebb05257e..fcd6b6eff 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -108,9 +108,6 @@ image/x-alias pix short(8,8) short(8,24) image/x-bitmap bmp string(0,BM) + !printable(2,14) image/x-icon ico -# Needed for printing from iOS (AirPrint) clients -image/urf urf string(0,UNIRAST<00>) - ######################################################################## # # Text files... |