summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2011-02-16 19:57:04 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2011-02-16 19:57:04 +0000
commitfe1782f0738fcb7a2cfe4d19e13d8084a1dbb2ee (patch)
tree25003c7e334ce90f2aa683c51dd7e9f18242343d /app-admin
parentreadd some deps for skins useflag that were lost (diff)
downloadgentoo-2-fe1782f0738fcb7a2cfe4d19e13d8084a1dbb2ee.tar.gz
gentoo-2-fe1782f0738fcb7a2cfe4d19e13d8084a1dbb2ee.tar.bz2
gentoo-2-fe1782f0738fcb7a2cfe4d19e13d8084a1dbb2ee.zip
Do not install newprinter.py and related dbus services (they are too UI specific)
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/system-config-printer-common/ChangeLog11
-rw-r--r--app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch20
-rw-r--r--app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.ebuild (renamed from app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild)2
3 files changed, 24 insertions, 9 deletions
diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 961f177a4bfe..325106a5bc6e 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for app-admin/system-config-printer-common
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.29 2011/02/16 19:27:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.30 2011/02/16 19:57:04 reavertm Exp $
+
+*system-config-printer-common-1.3.0-r1 (16 Feb 2011)
+
+ 16 Feb 2011; Maciej Mrozowski <reavertm@gentoo.org>
+ -system-config-printer-common-1.3.0.ebuild,
+ +system-config-printer-common-1.3.0-r1.ebuild,
+ files/system-config-printer-common-1.3.0-split.patch:
+ Do not install newprinter.py and related dbus services (they are too UI
+ specific)
*system-config-printer-common-1.3.0 (16 Feb 2011)
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
index 3a6b7d45e6d8..c30b9b3ae538 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.0-split.patch
@@ -1,13 +1,13 @@
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:19:11.586000001 +0100
++++ my/Makefile.am 2011-02-16 20:48:09.990000001 +0100
@@ -1,4 +1,4 @@
-AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
+AM_CFLAGS=-Wall $(GLIB_CFLAGS)
SUBDIRS=po
-@@ -83,102 +83,23 @@
+@@ -83,102 +83,22 @@
rm -f .stamp-distutils-in-builddir
nobase_pkgdata_SCRIPTS= \
@@ -39,7 +39,7 @@ diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
installpackage.py \
- jobviewer.py \
monitor.py \
- newprinter.py \
+- newprinter.py \
- options.py \
- optionwidgets.py \
PhysicalDevice.py \
@@ -112,7 +112,7 @@ diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
if UDEV_RULES
udevrulesdir=$(sysconfdir)/udev/rules.d
-@@ -193,10 +114,6 @@
+@@ -193,56 +113,17 @@
udev/udev-add-printer
endif
@@ -123,10 +123,16 @@ diff -ruN system-config-printer-1.3.0/Makefile.am my/Makefile.am
dbus_DATA = \
dbus/com.redhat.NewPrinterNotification.conf \
dbus/com.redhat.PrinterDriversInstaller.conf
-@@ -210,39 +127,12 @@
- dbus/org.fedoraproject.Config.Printing.service
- dbusservicesdir = $(datadir)/dbus-1/services/
+ dbusdir = $(sysconfdir)/dbus-1/system.d/
+-dbusinterfaces_DATA = \
+- dbus/org.fedoraproject.Config.Printing.xml
+-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
+-
+-dbusservices_DATA = \
+- dbus/org.fedoraproject.Config.Printing.service
+-dbusservicesdir = $(datadir)/dbus-1/services/
+-
-desktop_DATA =\
- system-config-printer.desktop \
- print-applet.desktop
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.ebuild
index 328e8b2e642d..22c0d25089e7 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.0.ebuild,v 1.1 2011/02/16 19:27:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.0-r1.ebuild,v 1.1 2011/02/16 19:57:04 reavertm Exp $
EAPI="3"