diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-21 22:25:01 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-21 22:25:01 +0000 |
| commit | 8edd6480a3b5c4e37a1855f0a7087e86891b1ae9 (patch) | |
| tree | 7df47c628fc35bce52782d35299b3c6d0fe388bc /net-print/cups | |
| parent | Stable for x86, wrt bug #416399 (diff) | |
| download | gentoo-2-8edd6480a3b5c4e37a1855f0a7087e86891b1ae9.tar.gz gentoo-2-8edd6480a3b5c4e37a1855f0a7087e86891b1ae9.tar.bz2 gentoo-2-8edd6480a3b5c4e37a1855f0a7087e86891b1ae9.zip | |
Move the default server configuration example into the documentation directory
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/cups/cups-1.5.2-r21.ebuild | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index a54ee275fb7e..d32493172575 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/cups # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.480 2012/05/21 22:18:33 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.481 2012/05/21 22:25:01 dilfridge Exp $ + + 21 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r21.ebuild, + cups-9999.ebuild: + Move the default server configuration example into the documentation + directory 21 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r4.ebuild, cups-1.5.2-r21.ebuild, cups-9999.ebuild: diff --git a/net-print/cups/cups-1.5.2-r21.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild index 6dad3ae74302..f54753b789cb 100644 --- a/net-print/cups/cups-1.5.2-r21.ebuild +++ b/net-print/cups/cups-1.5.2-r21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.3 2012/05/21 22:18:33 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.4 2012/05/21 22:25:01 dilfridge Exp $ EAPI=4 @@ -239,6 +239,10 @@ src_install() { popd > /dev/null fi + # move the default config file to docs + dodoc "${ED}"/etc/cups/cupsd.conf.default + rm -f "${ED}"/etc/cups/cupsd.conf.default + # clean out cups init scripts rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 92a1ad2d6cb6..d8cb97306775 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.5 2012/05/21 22:18:33 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.6 2012/05/21 22:25:01 dilfridge Exp $ EAPI=4 @@ -202,6 +202,10 @@ src_install() { emake BUILDROOT="${D}" install dodoc {CHANGES,CREDITS,README}.txt + # move the default config file to docs + dodoc "${ED}"/etc/cups/cupsd.conf.default + rm -f "${ED}"/etc/cups/cupsd.conf.default + # clean out cups init scripts rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |