Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/system-config-printer-common/files: system-config-printer-common-1.2.3-split.patch
Date: Wed, 30 Jun 2010 03:33:15
Message-Id: 20100630033309.D9BFC2C5F4@corvid.gentoo.org
1 reavertm 10/06/30 03:33:09
2
3 Modified: system-config-printer-common-1.2.3-split.patch
4 Log:
5 Use 1.2.2 patch, set udev paths in install
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch
10
11 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.2&view=markup
12 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.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch?r1=1.1&r2=1.2
14
15 Index: system-config-printer-common-1.2.3-split.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/files/system-config-printer-common-1.2.3-split.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- system-config-printer-common-1.2.3-split.patch 30 Jun 2010 02:47:51 -0000 1.1
22 +++ system-config-printer-common-1.2.3-split.patch 30 Jun 2010 03:33:09 -0000 1.2
23 @@ -1,13 +1,7 @@
24 -diff -ru ../system-config-printer-1.2.3/Makefile.am ./Makefile.am
25 ---- ../system-config-printer-1.2.3/Makefile.am 2010-06-24 17:49:35.000000000 +0200
26 -+++ ./Makefile.am 2010-06-30 04:38:40.435974659 +0200
27 -@@ -1,4 +1,4 @@
28 --AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
29 -+AM_CFLAGS=-Wall $(GLIB_CFLAGS)
30 -
31 - SUBDIRS=po
32 -
33 -@@ -70,155 +70,45 @@
34 +diff -ru ../system-config-printer-1.2.2/Makefile.am ./Makefile.am
35 +--- ../system-config-printer-1.2.2/Makefile.am 2010-05-07 16:19:03.000000000 +0200
36 ++++ ./Makefile.am 2010-05-17 20:36:37.657216914 +0200
37 +@@ -70,91 +70,20 @@
38 rm -f .stamp-distutils-in-builddir
39
40 nobase_pkgdata_SCRIPTS= \
41 @@ -100,17 +94,8 @@
42 + XmlHelper.py
43
44 if UDEV_RULES
45 --udevrulesdir=$(sysconfdir)/udev/rules.d
46 -+udevrulesdir=/lib/udev/rules.d
47 - udevrules_DATA=udev/70-printers.rules
48 - udev_udev_configure_printer_SOURCES=\
49 - udev/udev-configure-printer.c
50 - udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS)
51 --udevhelperdir=$(sysconfdir)/udev
52 -+udevhelperdir=/lib/udev
53 - udevhelper_PROGRAMS=\
54 - udev/udev-configure-printer
55 - udevhelper_SCRIPTS=\
56 + udevrulesdir=/lib/udev/rules.d
57 +@@ -169,56 +98,17 @@
58 udev/udev-add-printer
59 endif