* [gentoo-commits] gentoo-x86 commit in app-admin/system-config-printer-gnome/files: system-config-printer-gnome-1.3.0-split.patch
@ 2011-02-16 20:01 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; only message in thread
From: Maciej Mrozowski (reavertm) @ 2011-02-16 20:01 UTC (permalink / raw
To: gentoo-commits
reavertm 11/02/16 20:01:09
Added: system-config-printer-gnome-1.3.0-split.patch
Log:
Version bump 1.3.0. Install some dbus services with this release.
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Revision Changes Path
1.1 app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.0-split.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.0-split.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.0-split.patch?rev=1.1&content-type=text/plain
Index: system-config-printer-gnome-1.3.0-split.patch
===================================================================
diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
--- system-config-printer-1.3.0/Makefile.am 2011-02-16 14:02:45.000000000 +0100
+++ my/Makefile.am 2011-02-16 20:33:45.228000000 +0100
@@ -1,90 +1,9 @@
-AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
+AM_CFLAGS=-Wall $(GLIB_CFLAGS)
SUBDIRS=po
-EXPORT_MODULES= \
- cupshelpers/__init__.py \
- cupshelpers/cupshelpers.py \
- cupshelpers/installdriver.py \
- cupshelpers/ppds.py \
- cupshelpers/openprinting.py \
- cupshelpers/xmldriverprefs.py
-
-EXPORT_MODULES_GEN= \
- cupshelpers/config.py
-
-### Automake hooks for Distutils.
-# The distutils module doesn't understand srcdir != builddir,
-# so we copy in, along with the cupshelpers modules, into
-# the builddir for 'all', 'install-exec', and 'clean' hooks.
-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES)
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
- cp $(top_srcdir)/setup.py .; \
- $(mkdir_p) cupshelpers; \
- for file in $(EXPORT_MODULES); do \
- cp $(top_srcdir)/$$file $$file; \
- done; \
- fi
- touch .stamp-distutils-in-builddir
-
-dist-hook: mk-ChangeLog
-.PHONE: mk-ChangeLog
-mk-ChangeLog:
- if test -d .git; then \
- $(top_srcdir)/gitlog-to-changelog \
- --since=2009-05-01 -- --no-merges \
- > $(distdir)/cl ; \
- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \
- fi
-
-config.py: config.py.in Makefile
- sed \
- -e "s|\@prefix\@|$(prefix)|" \
- -e "s|\@datadir\@|$(datadir)|" \
- -e "s|\@localedir\@|$(localedir)|" \
- -e "s|\@VERSION\@|$(VERSION)|" \
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \
- $< > $@
-
-cupshelpers/config.py: cupshelpers/config.py.in Makefile
- $(mkdir_p) cupshelpers
- sed \
- -e "s|\@prefix\@|$(prefix)|" \
- -e "s|\@sysconfdir\@|$(sysconfdir)|" \
- $< > $@
-
-# Use distutils to build the module.
-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py
- $(PYTHON) setup.py build
-
-# Use distutils to install the module.
-install-exec-local: .stamp-distutils-in-builddir
- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-
-# Uninstall the module, crossing our fingers that we know enough
-# about how distutils works to do this. Unfortunately, distutils
-# doesn't provide a way to do this itself.
-uninstall-local:
- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \
- rm -f $(DESTDIR)/$(pythondir)/$$file*; \
- done
-
-# Tell distutils to clean up.
-clean-local:
- -$(PYTHON) setup.py clean --all
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
- rm -f setup.py; \
- for file in $(EXPORT_MODULES) \
- $(EXPORT_MODULES_GEN); do \
- rm -f $$file*; \
- done; \
- fi
- rm -f .stamp-distutils-in-builddir
-
nobase_pkgdata_SCRIPTS= \
check-device-ids.py \
- pysmb.py \
scp-dbus-service.py \
system-config-printer.py \
troubleshoot/__init__.py \
@@ -95,39 +14,26 @@
asyncipp.py \
asyncpk1.py \
authconn.py \
- config.py \
cupspk.py \
- debug.py \
- dnssdresolve.py \
errordialogs.py \
HIG.py \
- firewall.py \
gui.py \
GroupsPane.py \
GroupsPaneModel.py \
gtkinklevel.py \
gtkspinner.py \
- installpackage.py \
jobviewer.py \
- monitor.py \
newprinter.py \
options.py \
optionwidgets.py \
- PhysicalDevice.py \
ppdcache.py \
- ppdippstr.py \
ppdsloader.py \
printerproperties.py \
- probe_printer.py \
gtk_label_autowrap.py \
- SearchCriterion.py \
serversettings.py \
- smburi.py \
- statereason.py \
timedops.py \
ToolbarSearchEntry.py \
userdefault.py \
- XmlHelper.py \
ui/AboutDialog.ui \
ui/ConnectDialog.ui \
ui/ConnectingDialog.ui \
@@ -180,28 +86,10 @@
system-config-printer-applet \
dbus/scp-dbus-service
-if UDEV_RULES
-udevrulesdir=$(sysconfdir)/udev/rules.d
-udevrules_DATA=udev/70-printers.rules
-udev_udev_configure_printer_SOURCES=\
- udev/udev-configure-printer.c
-udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS)
-udevhelperdir=$(sysconfdir)/udev
-udevhelper_PROGRAMS=\
- udev/udev-configure-printer
-udevhelper_SCRIPTS=\
- udev/udev-add-printer
-endif
-
man_MANS= \
man/system-config-printer.1 \
man/system-config-printer-applet.1
-dbus_DATA = \
- dbus/com.redhat.NewPrinterNotification.conf \
- dbus/com.redhat.PrinterDriversInstaller.conf
-dbusdir = $(sysconfdir)/dbus-1/system.d/
-
dbusinterfaces_DATA = \
dbus/org.fedoraproject.Config.Printing.xml
dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-16 20:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-16 20:01 [gentoo-commits] gentoo-x86 commit in app-admin/system-config-printer-gnome/files: system-config-printer-gnome-1.3.0-split.patch Maciej Mrozowski (reavertm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox