Gentoo Archives: gentoo-commits

From: "Bernard Cafarelli (voyageur)" <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/neatx/files: neatx-0.3.1_p59-use_libexecdir.patch
Date: Thu, 23 Aug 2012 12:31:11
Message-Id: 20120823123040.D85CF2045F@flycatcher.gentoo.org
1 voyageur 12/08/23 12:30:40
2
3 Modified: neatx-0.3.1_p59-use_libexecdir.patch
4 Log:
5 Fix missing parts for libexecdir migration, thanks Damien Granger in bug #432274
6
7 (Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch?r1=1.1&r2=1.2
15
16 Index: neatx-0.3.1_p59-use_libexecdir.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- neatx-0.3.1_p59-use_libexecdir.patch 21 Aug 2012 13:34:00 -0000 1.1
23 +++ neatx-0.3.1_p59-use_libexecdir.patch 23 Aug 2012 12:30:40 -0000 1.2
24 @@ -1,6 +1,6 @@
25 diff -Naur neatx.orig/Makefile.am neatx/Makefile.am
26 ---- neatx.orig/Makefile.am 2012-08-21 12:09:25.504181479 +0200
27 -+++ neatx/Makefile.am 2012-08-21 12:11:55.254498131 +0200
28 +--- neatx.orig/Makefile.am 2012-08-23 12:01:14.290018757 +0200
29 ++++ neatx/Makefile.am 2012-08-23 14:16:42.119497905 +0200
30 @@ -16,7 +16,7 @@
31 appdir = $(pkgpythondir)/app
32 docdir = $(datadir)/doc/$(PACKAGE)
33 @@ -46,7 +46,15 @@
34 echo 's#@PKGPYTHONDIR@#$(pkgpythondir)#g'; \
35 } > $@
36
37 -@@ -206,7 +206,7 @@
38 +@@ -199,14 +199,14 @@
39 + $(LOG_WRAPPER): Makefile stamp-directories $(GEN_LOG_WRAPPER)
40 + set -e; \
41 + progname=`basename $@ | sed -e 's/-wrapper//'`; \
42 +- $(GEN_LOG_WRAPPER) "$(pkglibdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@
43 ++ $(GEN_LOG_WRAPPER) "$(pkglibexecdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@
44 + chmod u+x $@
45 +
46 + # We need to create symlinks because "make distcheck" will not install Python
47 # files when building.
48 srclinks: stamp-directories
49 set -e; \
50 @@ -56,8 +64,8 @@
51 $(LN_S) $(abs_top_srcdir)/$$i $$i; \
52 fi; \
53 diff -Naur neatx.orig/lib/constants.py neatx/lib/constants.py
54 ---- neatx.orig/lib/constants.py 2012-08-21 12:09:25.504181479 +0200
55 -+++ neatx/lib/constants.py 2012-08-21 12:12:46.964539145 +0200
56 +--- neatx.orig/lib/constants.py 2012-08-23 12:01:14.290018757 +0200
57 ++++ neatx/lib/constants.py 2012-08-23 12:01:23.405734335 +0200
58 @@ -40,14 +40,14 @@
59 START_GNOME_COMMAND = "gnome-session"