1 |
pacho 13/10/30 18:04:35 |
2 |
|
3 |
Added: system-config-printer-common-1.3.13-split.patch |
4 |
Removed: system-config-printer-common-1.3.9-split.patch |
5 |
Log: |
6 |
Version bump, drop old. |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: system-config-printer-common-1.3.13-split.patch |
17 |
=================================================================== |
18 |
--- system-config-printer-1.3.13/Makefile.am.org 2013-10-27 22:22:54.057495728 +0100 |
19 |
+++ system-config-printer-1.3.13/Makefile.am 2013-10-27 22:29:26.054299236 +0100 |
20 |
@@ -1,5 +1,3 @@ |
21 |
-CFLAGS=-g -O2 -Wall |
22 |
- |
23 |
SUBDIRS=po |
24 |
|
25 |
EXPORT_MODULES= \ |
26 |
@@ -84,89 +82,21 @@ |
27 |
rm -f .stamp-distutils-in-builddir |
28 |
|
29 |
nobase_pkgdata_SCRIPTS= \ |
30 |
- check-device-ids.py \ |
31 |
- pysmb.py \ |
32 |
- scp-dbus-service.py \ |
33 |
- system-config-printer.py \ |
34 |
- install-printerdriver.py \ |
35 |
- troubleshoot/__init__.py \ |
36 |
- applet.py |
37 |
+ check-device-ids.py |
38 |
|
39 |
nobase_pkgdata_DATA= \ |
40 |
- asyncconn.py \ |
41 |
- asyncipp.py \ |
42 |
- asyncpk1.py \ |
43 |
- authconn.py \ |
44 |
config.py \ |
45 |
- cupspk.py \ |
46 |
debug.py \ |
47 |
dnssdresolve.py \ |
48 |
- errordialogs.py \ |
49 |
- HIG.py \ |
50 |
firewall.py \ |
51 |
- gui.py \ |
52 |
- gtkinklevel.py \ |
53 |
- gtkspinner.py \ |
54 |
installpackage.py \ |
55 |
- jobviewer.py \ |
56 |
monitor.py \ |
57 |
- newprinter.py \ |
58 |
- options.py \ |
59 |
- optionwidgets.py \ |
60 |
PhysicalDevice.py \ |
61 |
- ppdcache.py \ |
62 |
ppdippstr.py \ |
63 |
- ppdsloader.py \ |
64 |
- printerproperties.py \ |
65 |
probe_printer.py \ |
66 |
- gtk_label_autowrap.py \ |
67 |
SearchCriterion.py \ |
68 |
- serversettings.py \ |
69 |
smburi.py \ |
70 |
statereason.py \ |
71 |
- timedops.py \ |
72 |
- ToolbarSearchEntry.py \ |
73 |
- userdefault.py \ |
74 |
- ui/AboutDialog.ui \ |
75 |
- ui/ConnectDialog.ui \ |
76 |
- ui/ConnectingDialog.ui \ |
77 |
- ui/InstallDialog.ui \ |
78 |
- ui/JobsWindow.ui \ |
79 |
- ui/NewPrinterName.ui \ |
80 |
- ui/NewPrinterWindow.ui \ |
81 |
- ui/PrinterPropertiesDialog.ui \ |
82 |
- ui/PrintersWindow.ui \ |
83 |
- ui/ServerSettingsDialog.ui \ |
84 |
- ui/SMBBrowseDialog.ui \ |
85 |
- ui/statusicon_popupmenu.ui \ |
86 |
- ui/WaitWindow.ui \ |
87 |
- icons/i-network-printer.png \ |
88 |
- troubleshoot/base.py \ |
89 |
- troubleshoot/CheckLocalServerPublishing.py \ |
90 |
- troubleshoot/CheckNetworkServerSanity.py \ |
91 |
- troubleshoot/CheckPPDSanity.py \ |
92 |
- troubleshoot/CheckPrinterSanity.py \ |
93 |
- troubleshoot/CheckSELinux.py \ |
94 |
- troubleshoot/CheckUSBPermissions.py \ |
95 |
- troubleshoot/ChooseNetworkPrinter.py \ |
96 |
- troubleshoot/ChoosePrinter.py \ |
97 |
- troubleshoot/DeviceListed.py \ |
98 |
- troubleshoot/ErrorLogCheckpoint.py \ |
99 |
- troubleshoot/ErrorLogFetch.py \ |
100 |
- troubleshoot/ErrorLogParse.py \ |
101 |
- troubleshoot/Locale.py \ |
102 |
- troubleshoot/LocalOrRemote.py \ |
103 |
- troubleshoot/NetworkCUPSPrinterShared.py \ |
104 |
- troubleshoot/PrinterStateReasons.py \ |
105 |
- troubleshoot/PrintTestPage.py \ |
106 |
- troubleshoot/QueueNotEnabled.py \ |
107 |
- troubleshoot/QueueRejectingJobs.py \ |
108 |
- troubleshoot/RemoteAddress.py \ |
109 |
- troubleshoot/SchedulerNotRunning.py \ |
110 |
- troubleshoot/ServerFirewalled.py \ |
111 |
- troubleshoot/Shrug.py \ |
112 |
- troubleshoot/VerifyPackages.py \ |
113 |
- troubleshoot/Welcome.py \ |
114 |
xml/preferreddrivers.rng \ |
115 |
xml/validate.py |
116 |
|
117 |
@@ -174,19 +104,13 @@ |
118 |
cupshelpers_DATA=\ |
119 |
xml/preferreddrivers.xml |
120 |
|
121 |
-bin_SCRIPTS= \ |
122 |
- system-config-printer \ |
123 |
- install-printerdriver \ |
124 |
- system-config-printer-applet \ |
125 |
- dbus/scp-dbus-service |
126 |
- |
127 |
if UDEV_RULES |
128 |
udevrulesdir=$(sysconfdir)/udev/rules.d |
129 |
udevrules_DATA=udev/70-printers.rules |
130 |
udev_udev_configure_printer_SOURCES=\ |
131 |
udev/udev-configure-printer.c |
132 |
-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) |
133 |
-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) |
134 |
+udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS) |
135 |
+udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) |
136 |
udevhelperdir=$(sysconfdir)/udev |
137 |
udevhelper_PROGRAMS=\ |
138 |
udev/udev-configure-printer |
139 |
@@ -204,56 +128,17 @@ |
140 |
|
141 |
endif |
142 |
|
143 |
-man_MANS= \ |
144 |
- man/system-config-printer.1 \ |
145 |
- man/system-config-printer-applet.1 |
146 |
- |
147 |
dbus_DATA = \ |
148 |
dbus/com.redhat.NewPrinterNotification.conf \ |
149 |
dbus/com.redhat.PrinterDriversInstaller.conf |
150 |
dbusdir = $(sysconfdir)/dbus-1/system.d/ |
151 |
|
152 |
-dbusinterfaces_DATA = \ |
153 |
- dbus/org.fedoraproject.Config.Printing.xml |
154 |
-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ |
155 |
- |
156 |
-dbusservices_DATA = \ |
157 |
- dbus/org.fedoraproject.Config.Printing.service |
158 |
-dbusservicesdir = $(datadir)/dbus-1/services/ |
159 |
- |
160 |
-desktop_DATA =\ |
161 |
- system-config-printer.desktop \ |
162 |
- print-applet.desktop |
163 |
desktopdir = $(datadir)/applications/ |
164 |
autostartdir = $(sysconfdir)/xdg/autostart/ |
165 |
|
166 |
DESKTOP_VENDOR=@DESKTOPVENDOR@ |
167 |
DESKTOP_PREFIX=@DESKTOPPREFIX@ |
168 |
|
169 |
-install-desktopDATA: $(desktop_DATA) |
170 |
- mkdir -p $(DESTDIR)$(desktopdir) |
171 |
- mkdir -p $(DESTDIR)$(desktopdir) |
172 |
- desktop-file-install $(DESKTOP_VENDOR) \ |
173 |
- --dir $(DESTDIR)$(desktopdir) \ |
174 |
- --add-category System \ |
175 |
- --add-category Settings \ |
176 |
- --add-category HardwareSettings \ |
177 |
- --add-category Printing \ |
178 |
- --add-category GTK \ |
179 |
- system-config-printer.desktop |
180 |
- desktop-file-install $(DESKTOP_VENDOR) \ |
181 |
- --dir $(DESTDIR)$(autostartdir) \ |
182 |
- --add-category System \ |
183 |
- --add-category Monitor \ |
184 |
- --add-category GTK \ |
185 |
- print-applet.desktop |
186 |
- |
187 |
-uninstall-desktopDATA: |
188 |
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop |
189 |
- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop |
190 |
- |
191 |
-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) |
192 |
- |
193 |
EXTRA_DIST=\ |
194 |
$(nobase_pkgdata_SCRIPTS) \ |
195 |
$(nobase_pkgdata_DATA) \ |