| 1 |
vapier 11/11/20 06:59:00 |
| 2 |
|
| 3 |
Added: gpsd-3.3-release-rev.patch |
| 4 |
gpsd-3.3-udev-install.patch gpsd-3.3-setup.py |
| 5 |
Log: |
| 6 |
Version bump #380883 by Andreas K. Hüttel and Ed Wildgoose. Add USE=X support for #369261 by Patrick. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gpsd-3.3-release-rev.patch |
| 17 |
=================================================================== |
| 18 |
taken from upstream repo & tweaked; drop with 3.4 release |
| 19 |
|
| 20 |
From c96ffb7733b56a8c5c20d473d8fd83b62b6abfde Mon Sep 17 00:00:00 2001 |
| 21 |
From: Bernd Zeimetz <bernd@××××.de> |
| 22 |
Date: Thu, 10 Nov 2011 22:18:07 +0100 |
| 23 |
Subject: [PATCH] SConstruct: Use gpsd_version as revision for releases. |
| 24 |
|
| 25 |
--- |
| 26 |
SConstruct | 13 ++++++++----- |
| 27 |
1 files changed, 8 insertions(+), 5 deletions(-) |
| 28 |
|
| 29 |
diff --git a/SConstruct b/SConstruct |
| 30 |
index d367403..3d95e7e 100644 |
| 31 |
--- a/SConstruct |
| 32 |
+++ b/SConstruct |
| 33 |
@@ -978,12 +978,15 @@ env.Command(target="ais_json.i", source="jsongen.py", action='''\ |
| 34 |
chmod a-w $TARGET''') |
| 35 |
|
| 36 |
# generate revision.h |
| 37 |
-(st, rev) = commands.getstatusoutput('git describe') |
| 38 |
-if st != 0: |
| 39 |
- from datetime import datetime |
| 40 |
- rev = datetime.now().isoformat()[:-4] |
| 41 |
+if 'dev' in gpsd_version: |
| 42 |
+ (st, rev) = commands.getstatusoutput('git describe') |
| 43 |
+ if st != 0: |
| 44 |
+ from datetime import datetime |
| 45 |
+ rev = datetime.now().isoformat()[:-4] |
| 46 |
+else: |
| 47 |
+ rev = gpsd_version |
| 48 |
revision='#define REVISION "%s"\n' %(rev.strip(),) |
| 49 |
-env.NoClean(env.Textfile(target="revision.h", source=[revision])) |
| 50 |
+env.Textfile(target="revision.h", source=[revision]) |
| 51 |
|
| 52 |
# generate pps_pin.h |
| 53 |
pps_pin = env['pps_pin'] |
| 54 |
-- |
| 55 |
1.7.6.1 |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: gpsd-3.3-udev-install.patch |
| 66 |
=================================================================== |
| 67 |
From b0513cd2e44705058ffdaa7a9c3f32371e9fcd5b Mon Sep 17 00:00:00 2001 |
| 68 |
From: Mike Frysinger <vapier@g.o> |
| 69 |
Date: Thu, 17 Nov 2011 23:44:06 -0500 |
| 70 |
Subject: [PATCH] use DESTDIR with udev install |
| 71 |
|
| 72 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 73 |
--- |
| 74 |
SConstruct | 7 ++++--- |
| 75 |
1 files changed, 4 insertions(+), 3 deletions(-) |
| 76 |
|
| 77 |
diff --git a/SConstruct b/SConstruct |
| 78 |
index 1f99740..b7a98e4 100644 |
| 79 |
--- a/SConstruct |
| 80 |
+++ b/SConstruct |
| 81 |
@@ -1505,9 +1505,10 @@ if env['python']: |
| 82 |
# is plugged in. |
| 83 |
|
| 84 |
Utility('udev-install', '', [ |
| 85 |
- 'cp $SRCDIR/gpsd.rules /lib/udev/rules.d/25-gpsd.rules', |
| 86 |
- 'cp $SRCDIR/gpsd.hotplug /lib/udev/', |
| 87 |
- 'chmod a+x /lib/udev/gpsd.hotplug', |
| 88 |
+ 'mkdir -p ' + DESTDIR + '/lib/udev/rules.d', |
| 89 |
+ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + '/lib/udev/rules.d/25-gpsd.rules', |
| 90 |
+ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + '/lib/udev/', |
| 91 |
+ 'chmod a+x ' + DESTDIR + '/lib/udev/gpsd.hotplug', |
| 92 |
]) |
| 93 |
|
| 94 |
Utility('udev-uninstall', '', [ |
| 95 |
-- |
| 96 |
1.7.6.1 |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.1 sci-geosciences/gpsd/files/gpsd-3.3-setup.py |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-setup.py?rev=1.1&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-setup.py?rev=1.1&content-type=text/plain |
| 105 |
|
| 106 |
Index: gpsd-3.3-setup.py |
| 107 |
=================================================================== |
| 108 |
from distutils.core import setup, Extension |
| 109 |
|
| 110 |
setup( |
| 111 |
name = "gps", |
| 112 |
version = @VERSION@, |
| 113 |
description = 'Python libraries for the gpsd service daemon', |
| 114 |
url = @URL@, |
| 115 |
author = 'the GPSD project', |
| 116 |
author_email = @EMAIL@, |
| 117 |
license = "BSD", |
| 118 |
ext_modules=[ |
| 119 |
Extension("gps.packet", @GPS_PACKET_SOURCES@, include_dirs=["."]), |
| 120 |
Extension("gps.clienthelpers", @GPS_CLIENT_SOURCES@, include_dirs=["."]), |
| 121 |
], |
| 122 |
packages = ['gps'], |
| 123 |
scripts = @SCRIPTS@, |
| 124 |
) |
Archives