Gentoo Archives: gentoo-commits

From: "Tony Vroon (chainsaw)" <chainsaw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-calculators/gonvert/files: 0.2.23-paths.patch
Date: Sun, 02 May 2010 15:02:44
Message-Id: 20100502150240.45D772C230@corvid.gentoo.org
1 chainsaw 10/05/02 15:02:40
2
3 Added: 0.2.23-paths.patch
4 Log:
5 Version bump, as requested by "Hitachi" in bug #315451. Sprinkle some quotes for maximum repoman happiness.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-calculators/gonvert/files/0.2.23-paths.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-calculators/gonvert/files/0.2.23-paths.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-calculators/gonvert/files/0.2.23-paths.patch?rev=1.1&content-type=text/plain
13
14 Index: 0.2.23-paths.patch
15 ===================================================================
16 diff -uNr gonvert-0.2.23.ORIG//gonvert gonvert-0.2.23/gonvert
17 --- gonvert-0.2.23.ORIG//gonvert 2010-05-02 15:56:46.807041971 +0100
18 +++ gonvert-0.2.23/gonvert 2010-05-02 15:57:06.840166944 +0100
19 @@ -739,9 +739,9 @@
20 if os.path.exists('gonvert.glade'):
21 homepath=''
22 pixmapspath='pixmaps/'
23 -elif os.path.exists('/usr/local/share/gonvert/gonvert.glade'):
24 - homepath='/usr/local/share/gonvert/'
25 - pixmapspath='/usr/local/share/pixmaps/'
26 +elif os.path.exists('/usr/share/gonvert/gonvert.glade'):
27 + homepath='/usr/share/gonvert/'
28 + pixmapspath='/usr/share/pixmaps/'
29 else:
30 #look for it in the installed directory
31 homepath=sys.path[0] + '/../share/gonvert/'
32 diff -uNr gonvert-0.2.23.ORIG//Makefile gonvert-0.2.23/Makefile
33 --- gonvert-0.2.23.ORIG//Makefile 2010-05-02 15:56:46.808041940 +0100
34 +++ gonvert-0.2.23/Makefile 2010-05-02 15:57:06.840166944 +0100
35 @@ -4,7 +4,7 @@
36 VERSION=$(shell head -3 $(NAME) | grep version | cut -d\" -f2)
37
38 #DESTDIR can be defined when calling make ie. make install DESTDIR=$RPM_BUILD_ROOT
39 -prefix = /usr/local
40 +prefix = /usr
41 bindir = $(prefix)/bin
42 datadir = $(prefix)/share
43 docdir = $(datadir)/doc
44 @@ -18,7 +18,7 @@
45 install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade
46 install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/
47 install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/
48 - install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop
49 + install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/applications/gonvert.desktop
50 install -d -m0755 $(DESTDIR)$(docdir)/gonvert/
51 install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/
52
53 @@ -27,7 +27,7 @@
54 install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade
55 install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/
56 install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/
57 - install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop
58 + install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/applications/gonvert.desktop
59 install -d -m0755 $(DESTDIR)$(docdir)/gonvert/
60 install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/
61 install -m0644 i18n/pl_messages.gmo /usr/share/locale/pl/LC_MESSAGES/gonvert.mo
62 @@ -37,7 +37,7 @@
63 rm -f $(bindir)/gonvert
64 rm -rf $(datadir)/gonvert*
65 rm -rf $(docdir)/gonvert*
66 - rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop
67 + rm -f /usr/share/applications/$(NAME).desktop
68 rm -f /usr/share/pixmaps/$(NAME).png
69
70 uninstall_pl:
71 @@ -45,7 +45,7 @@
72 rm -f $(bindir)/gonvert
73 rm -rf $(datadir)/gonvert*
74 rm -rf $(docdir)/gonvert*
75 - rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop
76 + rm -f /usr/share/applications/$(NAME).desktop
77 rm -f /usr/share/pixmaps/$(NAME).png
78 rm -f /usr/share/locale/pl/LC_MESSAGES/gonvert.mo