1 |
pacho 13/10/30 18:05:19 |
2 |
|
3 |
Added: system-config-printer-gnome-1.3.13-split.patch |
4 |
Log: |
5 |
Version bump, drop old. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: system-config-printer-gnome-1.3.13-split.patch |
16 |
=================================================================== |
17 |
--- system-config-printer-1.3.13/Makefile.am.org 2013-10-27 22:22:54.057495728 +0100 |
18 |
+++ system-config-printer-1.3.13/Makefile.am 2013-10-27 22:36:30.230851350 +0100 |
19 |
@@ -1,90 +1,6 @@ |
20 |
-CFLAGS=-g -O2 -Wall |
21 |
- |
22 |
SUBDIRS=po |
23 |
|
24 |
-EXPORT_MODULES= \ |
25 |
- cupshelpers/__init__.py \ |
26 |
- cupshelpers/cupshelpers.py \ |
27 |
- cupshelpers/installdriver.py \ |
28 |
- cupshelpers/ppds.py \ |
29 |
- cupshelpers/openprinting.py \ |
30 |
- cupshelpers/xmldriverprefs.py |
31 |
- |
32 |
-EXPORT_MODULES_GEN= \ |
33 |
- cupshelpers/config.py |
34 |
- |
35 |
-### Automake hooks for Distutils. |
36 |
-# The distutils module doesn't understand srcdir != builddir, |
37 |
-# so we copy in, along with the cupshelpers modules, into |
38 |
-# the builddir for 'all', 'install-exec', and 'clean' hooks. |
39 |
-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES) |
40 |
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ |
41 |
- cp $(top_srcdir)/setup.py .; \ |
42 |
- $(mkdir_p) cupshelpers; \ |
43 |
- for file in $(EXPORT_MODULES); do \ |
44 |
- cp $(top_srcdir)/$$file $$file; \ |
45 |
- done; \ |
46 |
- fi |
47 |
- touch .stamp-distutils-in-builddir |
48 |
- |
49 |
-dist-hook: mk-ChangeLog |
50 |
-.PHONE: mk-ChangeLog |
51 |
-mk-ChangeLog: |
52 |
- if test -d .git; then \ |
53 |
- $(top_srcdir)/gitlog-to-changelog \ |
54 |
- --since=2009-05-01 -- --no-merges \ |
55 |
- > $(distdir)/cl ; \ |
56 |
- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \ |
57 |
- fi |
58 |
- |
59 |
-config.py: config.py.in Makefile |
60 |
- sed \ |
61 |
- -e "s|\@prefix\@|$(prefix)|" \ |
62 |
- -e "s|\@datadir\@|$(datadir)|" \ |
63 |
- -e "s|\@localedir\@|$(localedir)|" \ |
64 |
- -e "s|\@VERSION\@|$(VERSION)|" \ |
65 |
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \ |
66 |
- $< > $@ |
67 |
- |
68 |
-cupshelpers/config.py: cupshelpers/config.py.in Makefile |
69 |
- $(mkdir_p) cupshelpers |
70 |
- sed \ |
71 |
- -e "s|\@prefix\@|$(prefix)|" \ |
72 |
- -e "s|\@sysconfdir\@|$(sysconfdir)|" \ |
73 |
- -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \ |
74 |
- $< > $@ |
75 |
- |
76 |
-# Use distutils to build the module. |
77 |
-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py |
78 |
- $(PYTHON) setup.py build |
79 |
- |
80 |
-# Use distutils to install the module. |
81 |
-install-exec-local: .stamp-distutils-in-builddir |
82 |
- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) |
83 |
- |
84 |
-# Uninstall the module, crossing our fingers that we know enough |
85 |
-# about how distutils works to do this. Unfortunately, distutils |
86 |
-# doesn't provide a way to do this itself. |
87 |
-uninstall-local: |
88 |
- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info |
89 |
- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \ |
90 |
- rm -f $(DESTDIR)/$(pythondir)/$$file*; \ |
91 |
- done |
92 |
- |
93 |
-# Tell distutils to clean up. |
94 |
-clean-local: |
95 |
- -$(PYTHON) setup.py clean --all |
96 |
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ |
97 |
- rm -f setup.py; \ |
98 |
- for file in $(EXPORT_MODULES) \ |
99 |
- $(EXPORT_MODULES_GEN); do \ |
100 |
- rm -f $$file*; \ |
101 |
- done; \ |
102 |
- fi |
103 |
- rm -f .stamp-distutils-in-builddir |
104 |
- |
105 |
nobase_pkgdata_SCRIPTS= \ |
106 |
- check-device-ids.py \ |
107 |
pysmb.py \ |
108 |
scp-dbus-service.py \ |
109 |
system-config-printer.py \ |
110 |
@@ -97,33 +13,21 @@ |
111 |
asyncipp.py \ |
112 |
asyncpk1.py \ |
113 |
authconn.py \ |
114 |
- config.py \ |
115 |
cupspk.py \ |
116 |
- debug.py \ |
117 |
- dnssdresolve.py \ |
118 |
errordialogs.py \ |
119 |
HIG.py \ |
120 |
- firewall.py \ |
121 |
gui.py \ |
122 |
gtkinklevel.py \ |
123 |
gtkspinner.py \ |
124 |
- installpackage.py \ |
125 |
jobviewer.py \ |
126 |
- monitor.py \ |
127 |
newprinter.py \ |
128 |
options.py \ |
129 |
optionwidgets.py \ |
130 |
- PhysicalDevice.py \ |
131 |
ppdcache.py \ |
132 |
- ppdippstr.py \ |
133 |
ppdsloader.py \ |
134 |
printerproperties.py \ |
135 |
- probe_printer.py \ |
136 |
gtk_label_autowrap.py \ |
137 |
- SearchCriterion.py \ |
138 |
serversettings.py \ |
139 |
- smburi.py \ |
140 |
- statereason.py \ |
141 |
timedops.py \ |
142 |
ToolbarSearchEntry.py \ |
143 |
userdefault.py \ |
144 |
@@ -166,13 +70,7 @@ |
145 |
troubleshoot/ServerFirewalled.py \ |
146 |
troubleshoot/Shrug.py \ |
147 |
troubleshoot/VerifyPackages.py \ |
148 |
- troubleshoot/Welcome.py \ |
149 |
- xml/preferreddrivers.rng \ |
150 |
- xml/validate.py |
151 |
- |
152 |
-cupshelpersdir=$(sysconfdir)/cupshelpers |
153 |
-cupshelpers_DATA=\ |
154 |
- xml/preferreddrivers.xml |
155 |
+ troubleshoot/Welcome.py |
156 |
|
157 |
bin_SCRIPTS= \ |
158 |
system-config-printer \ |
159 |
@@ -180,39 +78,10 @@ |
160 |
system-config-printer-applet \ |
161 |
dbus/scp-dbus-service |
162 |
|
163 |
-if UDEV_RULES |
164 |
-udevrulesdir=$(sysconfdir)/udev/rules.d |
165 |
-udevrules_DATA=udev/70-printers.rules |
166 |
-udev_udev_configure_printer_SOURCES=\ |
167 |
- udev/udev-configure-printer.c |
168 |
-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) |
169 |
-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) |
170 |
-udevhelperdir=$(sysconfdir)/udev |
171 |
-udevhelper_PROGRAMS=\ |
172 |
- udev/udev-configure-printer |
173 |
-udevhelper_SCRIPTS=\ |
174 |
- udev/udev-add-printer |
175 |
- |
176 |
-if HAVE_SYSTEMD |
177 |
-%.service: %.service.in |
178 |
- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@ |
179 |
-systemdsystemunit_DATA = \ |
180 |
- udev/configure-printer@.service |
181 |
-CLEANFILES = \ |
182 |
- $(systemdsystemunit_DATA) |
183 |
-endif |
184 |
- |
185 |
-endif |
186 |
- |
187 |
man_MANS= \ |
188 |
man/system-config-printer.1 \ |
189 |
man/system-config-printer-applet.1 |
190 |
|
191 |
-dbus_DATA = \ |
192 |
- dbus/com.redhat.NewPrinterNotification.conf \ |
193 |
- dbus/com.redhat.PrinterDriversInstaller.conf |
194 |
-dbusdir = $(sysconfdir)/dbus-1/system.d/ |
195 |
- |
196 |
dbusinterfaces_DATA = \ |
197 |
dbus/org.fedoraproject.Config.Printing.xml |
198 |
dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ |