openkylin
/
cups
mirror of https://gitee.com/openkylin/cups.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not write VCS tags into installed conffiles 

Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch

Gbp-Pq: Name 0021-Do-not-write-VCS-tags-into-installed-conffiles.patch
This commit is contained in:
Kenshi Muto 2016-08-09 18:11:33 +02:00 committed by openKylinBot
parent 77312d07fc
commit cd5af0c535
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/Makefile
View File

@ -69,8 +69,12 @@ install-data:
$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
else \ else \
$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
grep -v "\$$Id[:\$$]" $(SERVERROOT)/$$file > $(SERVERROOT)/$$file.n ; \
mv $(SERVERROOT)/$$file.n $(SERVERROOT)/$$file ; \
fi ; \ fi ; \
$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(DATADIR)/$$file.default; \ $(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 ; \
done done
$(INSTALL_DIR) -m 755 $(DATADIR)/mime $(INSTALL_DIR) -m 755 $(DATADIR)/mime
for file in $(REPLACE); do \ for file in $(REPLACE); do \