[gentoo-commits] gentoo-x86 commit in app-admin/system-config-printer-common/files: system-config-printer-common-1.2.3-split.patch

[Maciej Mrozowski (reavertm)]

reavertm    10/06/30 02:47:51

  Added:                system-config-printer-common-1.2.3-split.patch
  Log:
  Version bump 1.2.3
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch?rev=1.1&content-type=text/plain

Index: system-config-printer-common-1.2.3-split.patch
===================================================================
diff -ru ../system-config-printer-1.2.3/Makefile.am ./Makefile.am
--- ../system-config-printer-1.2.3/Makefile.am	2010-06-24 17:49:35.000000000 +0200
+++ ./Makefile.am	2010-06-30 04:38:40.435974659 +0200
@@ -1,4 +1,4 @@
-AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
+AM_CFLAGS=-Wall $(GLIB_CFLAGS)
 
 SUBDIRS=po
 
@@ -70,155 +70,45 @@
 	rm -f .stamp-distutils-in-builddir
 
 nobase_pkgdata_SCRIPTS=				\
-	check-device-ids.py			\
-	pysmb.py				\
-	system-config-printer.py		\
-	troubleshoot/__init__.py		\
-	applet.py
+	pysmb.py
 
 nobase_pkgdata_DATA=					\
-	AdvancedServerSettings.py			\
-	asyncconn.py					\
-	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					\
-	installdriver.py				\
 	installpackage.py				\
-	jobviewer.py					\
 	monitor.py					\
-	options.py					\
-	optionwidgets.py				\
 	PhysicalDevice.py				\
 	ppdippstr.py					\
-	ppdsloader.py					\
 	probe_printer.py				\
-	gtk_label_autowrap.py				\
 	SearchCriterion.py				\
 	smburi.py					\
 	statereason.py					\
-	timedops.py					\
-	ToolbarSearchEntry.py				\
-	userdefault.py					\
-	XmlHelper.py					\
-	ui/AboutDialog.glade				\
-	ui/ConnectDialog.glade				\
-	ui/ConnectingDialog.glade			\
-	ui/InstallDialog.glade				\
-	ui/JobsWindow.glade				\
-	ui/NewPrinterName.glade				\
-	ui/NewPrinterWindow.glade			\
-	ui/PrinterPropertiesDialog.glade		\
-	ui/PrintersWindow.glade				\
-	ui/ServerSettingsDialog.glade			\
-	ui/SMBBrowseDialog.glade			\
-	ui/statusicon_popupmenu.glade			\
-	ui/WaitWindow.glade				\
-	icons/i-network-printer.png			\
-	troubleshoot/base.py				\
-	troubleshoot/CheckLocalServerPublishing.py	\
-	troubleshoot/CheckNetworkServerSanity.py	\
-	troubleshoot/CheckPPDSanity.py			\
-	troubleshoot/CheckPrinterSanity.py		\
-	troubleshoot/CheckSELinux.py			\
-	troubleshoot/CheckUSBPermissions.py		\
-	troubleshoot/ChooseNetworkPrinter.py		\
-	troubleshoot/ChoosePrinter.py			\
-	troubleshoot/DeviceListed.py			\
-	troubleshoot/ErrorLogCheckpoint.py		\
-	troubleshoot/ErrorLogFetch.py			\
-	troubleshoot/ErrorLogParse.py			\
-	troubleshoot/Locale.py				\
-	troubleshoot/LocalOrRemote.py			\
-	troubleshoot/NetworkCUPSPrinterShared.py	\
-	troubleshoot/PrinterStateReasons.py		\
-	troubleshoot/PrintTestPage.py			\
-	troubleshoot/QueueNotEnabled.py			\
-	troubleshoot/QueueRejectingJobs.py		\
-	troubleshoot/RemoteAddress.py			\
-	troubleshoot/SchedulerNotRunning.py		\
-	troubleshoot/ServerFirewalled.py		\
-	troubleshoot/Shrug.py				\
-	troubleshoot/Welcome.py
-
-bin_SCRIPTS=\
-	system-config-printer			\
-	system-config-printer-applet
+	XmlHelper.py
 
 if UDEV_RULES
-udevrulesdir=$(sysconfdir)/udev/rules.d
+udevrulesdir=/lib/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
+udevhelperdir=/lib/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 =					\
 	newprinternotification.conf		\
 	printerdriversinstaller.conf
 dbusdir = $(sysconfdir)/dbus-1/system.d/
 
-desktop_DATA =\
-	system-config-printer.desktop \
-	print-applet.desktop \
-	manage-print-jobs.desktop
 desktopdir = $(datadir)/applications/
 autostartdir = $(sysconfdir)/xdg/autostart/
 
 DESKTOP_VENDOR=@DESKTOPVENDOR@
 DESKTOP_PREFIX=@DESKTOPPREFIX@
 
-install-desktopDATA: $(desktop_DATA)
-	mkdir -p $(DESTDIR)$(desktopdir)
-	mkdir -p $(DESTDIR)$(desktopdir)
-	desktop-file-install $(DESKTOP_VENDOR)	\
-	  --dir $(DESTDIR)$(desktopdir)		\
-	  --add-category System			\
-	  --add-category Settings		\
-	  --add-category HardwareSettings	\
-	  --add-category Printing		\
-	  --add-category GTK			\
-	  system-config-printer.desktop
-	desktop-file-install $(DESKTOP_VENDOR)	\
-	  --dir $(DESTDIR)$(desktopdir)		\
-	  --add-category System			\
-	  --add-category Monitor		\
-	  --add-category GTK			\
-	  manage-print-jobs.desktop
-	desktop-file-install $(DESKTOP_VENDOR)	\
-	  --dir $(DESTDIR)$(autostartdir)	\
-	  --add-category System			\
-	  --add-category Monitor		\
-	  --add-category GTK			\
-	  print-applet.desktop
-
-uninstall-desktopDATA:
-	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
-	rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)manage-print-jobs.desktop
-	rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
-
-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
-
 EXTRA_DIST=\
 	$(nobase_pkgdata_SCRIPTS) \
 	$(nobase_pkgdata_DATA) \