| 1 |
reavertm 11/01/27 01:27:01 |
| 2 |
|
| 3 |
Added: system-config-printer-gnome-1.2.6-split.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.2.6-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.2.6-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.2.6-split.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: system-config-printer-gnome-1.2.6-split.patch |
| 16 |
=================================================================== |
| 17 |
diff -ru system-config-printer-1.2.6/Makefile.am new/Makefile.am |
| 18 |
--- system-config-printer-1.2.6/Makefile.am 2011-01-14 17:04:25.000000000 +0100 |
| 19 |
+++ new/Makefile.am 2011-01-27 02:07:03.255000001 +0100 |
| 20 |
@@ -2,77 +2,8 @@ |
| 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 |
- |
| 31 |
-### Automake hooks for Distutils. |
| 32 |
-# The distutils module doesn't understand srcdir != builddir, |
| 33 |
-# so we copy in, along with the cupshelpers modules, into |
| 34 |
-# the builddir for 'all', 'install-exec', and 'clean' hooks. |
| 35 |
-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES) |
| 36 |
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ |
| 37 |
- cp $(top_srcdir)/setup.py .; \ |
| 38 |
- mkdir cupshelpers; \ |
| 39 |
- for file in $(EXPORT_MODULES); do \ |
| 40 |
- cp $(top_srcdir)/$$file $$file; \ |
| 41 |
- done; \ |
| 42 |
- fi |
| 43 |
- touch .stamp-distutils-in-builddir |
| 44 |
- |
| 45 |
-dist-hook: mk-ChangeLog |
| 46 |
-.PHONE: mk-ChangeLog |
| 47 |
-mk-ChangeLog: |
| 48 |
- if test -d .git; then \ |
| 49 |
- $(top_srcdir)/gitlog-to-changelog \ |
| 50 |
- --since=2009-05-01 -- --no-merges \ |
| 51 |
- > $(distdir)/cl ; \ |
| 52 |
- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \ |
| 53 |
- fi |
| 54 |
- |
| 55 |
-config.py: config.py.in Makefile |
| 56 |
- sed \ |
| 57 |
- -e "s|\@prefix\@|$(prefix)|" \ |
| 58 |
- -e "s|\@datadir\@|$(datadir)|" \ |
| 59 |
- -e "s|\@localedir\@|$(localedir)|" \ |
| 60 |
- -e "s|\@VERSION\@|$(VERSION)|" \ |
| 61 |
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \ |
| 62 |
- $< > $@ |
| 63 |
- |
| 64 |
-# Use distutils to build the module. |
| 65 |
-all-local: .stamp-distutils-in-builddir config.py |
| 66 |
- $(PYTHON) setup.py build |
| 67 |
- |
| 68 |
-# Use distutils to install the module. |
| 69 |
-install-exec-local: .stamp-distutils-in-builddir |
| 70 |
- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) |
| 71 |
- |
| 72 |
-# Uninstall the module, crossing our fingers that we know enough |
| 73 |
-# about how distutils works to do this. Unfortunately, distutils |
| 74 |
-# doesn't provide a way to do this itself. |
| 75 |
-uninstall-local: |
| 76 |
- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info |
| 77 |
- for file in $(EXPORT_MODULES); do \ |
| 78 |
- rm -f $(DESTDIR)/$(pythondir)/$$file*; \ |
| 79 |
- done |
| 80 |
- |
| 81 |
-# Tell distutils to clean up. |
| 82 |
-clean-local: |
| 83 |
- -$(PYTHON) setup.py clean --all |
| 84 |
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ |
| 85 |
- rm -f setup.py; \ |
| 86 |
- for file in $(EXPORT_MODULES); do \ |
| 87 |
- rm -f $$file*; \ |
| 88 |
- done; \ |
| 89 |
- fi |
| 90 |
- rm -f .stamp-distutils-in-builddir |
| 91 |
- |
| 92 |
nobase_pkgdata_SCRIPTS= \ |
| 93 |
check-device-ids.py \ |
| 94 |
- pysmb.py \ |
| 95 |
system-config-printer.py \ |
| 96 |
troubleshoot/__init__.py \ |
| 97 |
applet.py |
| 98 |
@@ -83,35 +14,22 @@ |
| 99 |
asyncipp.py \ |
| 100 |
asyncpk1.py \ |
| 101 |
authconn.py \ |
| 102 |
- config.py \ |
| 103 |
cupspk.py \ |
| 104 |
- debug.py \ |
| 105 |
- dnssdresolve.py \ |
| 106 |
errordialogs.py \ |
| 107 |
HIG.py \ |
| 108 |
- firewall.py \ |
| 109 |
gui.py \ |
| 110 |
GroupsPane.py \ |
| 111 |
GroupsPaneModel.py \ |
| 112 |
gtkinklevel.py \ |
| 113 |
gtkspinner.py \ |
| 114 |
- installpackage.py \ |
| 115 |
jobviewer.py \ |
| 116 |
- monitor.py \ |
| 117 |
options.py \ |
| 118 |
optionwidgets.py \ |
| 119 |
- PhysicalDevice.py \ |
| 120 |
- ppdippstr.py \ |
| 121 |
ppdsloader.py \ |
| 122 |
- probe_printer.py \ |
| 123 |
gtk_label_autowrap.py \ |
| 124 |
- SearchCriterion.py \ |
| 125 |
- smburi.py \ |
| 126 |
- statereason.py \ |
| 127 |
timedops.py \ |
| 128 |
ToolbarSearchEntry.py \ |
| 129 |
userdefault.py \ |
| 130 |
- XmlHelper.py \ |
| 131 |
ui/AboutDialog.glade \ |
| 132 |
ui/ConnectDialog.glade \ |
| 133 |
ui/ConnectingDialog.glade \ |
| 134 |
@@ -156,28 +74,10 @@ |
| 135 |
system-config-printer \ |
| 136 |
system-config-printer-applet |
| 137 |
|
| 138 |
-if UDEV_RULES |
| 139 |
-udevrulesdir=$(sysconfdir)/udev/rules.d |
| 140 |
-udevrules_DATA=udev/70-printers.rules |
| 141 |
-udev_udev_configure_printer_SOURCES=\ |
| 142 |
- udev/udev-configure-printer.c |
| 143 |
-udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS) |
| 144 |
-udevhelperdir=$(sysconfdir)/udev |
| 145 |
-udevhelper_PROGRAMS=\ |
| 146 |
- udev/udev-configure-printer |
| 147 |
-udevhelper_SCRIPTS=\ |
| 148 |
- udev/udev-add-printer |
| 149 |
-endif |
| 150 |
- |
| 151 |
man_MANS= \ |
| 152 |
man/system-config-printer.1 \ |
| 153 |
man/system-config-printer-applet.1 |
| 154 |
|
| 155 |
-dbus_DATA = \ |
| 156 |
- newprinternotification.conf \ |
| 157 |
- printerdriversinstaller.conf |
| 158 |
-dbusdir = $(sysconfdir)/dbus-1/system.d/ |
| 159 |
- |
| 160 |
desktop_DATA =\ |
| 161 |
system-config-printer.desktop \ |
| 162 |
print-applet.desktop \ |
Archives