1 |
vapier 07/11/09 21:08:30 |
2 |
|
3 |
Modified: cups-1.3.4-r1.ebuild ChangeLog |
4 |
Log: |
5 |
Fix installation of cups init.d script. |
6 |
(Portage version: 2.1.3.19) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 net-print/cups/cups-1.3.4-r1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: cups-1.3.4-r1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- cups-1.3.4-r1.ebuild 8 Nov 2007 23:15:12 -0000 1.1 |
22 |
+++ cups-1.3.4-r1.ebuild 9 Nov 2007 21:08:29 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2007 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v 1.1 2007/11/08 23:15:12 tgurr Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v 1.2 2007/11/09 21:08:29 vapier Exp $ |
28 |
|
29 |
inherit autotools eutils flag-o-matic multilib pam |
30 |
|
31 |
@@ -168,7 +168,7 @@ |
32 |
|
33 |
src_install() { |
34 |
emake BUILDROOT="${D}" install || die "emake install failed" |
35 |
- dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt || die "dodoc install failed" |
36 |
+ dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed" |
37 |
|
38 |
# clean out cups init scripts |
39 |
rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} |
40 |
@@ -178,8 +178,9 @@ |
41 |
use avahi && neededservices="$neededservices avahi-daemon" |
42 |
use dbus && neededservices="$neededservices dbus" |
43 |
use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix" |
44 |
- [[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need$neededservices/" "${FILESDIR}/cupsd.init.d" > "${T}/cupsd" |
45 |
- doinitd "${T}/cupsd" |
46 |
+ [[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
47 |
+ sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd |
48 |
+ doinitd "${T}"/cupsd |
49 |
|
50 |
# install our pam script |
51 |
pamd_mimic_system cups auth account |
52 |
|
53 |
|
54 |
|
55 |
1.267 net-print/cups/ChangeLog |
56 |
|
57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.267&view=markup |
58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.267&content-type=text/plain |
59 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?r1=1.266&r2=1.267 |
60 |
|
61 |
Index: ChangeLog |
62 |
=================================================================== |
63 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
64 |
retrieving revision 1.266 |
65 |
retrieving revision 1.267 |
66 |
diff -u -r1.266 -r1.267 |
67 |
--- ChangeLog 9 Nov 2007 19:53:16 -0000 1.266 |
68 |
+++ ChangeLog 9 Nov 2007 21:08:29 -0000 1.267 |
69 |
@@ -1,6 +1,9 @@ |
70 |
# ChangeLog for net-print/cups |
71 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
72 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.266 2007/11/09 19:53:16 dang Exp $ |
73 |
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
74 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.267 2007/11/09 21:08:29 vapier Exp $ |
75 |
+ |
76 |
+ 09 Nov 2007; Mike Frysinger <vapier@g.o> cups-1.3.4-r1.ebuild: |
77 |
+ Fix installation of cups init.d script. |
78 |
|
79 |
09 Nov 2007; Daniel Gryniewicz <dang@g.o> cups-1.2.12-r2.ebuild: |
80 |
Marked stable on amd64 for bug #196736 |
81 |
|
82 |
|
83 |
|
84 |
-- |
85 |
gentoo-commits@g.o mailing list |