Version bump, remove old, bug 319989

(Portage version: 2.2_rc67/cvs/Linux x86_64)

1 files changed, 30 insertions, 45 deletions

diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.18-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.2-split.patch
index 6d8f85682258..6257fd0ee71a 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.18-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.2-split.patch
@@ -1,22 +1,10 @@
-diff -ru ../system-config-printer-1.1.18/configure.in ./configure.in
---- ../system-config-printer-1.1.18/configure.in	2010-03-10 10:33:54.000000000 +0100
-+++ ./configure.in	2010-03-11 02:24:38.787452516 +0100
-@@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.18)
- AC_CONFIG_SRCDIR(system-config-printer.py)
--AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
-+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
- IT_PROG_INTLTOOL
- AM_GNU_GETTEXT([external])
- AM_PATH_PYTHON
-diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.18/Makefile.am	2010-03-10 10:33:45.000000000 +0100
-+++ ./Makefile.am	2010-03-11 02:31:02.771055111 +0100
-@@ -71,90 +71,20 @@
+diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.2.2/Makefile.am	2010-05-07 16:19:03.000000000 +0200
++++ ./Makefile.am	2010-05-17 20:36:37.657216914 +0200
+@@ -70,91 +70,20 @@
  	rm -f .stamp-distutils-in-builddir
  
  nobase_pkgdata_SCRIPTS=				\
--	my-default-printer.py			\
 -	check-device-ids.py			\
 -	pysmb.py				\
 -	system-config-printer.py		\
@@ -28,20 +16,21 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	AdvancedServerSettings.py			\
 -	asyncconn.py					\
 -	asyncipp.py					\
--	asyncpk0.py					\
 -	asyncpk1.py					\
 -	authconn.py					\
  	config.py					\
 -	cupspk.py					\
  	debug.py					\
+-	dnssdresolve.py					\
 -	errordialogs.py					\
 -	HIG.py						\
 -	firewall.py					\
--	glade.py					\
+-	gui.py						\
 -	GroupsPane.py					\
 -	GroupsPaneModel.py				\
 -	gtkinklevel.py					\
 -	gtkspinner.py					\
+-	installdriver.py				\
  	installpackage.py				\
 -	jobviewer.py					\
  	monitor.py					\
@@ -49,6 +38,7 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	optionwidgets.py				\
  	PhysicalDevice.py				\
  	ppdippstr.py					\
+-	ppdsloader.py					\
  	probe_printer.py				\
 -	gtk_label_autowrap.py				\
  	SearchCriterion.py				\
@@ -58,25 +48,26 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	ToolbarSearchEntry.py				\
 -	userdefault.py					\
 -	XmlHelper.py					\
--	glade/AboutDialog.glade				\
--	glade/ConnectDialog.glade			\
--	glade/ConnectingDialog.glade			\
--	glade/InstallDialog.glade			\
--	glade/JobsWindow.glade				\
--	glade/NewPrinterName.glade			\
--	glade/NewPrinterWindow.glade			\
--	glade/PrinterPropertiesDialog.glade		\
--	glade/PrintersWindow.glade			\
--	glade/ServerSettingsDialog.glade		\
--	glade/SMBBrowseDialog.glade			\
--	glade/statusicon_popupmenu.glade		\
--	glade/WaitWindow.glade				\
+-	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			\
@@ -99,13 +90,12 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -
 -bin_SCRIPTS=\
 -	system-config-printer			\
--	system-config-printer-applet		\
--	my-default-printer
+-	system-config-printer-applet
 +	XmlHelper.py
  
  if UDEV_RULES
  udevrulesdir=/lib/udev/rules.d
-@@ -169,61 +99,16 @@
+@@ -169,56 +98,17 @@
  	udev/udev-add-printer
  endif
  
@@ -113,15 +103,15 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	man/system-config-printer.1		\
 -	man/system-config-printer-applet.1
 -
- dbus_DATA =\
- 	newprinternotification.conf
+ 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 \
--	my-default-printer.desktop
+-	manage-print-jobs.desktop
  desktopdir = $(datadir)/applications/
  autostartdir = $(sysconfdir)/xdg/autostart/
  
@@ -146,12 +136,6 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -	  --add-category GTK			\
 -	  manage-print-jobs.desktop
 -	desktop-file-install $(DESKTOP_VENDOR)	\
--	  --dir $(DESTDIR)$(desktopdir)		\
--	  --add-category Settings		\
--	  --add-category HardwareSettings	\
--	  --add-category GTK			\
--	  my-default-printer.desktop
--	desktop-file-install $(DESKTOP_VENDOR)	\
 -	  --dir $(DESTDIR)$(autostartdir)	\
 -	  --add-category System			\
 -	  --add-category Monitor		\
@@ -161,9 +145,10 @@ diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
 -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)$(desktopdir)/$(DESKTOP_PREFIX)my-default-printer.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) \