OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Feb-2007 19:45:09
Branch: HEAD Handle: 2007021818450800
Modified files:
openpkg-src/git git.patch
Log:
make sure it always finds its modules
Summary:
Revision Changes Path
1.19 +11 -5 openpkg-src/git/git.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 git.patch
--- openpkg-src/git/git.patch 14 Feb 2007 19:34:16 -0000 1.18
+++ openpkg-src/git/git.patch 18 Feb 2007 18:45:08 -0000 1.19
@@ -1,6 +1,6 @@
Index: cogito-0.18.2/Makefile
--- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24 +0100
-+++ cogito-0.18.2/Makefile 2007-02-14 20:06:31 +0100
++++ cogito-0.18.2/Makefile 2007-02-18 19:43:17 +0100
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -14,7 +14,7 @@
Index: git-1.5.0/Makefile
--- git-1.5.0/Makefile.orig 2007-02-14 03:46:46 +0100
-+++ git-1.5.0/Makefile 2007-02-14 20:08:06 +0100
++++ git-1.5.0/Makefile 2007-02-18 19:43:17 +0100
@@ -123,7 +123,7 @@
prefix = $(HOME)
bindir = $(prefix)/bin
@@ -40,7 +40,7 @@
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
Index: stgit-0.12/setup.py
--- stgit-0.12/setup.py.orig 2007-01-25 23:49:37 +0100
-+++ stgit-0.12/setup.py 2007-02-14 20:06:31 +0100
++++ stgit-0.12/setup.py 2007-02-18 19:43:17 +0100
@@ -15,10 +15,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -58,8 +58,14 @@
('share/doc/stgit', glob.glob('doc/*.txt'))]
Index: stgit-0.12/stg
--- stgit-0.12/stg.orig 2006-04-07 23:38:54 +0200
-+++ stgit-0.12/stg 2007-02-14 20:06:31 +0100
-@@ -31,7 +31,8 @@
++++ stgit-0.12/stg 2007-02-18 19:43:39 +0100
+@@ -26,12 +26,13 @@
+ # It is assumed that the user installed StGIT using the --prefix= option
+ prefix, bin = os.path.split(sys.path[0])
+
+-if bin == 'bin' and prefix != sys.prefix:
++if bin == 'bin':
+ sys.prefix = prefix
sys.exec_prefix = prefix
major, minor = sys.version_info[0:2]
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
