| 1 |
sping 09/10/02 20:09:33 |
| 2 |
|
| 3 |
Added: smolt-1.4-upstream-docdir.patch |
| 4 |
smolt-1.4-upstream-fix-gzip-calls.patch |
| 5 |
Log: |
| 6 |
Bump to 1.4 |
| 7 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/smolt/files/smolt-1.4-upstream-docdir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/smolt/files/smolt-1.4-upstream-docdir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: smolt-1.4-upstream-docdir.patch |
| 16 |
=================================================================== |
| 17 |
From a2b22db69af0d2cce2f64f78e654d26242a3d712 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Sebastian Pipping <sebastian@×××××××.org> |
| 19 |
Date: Fri, 2 Oct 2009 21:13:18 +0200 |
| 20 |
Subject: [PATCH 2/2] Client: Allow overriding DOCDIR and MANDIR |
| 21 |
|
| 22 |
--- |
| 23 |
client/Makefile | 24 ++++++++++++++++++------ |
| 24 |
1 files changed, 18 insertions(+), 6 deletions(-) |
| 25 |
|
| 26 |
diff --git a/client/Makefile b/client/Makefile |
| 27 |
index 86902d5..0d0f4fb 100644 |
| 28 |
--- a/client/Makefile |
| 29 |
+++ b/client/Makefile |
| 30 |
@@ -17,6 +17,18 @@ PREFIX=$(DESTDIR)/usr |
| 31 |
BINDIR=$(PREFIX)/bin |
| 32 |
DATADIR=$(PREFIX)/share |
| 33 |
|
| 34 |
+ifndef DOCDIR |
| 35 |
+_DOCDIR=$(DATADIR)/$(NAME)/doc |
| 36 |
+else |
| 37 |
+_DOCDIR=$(DESTDIR)/$(DOCDIR) |
| 38 |
+endif |
| 39 |
+ |
| 40 |
+ifndef MANDIR |
| 41 |
+_MANDIR=$(DATADIR)/man |
| 42 |
+else |
| 43 |
+_MANDIR=$(DESTDIR)/$(MANDIR) |
| 44 |
+endif |
| 45 |
+ |
| 46 |
all: po/smolt.pot $(MO_FILES) |
| 47 |
|
| 48 |
po/smolt.pot: $(PY_FILES) |
| 49 |
@@ -33,7 +45,7 @@ install-main: move-mo |
| 50 |
mkdir -p $(ETC)/smolt/ |
| 51 |
mkdir -p $(BINDIR)/ |
| 52 |
mkdir -p $(DATADIR)/locale/ |
| 53 |
- mkdir -p $(DATADIR)/man/man1 |
| 54 |
+ mkdir -p $(_MANDIR)/man1 |
| 55 |
|
| 56 |
cp -advr mo/* $(DATADIR)/locale/ |
| 57 |
cp -advr config.py $(SMOLTCONFIGDIR) |
| 58 |
@@ -56,12 +68,12 @@ install-main: move-mo |
| 59 |
cp ./icons/smolt-icon-24.png $(DATADIR)/icons/hicolor/24x24/apps/smolt.png |
| 60 |
cp ./icons/smolt-icon-32.png $(DATADIR)/icons/hicolor/32x32/apps/smolt.png |
| 61 |
|
| 62 |
- mkdir -p $(DATADIR)/$(NAME)/doc |
| 63 |
- install -p -m 0644 ../doc/PrivacyPolicy $(DATADIR)/$(NAME)/doc |
| 64 |
+ mkdir -p $(_DOCDIR) |
| 65 |
+ install -p -m 0644 ../doc/PrivacyPolicy $(_DOCDIR) |
| 66 |
|
| 67 |
- gzip -c -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz |
| 68 |
- gzip -c -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz |
| 69 |
- gzip -c -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz |
| 70 |
+ gzip -c -9 man/smoltSendProfile.1 > $(_MANDIR)/man1/smoltSendProfile.1.gz |
| 71 |
+ gzip -c -9 man/smoltDeleteProfile.1 > $(_MANDIR)/man1/smoltDeleteProfile.1.gz |
| 72 |
+ gzip -c -9 man/smoltGui.1 > $(_MANDIR)/man1/smoltGui.1.gz |
| 73 |
|
| 74 |
ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile |
| 75 |
ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile |
| 76 |
-- |
| 77 |
1.6.4.4 |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/smolt/files/smolt-1.4-upstream-fix-gzip-calls.patch?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: smolt-1.4-upstream-fix-gzip-calls.patch |
| 88 |
=================================================================== |
| 89 |
From 420c736a2bbc5f504e33a1aa16ae61c70b2c3ee2 Mon Sep 17 00:00:00 2001 |
| 90 |
From: Sebastian Pipping <sebastian@×××××××.org> |
| 91 |
Date: Fri, 2 Oct 2009 21:07:11 +0200 |
| 92 |
Subject: [PATCH 1/2] Client: Fix calls to gzip in Makefile |
| 93 |
|
| 94 |
--- |
| 95 |
client/Makefile | 6 +++--- |
| 96 |
1 files changed, 3 insertions(+), 3 deletions(-) |
| 97 |
|
| 98 |
diff --git a/client/Makefile b/client/Makefile |
| 99 |
index ec47021..86902d5 100644 |
| 100 |
--- a/client/Makefile |
| 101 |
+++ b/client/Makefile |
| 102 |
@@ -59,9 +59,9 @@ install-main: move-mo |
| 103 |
mkdir -p $(DATADIR)/$(NAME)/doc |
| 104 |
install -p -m 0644 ../doc/PrivacyPolicy $(DATADIR)/$(NAME)/doc |
| 105 |
|
| 106 |
- gzip -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz |
| 107 |
- gzip -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz |
| 108 |
- gzip -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz |
| 109 |
+ gzip -c -9 man/smoltSendProfile.1 > $(DATADIR)/man/man1/smoltSendProfile.1.gz |
| 110 |
+ gzip -c -9 man/smoltDeleteProfile.1 > $(DATADIR)/man/man1/smoltDeleteProfile.1.gz |
| 111 |
+ gzip -c -9 man/smoltGui.1 > $(DATADIR)/man/man1/smoltGui.1.gz |
| 112 |
|
| 113 |
ln -sf $(DATADIR)/$(NAME)/client/sendProfile.py $(BINDIR)/smoltSendProfile |
| 114 |
ln -sf $(DATADIR)/$(NAME)/client/deleteProfile.py $(BINDIR)/smoltDeleteProfile |
| 115 |
-- |
| 116 |
1.6.4.4 |
Archives